You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beam.apache.org by lc...@apache.org on 2016/11/01 00:01:36 UTC

[1/2] incubator-beam git commit: Move resource filtering later to avoid spurious rebuilds

Repository: incubator-beam
Updated Branches:
  refs/heads/master d8eb8be13 -> 8bc68c59b


Move resource filtering later to avoid spurious rebuilds


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

Branch: refs/heads/master
Commit: 2422365719c71cade97e1e74f1fb7f42b264244f
Parents: 54a7374
Author: Kenneth Knowles <kl...@google.com>
Authored: Wed Oct 26 19:56:35 2016 -0700
Committer: Luke Cwik <lc...@google.com>
Committed: Mon Oct 31 16:56:43 2016 -0700

----------------------------------------------------------------------
 sdks/java/core/pom.xml | 29 ++++++++++++++++++++++-------
 1 file changed, 22 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/24223657/sdks/java/core/pom.xml
----------------------------------------------------------------------
diff --git a/sdks/java/core/pom.xml b/sdks/java/core/pom.xml
index 9937cb8..e171c92 100644
--- a/sdks/java/core/pom.xml
+++ b/sdks/java/core/pom.xml
@@ -40,13 +40,6 @@
   </properties>
 
   <build>
-    <resources>
-      <resource>
-        <directory>src/main/resources</directory>
-        <filtering>true</filtering>
-      </resource>
-    </resources>
-
     <pluginManagement>
       <plugins>
         <plugin>
@@ -146,6 +139,28 @@
 
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-resources-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>resources</id>
+            <phase>compile</phase>
+            <goals>
+              <goal>resources</goal>
+            </goals>
+            <configuration>
+              <resources>
+                <resource>
+                  <directory>src/main/resources</directory>
+                  <filtering>true</filtering>
+                </resource>
+              </resources>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-jar-plugin</artifactId>
       </plugin>
 


[2/2] incubator-beam git commit: [BEAM-822] Move resource filtering later to avoid spurious rebuilds

Posted by lc...@apache.org.
[BEAM-822] Move resource filtering later to avoid spurious rebuilds

This closes #1204


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

Branch: refs/heads/master
Commit: 8bc68c59b6992890e9f18df277cb3bb9ddeee361
Parents: d8eb8be 2422365
Author: Luke Cwik <lc...@google.com>
Authored: Mon Oct 31 17:01:03 2016 -0700
Committer: Luke Cwik <lc...@google.com>
Committed: Mon Oct 31 17:01:03 2016 -0700

----------------------------------------------------------------------
 sdks/java/core/pom.xml | 29 ++++++++++++++++++++++-------
 1 file changed, 22 insertions(+), 7 deletions(-)
----------------------------------------------------------------------