Skip to content

Commit

Permalink
Merge pull request #1 from zanata/master
Browse files Browse the repository at this point in the history
Update from master
  • Loading branch information
carlosmunoz authored Jun 23, 2016
2 parents 876884e + 711e4aa commit 2dafb9b
Show file tree
Hide file tree
Showing 3,884 changed files with 421,138 additions and 113,455 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
44 changes: 44 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
# See https://help.github.com/articles/dealing-with-line-endings

# This setting tells git always to normalize the files specified.
# When committed they are stored with LF, on checkout they are
# converted to the OS's native line endings.
* text

# Explicitly declare text files we want to always be normalized and converted
# to native line endings on checkout.
*.c text
*.css text
*.csv text
*.groovy text
*.h text
*.html text
*.ini text
*.java text
*.js text
*.launch text
*.po text
*.pot text
*.properties text
*.sh text
*.sql text
*.txt text
*.xhtml text
*.xml text

# Declare files that will always have CRLF line endings on checkout.
*.sln text eol=crlf

# Denote all files that are truly binary and should not be modified.
*.gif binary
*.jar binary
*.jpg binary
*.png binary
*.idml binary
*.odt binary
*.odg binary
*.odp binary
*.ods binary
*.ico binary
*.eot binary
*.ttf binary
35 changes: 28 additions & 7 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,11 +1,9 @@
# NB be careful ignoring anything under src/ (especially directories or .jar files)
# because ignoring files under these directories can make it
# difficult to debug build problems. At the very least, we should ensure
# 'mvn clean' will clean such directories.


*~
*.patch
# Include patches used for the publick package
!/zanata-war/etc/public-package/patches/**/*.patch

*.sedbak
zanatasearchindex/
test-output/
Expand Down Expand Up @@ -33,6 +31,7 @@ bin/
# eclipse scrapbook page:
*.jpage

*.pdf

# idea
*.idea/
Expand All @@ -44,11 +43,33 @@ bin/
#gwt related
.gwt-log
*.gwt-tmp
/server/zanata-war/src/main/webapp/WEB-INF/deploy/
/server/zanata-war/src/main/webapp/webtrans/
/zanata-war/src/main/webapp/WEB-INF/deploy/
/zanata-war/src/main/webapp/webtrans/

# vim
*.swp


# binary files
*.class
*.cli
*.exe
*.jar
*.war
*.zip

# temp files
*.log
*.temp
*.tmp
/tmp*
*.bak

# Gradle files
.gradle/

# other things that really ought to go under target/
ehcache.disk.store.dir/
frontend/src/main/web/jsconfig.json
frontend/src/main/web/.vscode/launch.json
frontend/src/main/web/.vscode/tasks.json
49 changes: 49 additions & 0 deletions .travis-settings.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
<settings xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/settings-1.0.0.xsd">

<profiles>

<!--
Repository group which contains Zanata snapshots and releases (before they sync to Central).
Includes Zanata api, client, common, parent, but not server.
See https://docs.sonatype.org/display/Repository/Sonatype+OSS+Maven+Repository+Usage+Guide#SonatypeOSSMavenRepositoryUsageGuide-4.MavenRepositories
-->
<profile>
<id>oss-public</id>
<activation>
<property>
<name>!oss.public.off</name>
</property>
</activation>
<repositories>
<repository>
<id>oss-public</id>
<name>oss-public</name>
<url>https://oss.sonatype.org/content/groups/public/</url>
<releases>
<enabled>true</enabled>
</releases>
<snapshots>
<enabled>true</enabled>
</snapshots>
</repository>
</repositories>
<pluginRepositories>
<pluginRepository>
<id>oss-public</id>
<name>oss-public</name>
<url>https://oss.sonatype.org/content/groups/public/</url>
<releases>
<enabled>true</enabled>
</releases>
<snapshots>
<enabled>true</enabled>
</snapshots>
</pluginRepository>
</pluginRepositories>
</profile>

</profiles>
</settings>
38 changes: 38 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
# use http://docs.travis-ci.com/user/workers/container-based-infrastructure/
sudo: false

# cache local Maven repo: http://docs.travis-ci.com/user/caching/
cache:
directories:
- $HOME/.m2/repository

language: java

# Use the 'true' command to avoid up-front dependency fetching, for faster builds
# See http://docs.travis-ci.com/user/languages/java/#Dependency-Management
install: /bin/true

# Travis build logs need to be small (aim for less than 4MB or 10,000 lines),
# so we try to minimise unwanted logging. However, Travis will kill the build
# if nothing is logged for 10 minutes (20 with travis_wait), so we do need
# some logging.

script: |
mvn verify \
--batch-mode \
--settings .travis-settings.xml \
-Dgwt.validateOnly \
-Dappserver=wildfly8 \
-DskipFuncTests \
-Dmaven.test.redirectTestOutputToFile \
-DstaticAnalysis | \
egrep -v \
'^(\[INFO\] Download|'\
'\[WARNING\] Could not validate integrity of download from|'\
'\[WARNING\] Checksum validation failed, no checksums available for)'
jdk:
- oraclejdk8

matrix:
fast_finish: true
127 changes: 0 additions & 127 deletions CHANGELOG.md

This file was deleted.

Loading

0 comments on commit 2dafb9b

Please sign in to comment.