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/05/09 20:32:25 UTC
[1/2] beam git commit: Shade dependencies in sdks/core
Repository: beam
Updated Branches:
refs/heads/release-2.0.0 df2cdd899 -> c289304b8
Shade dependencies in sdks/core
Project: http://git-wip-us.apache.org/repos/asf/beam/repo
Commit: http://git-wip-us.apache.org/repos/asf/beam/commit/959b185a
Tree: http://git-wip-us.apache.org/repos/asf/beam/tree/959b185a
Diff: http://git-wip-us.apache.org/repos/asf/beam/diff/959b185a
Branch: refs/heads/release-2.0.0
Commit: 959b185a552a6045495d3db004f039944066b9ff
Parents: df2cdd8
Author: Vikas Kedigehalli <vi...@google.com>
Authored: Tue May 9 11:41:29 2017 -0700
Committer: Davor Bonaci <da...@google.com>
Committed: Tue May 9 13:32:08 2017 -0700
----------------------------------------------------------------------
sdks/java/core/pom.xml | 74 ++++++++++++++++++++
.../org/apache/beam/sdk/util/ApiSurface.java | 10 ++-
2 files changed, 83 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/beam/blob/959b185a/sdks/java/core/pom.xml
----------------------------------------------------------------------
diff --git a/sdks/java/core/pom.xml b/sdks/java/core/pom.xml
index a3967a2..9e90a7c 100644
--- a/sdks/java/core/pom.xml
+++ b/sdks/java/core/pom.xml
@@ -120,6 +120,80 @@
</execution>
</executions>
</plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-shade-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>bundle-and-repackage</id>
+ <phase>package</phase>
+ <goals>
+ <goal>shade</goal>
+ </goals>
+ <configuration>
+ <artifactSet>
+ <includes>
+ <include>com.google.guava:guava</include>
+ <include>com.google.protobuf:protobuf-java</include>
+ <include>net.bytebuddy:byte-buddy</include>
+ <include>org.apache.commons:*</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>
+ <relocations>
+ <relocation>
+ <pattern>com.google.common</pattern>
+ <!--suppress MavenModelInspection -->
+ <shadedPattern>
+ org.apache.beam.sdk.repackaged.com.google.common
+ </shadedPattern>
+ </relocation>
+ <relocation>
+ <pattern>com.google.thirdparty</pattern>
+ <!--suppress MavenModelInspection -->
+ <shadedPattern>
+ org.apache.beam.sdk.repackaged.com.google.thirdparty
+ </shadedPattern>
+ </relocation>
+ <relocation>
+ <pattern>com.google.protobuf</pattern>
+ <!--suppress MavenModelInspection -->
+ <shadedPattern>
+ org.apache.beam.sdk.repackaged.com.google.protobuf
+ </shadedPattern>
+ </relocation>
+ <relocation>
+ <pattern>net.bytebuddy</pattern>
+ <!--suppress MavenModelInspection -->
+ <shadedPattern>
+ org.apache.beam.sdk.repackaged.net.bytebuddy
+ </shadedPattern>
+ </relocation>
+ <relocation>
+ <pattern>org.apache.commons</pattern>
+ <!--suppress MavenModelInspection -->
+ <shadedPattern>
+ org.apache.beam.sdk.repackaged.org.apache.commons
+ </shadedPattern>
+ </relocation>
+ </relocations>
+ <transformers>
+ <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer" />
+ </transformers>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
http://git-wip-us.apache.org/repos/asf/beam/blob/959b185a/sdks/java/core/src/main/java/org/apache/beam/sdk/util/ApiSurface.java
----------------------------------------------------------------------
diff --git a/sdks/java/core/src/main/java/org/apache/beam/sdk/util/ApiSurface.java b/sdks/java/core/src/main/java/org/apache/beam/sdk/util/ApiSurface.java
index 8c2b988..685efef 100644
--- a/sdks/java/core/src/main/java/org/apache/beam/sdk/util/ApiSurface.java
+++ b/sdks/java/core/src/main/java/org/apache/beam/sdk/util/ApiSurface.java
@@ -352,7 +352,15 @@ public class ApiSurface {
Set<Class<?>> newRootClasses = Sets.newHashSet();
for (ClassPath.ClassInfo classInfo : classPath.getTopLevelClassesRecursive(packageName)) {
- Class clazz = classInfo.load();
+ Class clazz = null;
+ try {
+ clazz = classInfo.load();
+ } catch (NoClassDefFoundError e) {
+ // TODO(BEAM-2231): Ignore any NoClassDefFoundError errors as a workaround.
+ LOG.warn("Failed to load class: {}", classInfo.toString(), e);
+ continue;
+ }
+
if (exposed(clazz.getModifiers())) {
newRootClasses.add(clazz);
}
[2/2] beam git commit: This closes #2996
Posted by da...@apache.org.
This closes #2996
Project: http://git-wip-us.apache.org/repos/asf/beam/repo
Commit: http://git-wip-us.apache.org/repos/asf/beam/commit/c289304b
Tree: http://git-wip-us.apache.org/repos/asf/beam/tree/c289304b
Diff: http://git-wip-us.apache.org/repos/asf/beam/diff/c289304b
Branch: refs/heads/release-2.0.0
Commit: c289304b8b6815ef8899eca21f98e1290ac90eb7
Parents: df2cdd8 959b185
Author: Davor Bonaci <da...@google.com>
Authored: Tue May 9 13:32:16 2017 -0700
Committer: Davor Bonaci <da...@google.com>
Committed: Tue May 9 13:32:16 2017 -0700
----------------------------------------------------------------------
sdks/java/core/pom.xml | 74 ++++++++++++++++++++
.../org/apache/beam/sdk/util/ApiSurface.java | 10 ++-
2 files changed, 83 insertions(+), 1 deletion(-)
----------------------------------------------------------------------