beam-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From da...@apache.org
Subject [1/2] beam git commit: [BEAM-2093] Use the jackson version from the maven property in maven archetypes
Date Tue, 02 May 2017 21:44:42 GMT
Repository: beam
Updated Branches:
  refs/heads/master 986d727f6 -> ccbb00e38


[BEAM-2093] Use the jackson version from the maven property in maven archetypes

[BEAM-2093] pom.xml organization cleanup, and use filtering for project version as well


Project: http://git-wip-us.apache.org/repos/asf/beam/repo
Commit: http://git-wip-us.apache.org/repos/asf/beam/commit/403a64ba
Tree: http://git-wip-us.apache.org/repos/asf/beam/tree/403a64ba
Diff: http://git-wip-us.apache.org/repos/asf/beam/diff/403a64ba

Branch: refs/heads/master
Commit: 403a64ba23baf497eb0bf0bca89b9db1966cb1f7
Parents: 986d727
Author: Elek, Márton <elek@users.noreply.github.com>
Authored: Thu Apr 27 14:52:05 2017 +0200
Committer: Davor Bonaci <davor@google.com>
Committed: Tue May 2 14:44:12 2017 -0700

----------------------------------------------------------------------
 pom.xml                                         |  6 ++++
 .../main/resources/archetype-resources/pom.xml  |  4 +--
 .../main/resources/archetype-resources/pom.xml  |  4 +--
 sdks/java/maven-archetypes/pom.xml              | 35 ++++++++++++++++++++
 .../main/resources/archetype-resources/pom.xml  |  2 +-
 5 files changed, 46 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/beam/blob/403a64ba/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 4fa183b..59f6963 100644
--- a/pom.xml
+++ b/pom.xml
@@ -141,6 +141,7 @@
     <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-resources-plugin.version>3.0.2</maven-resources-plugin.version>
     
     <compiler.error.flag>-Werror</compiler.error.flag>
     <compiler.default.pkginfo.flag>-Xpkginfo:always</compiler.default.pkginfo.flag>
@@ -216,6 +217,11 @@
                 </execution>
               </executions>
             </plugin>
+            <plugin>
+              <groupId>org.apache.maven.plugins</groupId>
+              <artifactId>maven-resources-plugin</artifactId>
+              <version>${maven-resources-plugin.version}</version>
+            </plugin>
           </plugins>
         </pluginManagement>
 

http://git-wip-us.apache.org/repos/asf/beam/blob/403a64ba/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 46e526e..508ff9c 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
@@ -27,7 +27,7 @@
   <packaging>jar</packaging>
 
   <properties>
-    <beam.version>0.7.0-SNAPSHOT</beam.version>
+    <beam.version>@project.version@</beam.version>
     <surefire-plugin.version>2.20</surefire-plugin.version>
   </properties>
 
@@ -224,7 +224,7 @@
         <dependency>
           <groupId>com.fasterxml.jackson.module</groupId>
           <artifactId>jackson-module-scala_2.10</artifactId>
-          <version>2.7.2</version>
+          <version>@jackson.version@</version>
           <scope>runtime</scope>
         </dependency>
       </dependencies>

http://git-wip-us.apache.org/repos/asf/beam/blob/403a64ba/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 99835e4..511e875 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
@@ -27,7 +27,7 @@
   <packaging>jar</packaging>
 
   <properties>
-    <beam.version>0.7.0-SNAPSHOT</beam.version>
+    <beam.version>@project.version@</beam.version>
     <surefire-plugin.version>2.20</surefire-plugin.version>
   </properties>
 
@@ -224,7 +224,7 @@
         <dependency>
           <groupId>com.fasterxml.jackson.module</groupId>
           <artifactId>jackson-module-scala_2.10</artifactId>
-          <version>2.7.2</version>
+          <version>@jackson.version@</version>
           <scope>runtime</scope>
         </dependency>
       </dependencies>

http://git-wip-us.apache.org/repos/asf/beam/blob/403a64ba/sdks/java/maven-archetypes/pom.xml
----------------------------------------------------------------------
diff --git a/sdks/java/maven-archetypes/pom.xml b/sdks/java/maven-archetypes/pom.xml
index 78e6f08..9d39a1e 100644
--- a/sdks/java/maven-archetypes/pom.xml
+++ b/sdks/java/maven-archetypes/pom.xml
@@ -35,6 +35,41 @@
     <module>starter</module>
   </modules>
 
+  <build>
+    <resources>
+      <!-- use filtering for the pom.xml template (with custom delimiter, see bellow)
-->
+      <resource>
+        <directory>src/main/resources</directory>
+        <filtering>true</filtering>
+        <includes>
+          <include>archetype-resources/pom.xml</include>
+        </includes>
+      </resource>
+      <!-- all of the other resources file should be used as resource but without filtering
-->
+      <resource>
+        <directory>src/main/resources</directory>
+        <filtering>false</filtering>
+        <excludes>
+          <exclude>archetype-resources/pom.xml</exclude>
+        </excludes>
+      </resource>
+    </resources>
+
+    <pluginManagement>
+      <plugins>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-resources-plugin</artifactId>
+          <configuration>
+            <delimiters>
+              <delimiter>@</delimiter>
+            </delimiters>
+            <useDefaultDelimiters>false</useDefaultDelimiters>
+          </configuration>
+        </plugin>
+      </plugins>
+    </pluginManagement>
+  </build>
   <profiles>
     <!--
       The builds for the example archetypes use unix scripting, so are enabled only on

http://git-wip-us.apache.org/repos/asf/beam/blob/403a64ba/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 7a28072..dddd5ab 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
@@ -25,7 +25,7 @@
   <version>${version}</version>
 
   <properties>
-    <beam.version>0.7.0-SNAPSHOT</beam.version>
+    <beam.version>@project.version@</beam.version>
   </properties>
 
   <repositories>


Mime
View raw message