Repository: beam Updated Branches: refs/heads/master 3b3d6b81a -> b49ec3fa2
[BEAM-1297] Update maven shade plugin, fix typo and remove unneeded version [BEAM-1297] Enable tiered compilation to make the JVM startup times faster This makes the build faster because every time maven forks it does not necessarily reuse the JVM instance. [BEAM-1297] Enable parallel builds in travis (1C = 1 per core) Project: http://git-wip-us.apache.org/repos/asf/beam/repo Commit: http://git-wip-us.apache.org/repos/asf/beam/commit/4256801a Tree: http://git-wip-us.apache.org/repos/asf/beam/tree/4256801a Diff: http://git-wip-us.apache.org/repos/asf/beam/diff/4256801a Branch: refs/heads/master Commit: 4256801a6c4a0e7c15232c5fae22f7eef5fdf914 Parents: 3b3d6b8 Author: Ismaël MejÃa <ieme...@gmail.com> Authored: Sun Feb 12 06:52:45 2017 +0100 Committer: Davor Bonaci <da...@google.com> Committed: Wed Mar 1 10:47:57 2017 -0800 ---------------------------------------------------------------------- .jenkins/common_job_properties.groovy | 4 ++++ .travis.yml | 7 ++++--- pom.xml | 5 ++--- sdks/java/javadoc/pom.xml | 1 - 4 files changed, 10 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/beam/blob/4256801a/.jenkins/common_job_properties.groovy ---------------------------------------------------------------------- diff --git a/.jenkins/common_job_properties.groovy b/.jenkins/common_job_properties.groovy index 19cf471..bcac19e 100644 --- a/.jenkins/common_job_properties.groovy +++ b/.jenkins/common_job_properties.groovy @@ -166,6 +166,10 @@ class common_job_properties { context.mavenInstallation('Maven 3.3.3') context.mavenOpts('-Dorg.slf4j.simpleLogger.showDateTime=true') context.mavenOpts('-Dorg.slf4j.simpleLogger.dateTimeFormat=yyyy-MM-dd\\\'T\\\'HH:mm:ss.SSS') + // The -XX:+TieredCompilation -XX:TieredStopAtLevel=1 JVM options enable + // tiered compilation to make the JVM startup times faster during the tests. + context.mavenOpts('-XX:+TieredCompilation') + context.mavenOpts('-XX:TieredStopAtLevel=1') context.rootPOM('pom.xml') // Use a repository local to the workspace for better isolation of jobs. context.localRepository(LocalRepositoryLocation.LOCAL_TO_WORKSPACE) http://git-wip-us.apache.org/repos/asf/beam/blob/4256801a/.travis.yml ---------------------------------------------------------------------- diff --git a/.travis.yml b/.travis.yml index a392f7d..c896431 100644 --- a/.travis.yml +++ b/.travis.yml @@ -58,9 +58,10 @@ matrix: - os: linux env: TEST_PYTHON="1" - before_install: - - echo 'MAVEN_OPTS="$MAVEN_OPTS -Xmx1024m -XX:MaxPermSize=512m -XX:+BytecodeVerificationLocal"' >> ~/.mavenrc + # The -XX:+TieredCompilation -XX:TieredStopAtLevel=1 JVM options enable + # tiered compilation to make the JVM startup times faster during the tests. + - echo 'MAVEN_OPTS="$MAVEN_OPTS -Xmx1024m -XX:MaxPermSize=512m -XX:+TieredCompilation -XX:TieredStopAtLevel=1 -XX:+BytecodeVerificationLocal"' >> ~/.mavenrc - echo $'MAVEN_OPTS="$MAVEN_OPTS -Dorg.slf4j.simpleLogger.showDateTime=true -Dorg.slf4j.simpleLogger.dateTimeFormat=yyyy-MM-dd\'T\'HH:mm:ss.SSS"' >> ~/.mavenrc - cat ~/.mavenrc - if [ "$TRAVIS_OS_NAME" == "osx" ]; then export JAVA_HOME=$(/usr/libexec/java_home); fi @@ -80,7 +81,7 @@ install: script: - if [ "$TEST_PYTHON" ]; then travis_retry $TOX_HOME/tox -e $TOX_ENV -c sdks/python/tox.ini; fi - - if [ ! "$TEST_PYTHON" ]; then travis_retry mvn --batch-mode --update-snapshots --no-snapshot-updates $MAVEN_OVERRIDE install && travis_retry bash -ex .travis/test_wordcount.sh; fi + - if [ ! "$TEST_PYTHON" ]; then travis_retry mvn --batch-mode --update-snapshots --no-snapshot-updates --threads 1C $MAVEN_OVERRIDE install && travis_retry bash -ex .travis/test_wordcount.sh; fi cache: directories: http://git-wip-us.apache.org/repos/asf/beam/blob/4256801a/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 65f6723..a37f1af 100644 --- a/pom.xml +++ b/pom.xml @@ -1310,7 +1310,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-shade-plugin</artifactId> - <version>2.4.3</version> + <version>3.0.0</version> </plugin> <plugin> @@ -1448,7 +1448,7 @@ <version>[1.7,)</version> </requireJavaVersion> <requireMavenVersion> - <!-- Keep aligned with preqrequisite section below. --> + <!-- Keep aligned with prerequisite section below. --> <version>[3.2,)</version> </requireMavenVersion> </rules> @@ -1483,7 +1483,6 @@ </plugin> </plugins> </reporting> - <prerequisites> <!-- Keep aligned with requireMavenVersion section above. --> <maven>3.2</maven> http://git-wip-us.apache.org/repos/asf/beam/blob/4256801a/sdks/java/javadoc/pom.xml ---------------------------------------------------------------------- diff --git a/sdks/java/javadoc/pom.xml b/sdks/java/javadoc/pom.xml index 145dcf0..243dae5 100644 --- a/sdks/java/javadoc/pom.xml +++ b/sdks/java/javadoc/pom.xml @@ -232,7 +232,6 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-enforcer-plugin</artifactId> - <version>1.3.1</version> <executions> <execution> <id>enforce</id>