beam-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From da...@apache.org
Subject [2/3] beam git commit: PR polish: move testResources section from all-archetypes level to starter-archetype level
Date Fri, 05 May 2017 23:17:49 GMT
PR polish: move testResources section from all-archetypes level to starter-archetype level


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

Branch: refs/heads/master
Commit: 1aaca2bf0273287831f673b1b22dd16bfb94878d
Parents: 4675f38
Author: Davor Bonaci <davor@google.com>
Authored: Fri May 5 16:14:07 2017 -0700
Committer: Davor Bonaci <davor@google.com>
Committed: Fri May 5 16:17:28 2017 -0700

----------------------------------------------------------------------
 sdks/java/maven-archetypes/pom.xml         | 9 ++-------
 sdks/java/maven-archetypes/starter/pom.xml | 8 ++++++++
 2 files changed, 10 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/beam/blob/1aaca2bf/sdks/java/maven-archetypes/pom.xml
----------------------------------------------------------------------
diff --git a/sdks/java/maven-archetypes/pom.xml b/sdks/java/maven-archetypes/pom.xml
index 08be5b2..0a37c52 100644
--- a/sdks/java/maven-archetypes/pom.xml
+++ b/sdks/java/maven-archetypes/pom.xml
@@ -54,13 +54,7 @@
         </excludes>
       </resource>
     </resources>
-    <!-- needed to replace version in the reference projects -->
-    <testResources>
-      <testResource>
-        <directory>src/test/resources</directory>
-        <filtering>true</filtering>
-      </testResource>
-    </testResources>
+
     <pluginManagement>
       <plugins>
         <plugin>
@@ -76,6 +70,7 @@
       </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/1aaca2bf/sdks/java/maven-archetypes/starter/pom.xml
----------------------------------------------------------------------
diff --git a/sdks/java/maven-archetypes/starter/pom.xml b/sdks/java/maven-archetypes/starter/pom.xml
index 17ed0de..06b41c8 100644
--- a/sdks/java/maven-archetypes/starter/pom.xml
+++ b/sdks/java/maven-archetypes/starter/pom.xml
@@ -42,6 +42,14 @@
       </extension>
     </extensions>
 
+    <!-- Needed to replace version in the reference projects. -->
+    <testResources>
+      <testResource>
+        <directory>src/test/resources</directory>
+        <filtering>true</filtering>
+      </testResource>
+    </testResources>
+
     <pluginManagement>
       <plugins>
         <plugin>


Mime
View raw message