Merge pull request GoogleCloudPlatform#253 from janpeuker/master

Create version 1.1 of maven-archetype-dataflow using Apache Beam 2.12.0
jitkasempin · May 16, 2019 · f24b73f · f24b73f
2 parents 3249f54 + 0cf288b
commit f24b73f
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 17 deletions.
diff --git a/tools/maven-archetype-dataflow/README.md b/tools/maven-archetype-dataflow/README.md
@@ -55,10 +55,10 @@ potential bugs are found.
 Builds the archetype and installs into the local archetype catalog.
 ```sh
 # Clone the repo
-git clone https://github.com/ryanmcdowell/maven-archetype-dataflow
+git clone https://github.com/GoogleCloudPlatform/professional-services.git
 
 # Change directory into the archetype project
-cd maven-archetype-dataflow
+cd professional-services/tools/maven-archetype-dataflow
 
 # Install the archetype into your local archetype catalog
 mvn clean install archetype:update-local-catalog
@@ -71,7 +71,7 @@ Bootstraps a new project using the archetype.
 mvn archetype:generate                             \
   -DarchetypeGroupId=com.google.cloud.pso          \
   -DarchetypeArtifactId=maven-archetype-dataflow   \
-  -DarchetypeVersion=1.0                           \
+  -DarchetypeVersion=1.1                           \
   -DgroupId=<groupId>                              \
   -DartifactId=<artifactId>
 ```

diff --git a/tools/maven-archetype-dataflow/pom.xml b/tools/maven-archetype-dataflow/pom.xml
@@ -23,7 +23,7 @@
 
   <groupId>com.google.cloud.pso</groupId>
   <artifactId>maven-archetype-dataflow</artifactId>
-  <version>1.0</version>
+  <version>1.1</version>
   <packaging>jar</packaging>
 
   <inceptionYear>2018</inceptionYear>
@@ -33,7 +33,20 @@
   </organization>
 
   <name>maven-archetype-dataflow</name>
-  <url>http://github.com/ryanmcdowell/maven-archetype-dataflow</url>
+
+  <scm>
+    <connection>
+      scm:git:https://github.com/GoogleCloudPlatform/professional-services.git
+    </connection>
+    <developerConnection>
+      scm:git:https://github.com/GoogleCloudPlatform/professional-services.git
+    </developerConnection>
+    <url>
+      https://github.com/GoogleCloudPlatform/professional-services/tree/master/tools/maven-archetype-dataflow
+    </url>
+  </scm>
+
+  <url>https://github.com/GoogleCloudPlatform/professional-services/tree/master/tools/maven-archetype-dataflow</url>
 
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

diff --git a/tools/maven-archetype-dataflow/src/main/resources/archetype-resources/pom.xml b/tools/maven-archetype-dataflow/src/main/resources/archetype-resources/pom.xml
@@ -41,32 +41,33 @@
 
     <!-- Dependency properties -->
     <checkstyle.version>8.11</checkstyle.version>
-    <beam.version>2.7.0</beam.version>
+    <beam.version>2.12.0</beam.version>
+
     <hamcrest.version>1.3</hamcrest.version>
     <java.version>1.8</java.version>
-    <j2v8.version>4.8.0</j2v8.version>
     <junit.version>4.12</junit.version>
+    <mockito-core.version>2.27.0</mockito-core.version>
+    <slf4j.version>1.7.25</slf4j.version>
+
     <maven-checkstyle-plugin.version>3.0.0</maven-checkstyle-plugin.version>
     <maven-clover-plugin.version>4.3.0</maven-clover-plugin.version>
-    <maven-compiler-plugin.version>3.8.0</maven-compiler-plugin.version>
+    <maven-compiler-plugin.version>3.8.1</maven-compiler-plugin.version>
     <maven-dependency-plugin.version>3.1.1</maven-dependency-plugin.version>
     <maven-enforcer-plugin.version>3.0.0-M2</maven-enforcer-plugin.version>
     <maven-exec-plugin.version>1.6.0</maven-exec-plugin.version>
     <maven-extra-enforcer-rules.version>1.0-beta-9</maven-extra-enforcer-rules.version>
-    <maven-javadoc-plugin.version>3.0.1</maven-javadoc-plugin.version>
-    <maven-jar-plugin.version>3.1.0</maven-jar-plugin.version>
+    <maven-javadoc-plugin.version>3.1.0</maven-javadoc-plugin.version>
+    <maven-jar-plugin.version>3.1.2</maven-jar-plugin.version>
     <maven-license-plugin.version>3.0</maven-license-plugin.version>
     <maven-os-plugin.version>1.5.0.Final</maven-os-plugin.version>
     <maven-pmd-plugin.version>3.10.0</maven-pmd-plugin.version>
     <maven-project-info-reports-plugin.version>3.0.0</maven-project-info-reports-plugin.version>
-    <maven-shade-plugin.version>3.1.1</maven-shade-plugin.version>
+    <maven-shade-plugin.version>3.2.1</maven-shade-plugin.version>
     <maven-site-plugin>3.7.1</maven-site-plugin>
     <maven-source-plugin.version>3.0.1</maven-source-plugin.version>
-    <maven-spotbugs-plugin.version>3.1.6</maven-spotbugs-plugin.version>
-    <maven-surefire-plugin.version>2.22.0</maven-surefire-plugin.version>
-    <maven-versions-plugin.version>2.5</maven-versions-plugin.version>
-    <mockito-core.version>2.23.0</mockito-core.version>
-    <slf4j.version>1.7.25</slf4j.version>
+    <maven-spotbugs-plugin.version>3.1.11</maven-spotbugs-plugin.version>
+    <maven-surefire-plugin.version>3.0.0-M3</maven-surefire-plugin.version>
+    <maven-versions-plugin.version>2.7</maven-versions-plugin.version>
   </properties>
 
   <dependencies>
@@ -257,7 +258,8 @@
                   </excludes>
                 </enforceBytecodeVersion>
                 <requireJavaVersion>
-                  <version>[1.8]</version>
+                  <!-- Right now Beam only builds with JDK 8, see BEAM-2530 -->
+                  <version>[1.8, 1.9)</version>
                 </requireJavaVersion>
                 <requireMavenVersion>
                   <!-- Keep aligned with prerequisite section below. -->