You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beam.apache.org by da...@apache.org on 2017/03/06 02:01:55 UTC

[1/4] beam git commit: Java examples: move shade plugin into default lifecycle

Repository: beam
Updated Branches:
  refs/heads/master 9541f8fcc -> 2f96bc326


Java examples: move shade plugin into default lifecycle

This helps users running the examples on runner that require the fat/bundled jar.


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

Branch: refs/heads/master
Commit: 0360b1b3be6190d36e1af1d2d077251ef60106d8
Parents: 90c8094
Author: Davor Bonaci <da...@google.com>
Authored: Sun Mar 5 16:43:48 2017 -0800
Committer: Davor Bonaci <da...@google.com>
Committed: Sun Mar 5 18:01:32 2017 -0800

----------------------------------------------------------------------
 .../main/resources/archetype-resources/pom.xml  | 64 ++++++++++----------
 1 file changed, 32 insertions(+), 32 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/beam/blob/0360b1b3/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 6a12324..0ed23fd 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
@@ -73,6 +73,38 @@
           </dependency>
         </dependencies>
       </plugin>
+
+      <!--
+        Configures `mvn package` to produce a bundled jar ("fat jar") for runners
+        that require this for job submission to a cluster.
+      -->
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-shade-plugin</artifactId>
+        <version>2.4.1</version>
+        <executions>
+          <execution>
+            <phase>package</phase>
+            <goals>
+              <goal>shade</goal>
+            </goals>
+            <configuration>
+              <finalName>${project.artifactId}-bundled-${project.version}</finalName>
+              <filters>
+                <filter>
+                  <artifact>*:*</artifact>
+                  <excludes>
+                    <exclude>META-INF/LICENSE</exclude>
+                    <exclude>META-INF/*.SF</exclude>
+                    <exclude>META-INF/*.DSA</exclude>
+                    <exclude>META-INF/*.RSA</exclude>
+                  </excludes>
+                </filter>
+              </filters>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
     </plugins>
 
     <pluginManagement>
@@ -85,38 +117,6 @@
             <cleanupDaemonThreads>false</cleanupDaemonThreads>
           </configuration>
         </plugin>
-
-        <!--
-          Configures `mvn package` to produce a bundled jar ("fat jar") for runners
-          that require this for job submission to a cluster.
-        -->
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-shade-plugin</artifactId>
-          <version>2.4.1</version>
-          <executions>
-            <execution>
-              <phase>package</phase>
-              <goals>
-                <goal>shade</goal>
-              </goals>
-              <configuration>
-                <finalName>${project.artifactId}-bundled-${project.version}</finalName>
-                <filters>
-                  <filter>
-                    <artifact>*:*</artifact>
-                    <excludes>
-                      <exclude>META-INF/LICENSE</exclude>
-                      <exclude>META-INF/*.SF</exclude>
-                      <exclude>META-INF/*.DSA</exclude>
-                      <exclude>META-INF/*.RSA</exclude>
-                    </excludes>
-                  </filter>
-                </filters>
-              </configuration>
-            </execution>
-          </executions>
-        </plugin>
       </plugins>
     </pluginManagement>
   </build>


[2/4] beam git commit: Java 8 examples: add shade configuration for producing bundled/fat jar

Posted by da...@apache.org.
Java 8 examples: add shade configuration for producing bundled/fat jar

This helps users who may need the fat jar to submit it to the cluster.


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

Branch: refs/heads/master
Commit: 90c8094d883983f0006065169fd3ef230963e083
Parents: 630df6f
Author: Davor Bonaci <da...@google.com>
Authored: Sun Mar 5 15:23:07 2017 -0800
Committer: Davor Bonaci <da...@google.com>
Committed: Sun Mar 5 18:01:32 2017 -0800

----------------------------------------------------------------------
 .../main/resources/archetype-resources/pom.xml  | 32 ++++++++++++++++++++
 1 file changed, 32 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/beam/blob/90c8094d/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 f30a35f..3907fd5 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
@@ -73,6 +73,38 @@
           </dependency>
         </dependencies>
       </plugin>
+
+      <!--
+        Configures `mvn package` to produce a bundled jar ("fat jar") for runners
+        that require this for job submission to a cluster.
+      -->
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-shade-plugin</artifactId>
+        <version>2.4.1</version>
+        <executions>
+          <execution>
+            <phase>package</phase>
+            <goals>
+              <goal>shade</goal>
+            </goals>
+            <configuration>
+              <finalName>${project.artifactId}-bundled-${project.version}</finalName>
+              <filters>
+                <filter>
+                  <artifact>*:*</artifact>
+                  <excludes>
+                    <exclude>META-INF/LICENSE</exclude>
+                    <exclude>META-INF/*.SF</exclude>
+                    <exclude>META-INF/*.DSA</exclude>
+                    <exclude>META-INF/*.RSA</exclude>
+                  </excludes>
+                </filter>
+              </filters>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
     </plugins>
 
     <pluginManagement>


[4/4] beam git commit: This closes #2165

Posted by da...@apache.org.
This closes #2165


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

Branch: refs/heads/master
Commit: 2f96bc3260b98a97d532f8451d8fa63809f1ae51
Parents: 9541f8f 0360b1b
Author: Davor Bonaci <da...@google.com>
Authored: Sun Mar 5 18:01:46 2017 -0800
Committer: Davor Bonaci <da...@google.com>
Committed: Sun Mar 5 18:01:46 2017 -0800

----------------------------------------------------------------------
 .../main/resources/archetype-resources/pom.xml  | 46 ++++++++++++++
 .../main/resources/archetype-resources/pom.xml  | 64 ++++++++++----------
 2 files changed, 78 insertions(+), 32 deletions(-)
----------------------------------------------------------------------



[3/4] beam git commit: Java 8 examples: add SNAPSHOT repository to the pom.xml file

Posted by da...@apache.org.
Java 8 examples: add SNAPSHOT repository to the pom.xml file

This enables users of the archetype to reference nightly builds if they so choose.


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

Branch: refs/heads/master
Commit: 630df6f0e328d52d0892a56ae8493946b78dd6b9
Parents: 9541f8f
Author: Davor Bonaci <da...@google.com>
Authored: Sun Mar 5 15:21:22 2017 -0800
Committer: Davor Bonaci <da...@google.com>
Committed: Sun Mar 5 18:01:32 2017 -0800

----------------------------------------------------------------------
 .../src/main/resources/archetype-resources/pom.xml    | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/beam/blob/630df6f0/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 e025f9e..f30a35f 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
@@ -30,6 +30,20 @@
     <beam.version>0.6.0-SNAPSHOT</beam.version>
   </properties>
 
+  <repositories>
+    <repository>
+      <id>apache.snapshots</id>
+      <name>Apache Development Snapshot Repository</name>
+      <url>https://repository.apache.org/content/repositories/snapshots/</url>
+      <releases>
+        <enabled>false</enabled>
+      </releases>
+      <snapshots>
+        <enabled>true</enabled>
+      </snapshots>
+    </repository>
+  </repositories>
+
   <build>
     <plugins>
       <plugin>