Repository: beam Updated Branches: refs/heads/master 64cea06b1 -> 82ddd4e4b
[BEAM-2253] Use resource transformer plugin to use versions defined in root pom.xml within maven archetype poms Project: http://git-wip-us.apache.org/repos/asf/beam/repo Commit: http://git-wip-us.apache.org/repos/asf/beam/commit/2ed68f7f Tree: http://git-wip-us.apache.org/repos/asf/beam/tree/2ed68f7f Diff: http://git-wip-us.apache.org/repos/asf/beam/diff/2ed68f7f Branch: refs/heads/master Commit: 2ed68f7f49a6f84921b0de03a57b0bbe61d263a7 Parents: 64cea06 Author: Luke Cwik <lc...@google.com> Authored: Mon May 15 15:43:00 2017 -0700 Committer: Luke Cwik <lc...@google.com> Committed: Fri May 19 17:10:38 2017 -0700 ---------------------------------------------------------------------- pom.xml | 12 +++-- .../main/resources/archetype-resources/pom.xml | 51 +++++++++++++------- .../main/resources/archetype-resources/pom.xml | 48 ++++++++++++------ .../main/resources/archetype-resources/pom.xml | 12 +++-- .../resources/projects/basic/reference/pom.xml | 12 +++-- 5 files changed, 90 insertions(+), 45 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/beam/blob/2ed68f7f/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index a978f58..211a822 100644 --- a/pom.xml +++ b/pom.xml @@ -143,8 +143,12 @@ <groovy-maven-plugin.version>2.0</groovy-maven-plugin.version> <surefire-plugin.version>2.20</surefire-plugin.version> <failsafe-plugin.version>2.20</failsafe-plugin.version> + <maven-compiler-plugin.version>3.6.1</maven-compiler-plugin.version> + <maven-exec-plugin.version>1.4.0</maven-exec-plugin.version> + <maven-jar-plugin.version>3.0.2</maven-jar-plugin.version> <maven-resources-plugin.version>3.0.2</maven-resources-plugin.version> - + <maven-shade-plugin.version>3.0.0</maven-shade-plugin.version> + <compiler.error.flag>-Werror</compiler.error.flag> <compiler.default.pkginfo.flag>-Xpkginfo:always</compiler.default.pkginfo.flag> <compiler.default.exclude>nothing</compiler.default.exclude> @@ -1131,7 +1135,7 @@ <plugin> <artifactId>maven-compiler-plugin</artifactId> - <version>3.6.1</version> + <version>${maven-compiler-plugin.version}</version> <configuration> <source>1.7</source> <target>1.7</target> @@ -1186,7 +1190,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-jar-plugin</artifactId> - <version>3.0.2</version> + <version>${maven-jar-plugin.version}</version> <executions> <execution> <id>default-jar</id> @@ -1418,7 +1422,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-shade-plugin</artifactId> - <version>3.0.0</version> + <version>${maven-shade-plugin.version}</version> <executions> <execution> <id>bundle-and-repackage</id> http://git-wip-us.apache.org/repos/asf/beam/blob/2ed68f7f/sdks/java/maven-archetypes/examples-java8/src/main/resources/archetype-resources/pom.xml ---------------------------------------------------------------------- diff --git a/sdks/java/maven-archetypes/examples-java8/src/main/resources/archetype-resources/pom.xml b/sdks/java/maven-archetypes/examples-java8/src/main/resources/archetype-resources/pom.xml index 5f34689..47dfc91 100644 --- a/sdks/java/maven-archetypes/examples-java8/src/main/resources/archetype-resources/pom.xml +++ b/sdks/java/maven-archetypes/examples-java8/src/main/resources/archetype-resources/pom.xml @@ -28,7 +28,23 @@ <properties> <beam.version>@project.version@</beam.version> - <surefire-plugin.version>2.20</surefire-plugin.version> + + <bigquery.version>@bigquery.version@</bigquery.version> + <google-clients.version>@google-clients.version@</google-clients.version> + <guava.version>@guava.version@</guava.version> + <hamcrest.version>@hamcrest.version@</hamcrest.version> + <jackson.version>@jackson.version@</jackson.version> + <joda.version>@joda.version@</joda.version> + <junit.version>@junit.version@</junit.version> + <maven-compiler-plugin.version>@maven-compiler-plugin.version@</maven-compiler-plugin.version> + <maven-exec-plugin.version>@maven-exec-plugin.version@</maven-exec-plugin.version> + <maven-jar-plugin.version>@maven-jar-plugin.version@</maven-jar-plugin.version> + <maven-shade-plugin.version>@maven-shade-plugin.version@</maven-shade-plugin.version> + <mockito.version>@mockito.version@</mockito.version> + <pubsub.version>@pubsub.version@</pubsub.version> + <slf4j.version>@slf4j.version@</slf4j.version> + <spark.version>@spark.version@</spark.version> + <surefire-plugin.version>@surefire-plugin.version@</surefire-plugin.version> </properties> <repositories> @@ -50,7 +66,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> - <version>3.5.1</version> + <version>${maven-compiler-plugin.version}</version> <configuration> <source>1.8</source> <target>1.8</target> @@ -80,6 +96,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-jar-plugin</artifactId> + <version>${maven-jar-plugin.version}</version> </plugin> <!-- @@ -89,7 +106,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-shade-plugin</artifactId> - <version>3.0.0</version> + <version>${maven-shade-plugin.version}</version> <executions> <execution> <phase>package</phase> @@ -122,7 +139,7 @@ <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>exec-maven-plugin</artifactId> - <version>1.4.0</version> + <version>${maven-exec-plugin.version}</version> <configuration> <cleanupDaemonThreads>false</cleanupDaemonThreads> </configuration> @@ -224,7 +241,7 @@ <dependency> <groupId>org.apache.spark</groupId> <artifactId>spark-streaming_2.10</artifactId> - <version>1.6.2</version> + <version>${spark.version}</version> <scope>runtime</scope> <exclusions> <exclusion> @@ -236,7 +253,7 @@ <dependency> <groupId>com.fasterxml.jackson.module</groupId> <artifactId>jackson-module-scala_2.10</artifactId> - <version>@jackson.version@</version> + <version>${jackson.version}</version> <scope>runtime</scope> </dependency> </dependencies> @@ -261,7 +278,7 @@ <dependency> <groupId>com.google.api-client</groupId> <artifactId>google-api-client</artifactId> - <version>1.22.0</version> + <version>${google-clients.version}</version> <exclusions> <!-- Exclude an old version of guava that is being pulled in by a transitive dependency of google-api-client --> @@ -276,7 +293,7 @@ <dependency> <groupId>com.google.apis</groupId> <artifactId>google-api-services-bigquery</artifactId> - <version>v2-rev295-1.22.0</version> + <version>${bigquery.version}</version> <exclusions> <!-- Exclude an old version of guava that is being pulled in by a transitive dependency of google-api-client --> @@ -290,7 +307,7 @@ <dependency> <groupId>com.google.http-client</groupId> <artifactId>google-http-client</artifactId> - <version>1.22.0</version> + <version>${google-clients.version}</version> <exclusions> <!-- Exclude an old version of guava that is being pulled in by a transitive dependency of google-api-client --> @@ -304,7 +321,7 @@ <dependency> <groupId>com.google.apis</groupId> <artifactId>google-api-services-pubsub</artifactId> - <version>v1-rev10-1.22.0</version> + <version>${pubsub.version}</version> <exclusions> <!-- Exclude an old version of guava that is being pulled in by a transitive dependency of google-api-client --> @@ -318,26 +335,26 @@ <dependency> <groupId>joda-time</groupId> <artifactId>joda-time</artifactId> - <version>2.4</version> + <version>${joda.version}</version> </dependency> <dependency> <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> - <version>20.0</version> + <version>${guava.version}</version> </dependency> <!-- Add slf4j API frontend binding with JUL backend --> <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-api</artifactId> - <version>1.7.14</version> + <version>${slf4j.version}</version> </dependency> <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-jdk14</artifactId> - <version>1.7.14</version> + <version>${slf4j.version}</version> <!-- When loaded at runtime this will wire up slf4j to the JUL backend --> <scope>runtime</scope> </dependency> @@ -347,19 +364,19 @@ <dependency> <groupId>org.hamcrest</groupId> <artifactId>hamcrest-all</artifactId> - <version>1.3</version> + <version>${hamcrest.version}</version> </dependency> <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <version>4.12</version> + <version>${junit.version}</version> </dependency> <dependency> <groupId>org.mockito</groupId> <artifactId>mockito-all</artifactId> - <version>1.9.5</version> + <version>${mockito.version}</version> <scope>test</scope> </dependency> http://git-wip-us.apache.org/repos/asf/beam/blob/2ed68f7f/sdks/java/maven-archetypes/examples/src/main/resources/archetype-resources/pom.xml ---------------------------------------------------------------------- diff --git a/sdks/java/maven-archetypes/examples/src/main/resources/archetype-resources/pom.xml b/sdks/java/maven-archetypes/examples/src/main/resources/archetype-resources/pom.xml index a3d7b8f..025e356 100644 --- a/sdks/java/maven-archetypes/examples/src/main/resources/archetype-resources/pom.xml +++ b/sdks/java/maven-archetypes/examples/src/main/resources/archetype-resources/pom.xml @@ -28,7 +28,22 @@ <properties> <beam.version>@project.version@</beam.version> - <surefire-plugin.version>2.20</surefire-plugin.version> + + <bigquery.version>@bigquery.version@</bigquery.version> + <google-clients.version>@google-clients.version@</google-clients.version> + <guava.version>@guava.version@</guava.version> + <hamcrest.version>@hamcrest.version@</hamcrest.version> + <jackson.version>@jackson.version@</jackson.version> + <joda.version>@joda.version@</joda.version> + <junit.version>@junit.version@</junit.version> + <maven-compiler-plugin.version>@maven-compiler-plugin.version@</maven-compiler-plugin.version> + <maven-exec-plugin.version>@maven-exec-plugin.version@</maven-exec-plugin.version> + <maven-jar-plugin.version>@maven-jar-plugin.version@</maven-jar-plugin.version> + <maven-shade-plugin.version>@maven-shade-plugin.version@</maven-shade-plugin.version> + <pubsub.version>@pubsub.version@</pubsub.version> + <slf4j.version>@slf4j.version@</slf4j.version> + <spark.version>@spark.version@</spark.version> + <surefire-plugin.version>@surefire-plugin.version@</surefire-plugin.version> </properties> <repositories> @@ -50,7 +65,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> - <version>3.5.1</version> + <version>${maven-compiler-plugin.version}</version> <configuration> <source>${targetPlatform}</source> <target>${targetPlatform}</target> @@ -80,6 +95,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-jar-plugin</artifactId> + <version>${maven-jar-plugin.version}</version> </plugin> <!-- @@ -89,7 +105,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-shade-plugin</artifactId> - <version>3.0.0</version> + <version>${maven-shade-plugin.version}</version> <executions> <execution> <phase>package</phase> @@ -122,7 +138,7 @@ <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>exec-maven-plugin</artifactId> - <version>1.4.0</version> + <version>${maven-exec-plugin.version}</version> <configuration> <cleanupDaemonThreads>false</cleanupDaemonThreads> </configuration> @@ -224,7 +240,7 @@ <dependency> <groupId>org.apache.spark</groupId> <artifactId>spark-streaming_2.10</artifactId> - <version>1.6.2</version> + <version>${spark.version}</version> <scope>runtime</scope> <exclusions> <exclusion> @@ -236,7 +252,7 @@ <dependency> <groupId>com.fasterxml.jackson.module</groupId> <artifactId>jackson-module-scala_2.10</artifactId> - <version>@jackson.version@</version> + <version>${jackson.version}</version> <scope>runtime</scope> </dependency> </dependencies> @@ -262,7 +278,7 @@ <dependency> <groupId>com.google.api-client</groupId> <artifactId>google-api-client</artifactId> - <version>1.22.0</version> + <version>${google-clients.version}</version> <exclusions> <!-- Exclude an old version of guava that is being pulled in by a transitive dependency of google-api-client --> @@ -276,7 +292,7 @@ <dependency> <groupId>com.google.apis</groupId> <artifactId>google-api-services-bigquery</artifactId> - <version>v2-rev295-1.22.0</version> + <version>${bigquery.version}</version> <exclusions> <!-- Exclude an old version of guava that is being pulled in by a transitive dependency of google-api-client --> @@ -290,7 +306,7 @@ <dependency> <groupId>com.google.http-client</groupId> <artifactId>google-http-client</artifactId> - <version>1.22.0</version> + <version>${google-clients.version}</version> <exclusions> <!-- Exclude an old version of guava that is being pulled in by a transitive dependency of google-api-client --> @@ -304,7 +320,7 @@ <dependency> <groupId>com.google.apis</groupId> <artifactId>google-api-services-pubsub</artifactId> - <version>v1-rev10-1.22.0</version> + <version>${pubsub.version}</version> <exclusions> <!-- Exclude an old version of guava that is being pulled in by a transitive dependency of google-api-client --> @@ -318,26 +334,26 @@ <dependency> <groupId>joda-time</groupId> <artifactId>joda-time</artifactId> - <version>2.4</version> + <version>${joda.version}</version> </dependency> <dependency> <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> - <version>20.0</version> + <version>${guava.version}</version> </dependency> <!-- Add slf4j API frontend binding with JUL backend --> <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-api</artifactId> - <version>1.7.14</version> + <version>${slf4j.version}</version> </dependency> <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-jdk14</artifactId> - <version>1.7.14</version> + <version>${slf4j.version}</version> <!-- When loaded at runtime this will wire up slf4j to the JUL backend --> <scope>runtime</scope> </dependency> @@ -347,13 +363,13 @@ <dependency> <groupId>org.hamcrest</groupId> <artifactId>hamcrest-all</artifactId> - <version>1.3</version> + <version>${hamcrest.version}</version> </dependency> <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <version>4.12</version> + <version>${junit.version}</version> </dependency> <!-- The DirectRunner is needed for unit tests. --> http://git-wip-us.apache.org/repos/asf/beam/blob/2ed68f7f/sdks/java/maven-archetypes/starter/src/main/resources/archetype-resources/pom.xml ---------------------------------------------------------------------- diff --git a/sdks/java/maven-archetypes/starter/src/main/resources/archetype-resources/pom.xml b/sdks/java/maven-archetypes/starter/src/main/resources/archetype-resources/pom.xml index dddd5ab..f4fb9f8 100644 --- a/sdks/java/maven-archetypes/starter/src/main/resources/archetype-resources/pom.xml +++ b/sdks/java/maven-archetypes/starter/src/main/resources/archetype-resources/pom.xml @@ -26,6 +26,10 @@ <properties> <beam.version>@project.version@</beam.version> + + <maven-compiler-plugin.version>@maven-compiler-plugin.version@</maven-compiler-plugin.version> + <maven-exec-plugin.version>@maven-exec-plugin.version@</maven-exec-plugin.version> + <slf4j.version>@slf4j.version@</slf4j.version> </properties> <repositories> @@ -47,7 +51,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> - <version>3.5.1</version> + <version>${maven-compiler-plugin.version}</version> <configuration> <source>${targetPlatform}</source> <target>${targetPlatform}</target> @@ -60,7 +64,7 @@ <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>exec-maven-plugin</artifactId> - <version>1.4.0</version> + <version>${maven-exec-plugin.version}</version> <configuration> <cleanupDaemonThreads>false</cleanupDaemonThreads> </configuration> @@ -94,12 +98,12 @@ <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-api</artifactId> - <version>1.7.14</version> + <version>${slf4j.version}</version> </dependency> <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-jdk14</artifactId> - <version>1.7.14</version> + <version>${slf4j.version}</version> </dependency> </dependencies> </project> http://git-wip-us.apache.org/repos/asf/beam/blob/2ed68f7f/sdks/java/maven-archetypes/starter/src/test/resources/projects/basic/reference/pom.xml ---------------------------------------------------------------------- diff --git a/sdks/java/maven-archetypes/starter/src/test/resources/projects/basic/reference/pom.xml b/sdks/java/maven-archetypes/starter/src/test/resources/projects/basic/reference/pom.xml index 39fefd6..60405e6 100644 --- a/sdks/java/maven-archetypes/starter/src/test/resources/projects/basic/reference/pom.xml +++ b/sdks/java/maven-archetypes/starter/src/test/resources/projects/basic/reference/pom.xml @@ -26,6 +26,10 @@ <properties> <beam.version>@project.version@</beam.version> + + <maven-compiler-plugin.version>3.6.1</maven-compiler-plugin.version> + <maven-exec-plugin.version>1.4.0</maven-exec-plugin.version> + <slf4j.version>1.7.14</slf4j.version> </properties> <repositories> @@ -47,7 +51,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> - <version>3.5.1</version> + <version>${maven-compiler-plugin.version}</version> <configuration> <source>1.7</source> <target>1.7</target> @@ -60,7 +64,7 @@ <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>exec-maven-plugin</artifactId> - <version>1.4.0</version> + <version>${maven-exec-plugin.version}</version> <configuration> <cleanupDaemonThreads>false</cleanupDaemonThreads> </configuration> @@ -94,12 +98,12 @@ <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-api</artifactId> - <version>1.7.14</version> + <version>${slf4j.version}</version> </dependency> <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-jdk14</artifactId> - <version>1.7.14</version> + <version>${slf4j.version}</version> </dependency> </dependencies> </project>