You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beam.apache.org by dh...@apache.org on 2017/05/23 16:22:00 UTC

[1/2] beam git commit: Re-rename fat jar so that install doesn't install the bundled jar as the default jar.

Repository: beam
Updated Branches:
  refs/heads/master 597b07e0d -> 16ad7e946


Re-rename fat jar so that install doesn't install the bundled jar as the default jar.

Signed-off-by: Jason Kuster <ja...@google.com>


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

Branch: refs/heads/master
Commit: 6ed15278650c326cf58ec1f2aa37855dbfc204eb
Parents: 597b07e
Author: Jason Kuster <ja...@google.com>
Authored: Mon May 22 17:46:49 2017 -0700
Committer: Dan Halperin <dh...@google.com>
Committed: Tue May 23 09:21:48 2017 -0700

----------------------------------------------------------------------
 .../examples-java8/src/main/resources/archetype-resources/pom.xml   | 1 +
 .../examples/src/main/resources/archetype-resources/pom.xml         | 1 +
 2 files changed, 2 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/beam/blob/6ed15278/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 47dfc91..af4fbd3 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
@@ -114,6 +114,7 @@
               <goal>shade</goal>
             </goals>
             <configuration>
+              <finalName>${project.artifactId}-bundled-${project.version}</finalName>
               <filters>
                 <filter>
                   <artifact>*:*</artifact>

http://git-wip-us.apache.org/repos/asf/beam/blob/6ed15278/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 025e356..b8b9c9f 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
@@ -113,6 +113,7 @@
               <goal>shade</goal>
             </goals>
             <configuration>
+              <finalName>${project.artifactId}-bundled-${project.version}</finalName>
               <filters>
                 <filter>
                   <artifact>*:*</artifact>


[2/2] beam git commit: This closes #3204

Posted by dh...@apache.org.
This closes #3204


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

Branch: refs/heads/master
Commit: 16ad7e9466544a5d8d67bd2aa35f4538f6e6a82c
Parents: 597b07e 6ed1527
Author: Dan Halperin <dh...@google.com>
Authored: Tue May 23 09:21:53 2017 -0700
Committer: Dan Halperin <dh...@google.com>
Committed: Tue May 23 09:21:53 2017 -0700

----------------------------------------------------------------------
 .../examples-java8/src/main/resources/archetype-resources/pom.xml   | 1 +
 .../examples/src/main/resources/archetype-resources/pom.xml         | 1 +
 2 files changed, 2 insertions(+)
----------------------------------------------------------------------