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 2016/11/01 18:47:13 UTC
[1/2] incubator-beam git commit: Closes #1239
Repository: incubator-beam
Updated Branches:
refs/heads/master 6a6e042f8 -> 8390a2212
Closes #1239
Project: http://git-wip-us.apache.org/repos/asf/incubator-beam/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-beam/commit/8390a221
Tree: http://git-wip-us.apache.org/repos/asf/incubator-beam/tree/8390a221
Diff: http://git-wip-us.apache.org/repos/asf/incubator-beam/diff/8390a221
Branch: refs/heads/master
Commit: 8390a2212e58b25c042b7324381a07e695e6551d
Parents: 6a6e042 830b8c8
Author: Dan Halperin <dh...@google.com>
Authored: Tue Nov 1 11:47:04 2016 -0700
Committer: Dan Halperin <dh...@google.com>
Committed: Tue Nov 1 11:47:04 2016 -0700
----------------------------------------------------------------------
runners/core-java/pom.xml | 30 ------------------
runners/direct-java/pom.xml | 30 ------------------
runners/google-cloud-dataflow-java/pom.xml | 31 -------------------
sdks/java/core/pom.xml | 30 ------------------
.../main/resources/archetype-resources/pom.xml | 32 --------------------
5 files changed, 153 deletions(-)
----------------------------------------------------------------------
[2/2] incubator-beam git commit: Drop bundled jars from maven shading
profiles
Posted by dh...@apache.org.
Drop bundled jars from maven shading profiles
These bundled jars used to be used for testing, but are no longer
needed. They slow down the build, so let's drop them.
Project: http://git-wip-us.apache.org/repos/asf/incubator-beam/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-beam/commit/830b8c86
Tree: http://git-wip-us.apache.org/repos/asf/incubator-beam/tree/830b8c86
Diff: http://git-wip-us.apache.org/repos/asf/incubator-beam/diff/830b8c86
Branch: refs/heads/master
Commit: 830b8c86073c62a3c425999684d733788f0c31c4
Parents: 6a6e042
Author: Dan Halperin <dh...@google.com>
Authored: Mon Oct 31 15:49:13 2016 -0700
Committer: Dan Halperin <dh...@google.com>
Committed: Tue Nov 1 11:47:04 2016 -0700
----------------------------------------------------------------------
runners/core-java/pom.xml | 30 ------------------
runners/direct-java/pom.xml | 30 ------------------
runners/google-cloud-dataflow-java/pom.xml | 31 -------------------
sdks/java/core/pom.xml | 30 ------------------
.../main/resources/archetype-resources/pom.xml | 32 --------------------
5 files changed, 153 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/830b8c86/runners/core-java/pom.xml
----------------------------------------------------------------------
diff --git a/runners/core-java/pom.xml b/runners/core-java/pom.xml
index 0601512..e3e4fed 100644
--- a/runners/core-java/pom.xml
+++ b/runners/core-java/pom.xml
@@ -95,7 +95,6 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
<executions>
- <!-- In the first phase, we pick dependencies and relocate them. -->
<execution>
<id>bundle-and-repackage</id>
<phase>package</phase>
@@ -134,35 +133,6 @@
</relocations>
</configuration>
</execution>
-
- <!-- In the second phase, we pick remaining dependencies and bundle
- them without repackaging. -->
- <execution>
- <id>bundle-rest-without-repackaging</id>
- <phase>package</phase>
- <goals>
- <goal>shade</goal>
- </goals>
- <configuration>
- <shadeTestJar>true</shadeTestJar>
- <finalName>${project.artifactId}-bundled-${project.version}</finalName>
- <artifactSet>
- <excludes>
- <exclude>com.google.guava:guava</exclude>
- </excludes>
- </artifactSet>
- <filters>
- <filter>
- <artifact>*:*</artifact>
- <excludes>
- <exclude>META-INF/*.SF</exclude>
- <exclude>META-INF/*.DSA</exclude>
- <exclude>META-INF/*.RSA</exclude>
- </excludes>
- </filter>
- </filters>
- </configuration>
- </execution>
</executions>
</plugin>
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/830b8c86/runners/direct-java/pom.xml
----------------------------------------------------------------------
diff --git a/runners/direct-java/pom.xml b/runners/direct-java/pom.xml
index c182d15..84190b2 100644
--- a/runners/direct-java/pom.xml
+++ b/runners/direct-java/pom.xml
@@ -162,7 +162,6 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
<executions>
- <!-- In the first phase, we pick dependencies and relocate them. -->
<execution>
<id>bundle-and-repackage</id>
<phase>package</phase>
@@ -205,35 +204,6 @@
</relocations>
</configuration>
</execution>
-
- <!-- In the second phase, we pick remaining dependencies and bundle
- them without repackaging. -->
- <execution>
- <id>bundle-rest-without-repackaging</id>
- <phase>package</phase>
- <goals>
- <goal>shade</goal>
- </goals>
- <configuration>
- <shadeTestJar>true</shadeTestJar>
- <finalName>${project.artifactId}-bundled-${project.version}</finalName>
- <artifactSet>
- <excludes>
- <exclude>com.google.guava:guava</exclude>
- </excludes>
- </artifactSet>
- <filters>
- <filter>
- <artifact>*:*</artifact>
- <excludes>
- <exclude>META-INF/*.SF</exclude>
- <exclude>META-INF/*.DSA</exclude>
- <exclude>META-INF/*.RSA</exclude>
- </excludes>
- </filter>
- </filters>
- </configuration>
- </execution>
</executions>
</plugin>
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/830b8c86/runners/google-cloud-dataflow-java/pom.xml
----------------------------------------------------------------------
diff --git a/runners/google-cloud-dataflow-java/pom.xml b/runners/google-cloud-dataflow-java/pom.xml
index c5dd274..750f520 100644
--- a/runners/google-cloud-dataflow-java/pom.xml
+++ b/runners/google-cloud-dataflow-java/pom.xml
@@ -164,7 +164,6 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
<executions>
- <!-- In the first phase, we pick dependencies and relocate them. -->
<execution>
<id>bundle-and-repackage</id>
<phase>package</phase>
@@ -219,36 +218,6 @@
</relocations>
</configuration>
</execution>
-
- <!-- In the second phase, we pick remaining dependencies and bundle
- them without repackaging. -->
- <execution>
- <id>bundle-rest-without-repackaging</id>
- <phase>package</phase>
- <goals>
- <goal>shade</goal>
- </goals>
- <configuration>
- <shadeTestJar>true</shadeTestJar>
- <finalName>${project.artifactId}-bundled-${project.version}</finalName>
- <artifactSet>
- <excludes>
- <exclude>com.google.cloud.bigtable:bigtable-client-core</exclude>
- <exclude>com.google.guava:guava</exclude>
- </excludes>
- </artifactSet>
- <filters>
- <filter>
- <artifact>*:*</artifact>
- <excludes>
- <exclude>META-INF/*.SF</exclude>
- <exclude>META-INF/*.DSA</exclude>
- <exclude>META-INF/*.RSA</exclude>
- </excludes>
- </filter>
- </filters>
- </configuration>
- </execution>
</executions>
</plugin>
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/830b8c86/sdks/java/core/pom.xml
----------------------------------------------------------------------
diff --git a/sdks/java/core/pom.xml b/sdks/java/core/pom.xml
index e171c92..29aaaab 100644
--- a/sdks/java/core/pom.xml
+++ b/sdks/java/core/pom.xml
@@ -179,7 +179,6 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
<executions>
- <!-- In the first phase, we pick dependencies and relocate them. -->
<execution>
<id>bundle-and-repackage</id>
<phase>package</phase>
@@ -221,35 +220,6 @@
</relocations>
</configuration>
</execution>
-
- <!-- In the second phase, we pick remaining dependencies and bundle them
- without repackaging. -->
- <execution>
- <id>bundle-rest-without-repackaging</id>
- <phase>package</phase>
- <goals>
- <goal>shade</goal>
- </goals>
- <configuration>
- <shadeTestJar>true</shadeTestJar>
- <finalName>${project.artifactId}-bundled-${project.version}</finalName>
- <artifactSet>
- <excludes>
- <exclude>com.google.guava:guava</exclude>
- </excludes>
- </artifactSet>
- <filters>
- <filter>
- <artifact>*:*</artifact>
- <excludes>
- <exclude>META-INF/*.SF</exclude>
- <exclude>META-INF/*.DSA</exclude>
- <exclude>META-INF/*.RSA</exclude>
- </excludes>
- </filter>
- </filters>
- </configuration>
- </execution>
</executions>
</plugin>
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/830b8c86/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 7926578..45bcf8a 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
@@ -40,38 +40,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-shade-plugin</artifactId>
- <version>2.3</version>
- <executions>
- <execution>
- <phase>package</phase>
- <goals>
- <goal>shade</goal>
- </goals>
- <configuration>
- <finalName>${project.artifactId}-bundled-${project.version}</finalName>
- <artifactSet>
- <includes>
- <include>*:*</include>
- </includes>
- </artifactSet>
- <filters>
- <filter>
- <artifact>*:*</artifact>
- <excludes>
- <exclude>META-INF/*.SF</exclude>
- <exclude>META-INF/*.DSA</exclude>
- <exclude>META-INF/*.RSA</exclude>
- </excludes>
- </filter>
- </filters>
- </configuration>
- </execution>
- </executions>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>2.19.1</version>
<configuration>