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/10 00:38:56 UTC
[1/4] beam git commit: Include 'sun.reflect' in GcpCoreApiSurfaceTest
Repository: beam
Updated Branches:
refs/heads/master c567550de -> 78a4b8e4f
Include 'sun.reflect' in GcpCoreApiSurfaceTest
Project: http://git-wip-us.apache.org/repos/asf/beam/repo
Commit: http://git-wip-us.apache.org/repos/asf/beam/commit/9443ee87
Tree: http://git-wip-us.apache.org/repos/asf/beam/tree/9443ee87
Diff: http://git-wip-us.apache.org/repos/asf/beam/diff/9443ee87
Branch: refs/heads/master
Commit: 9443ee878d77d979dc070b74b0690b569f1635d7
Parents: 098e6f2
Author: Vikas Kedigehalli <vi...@google.com>
Authored: Tue May 9 17:26:12 2017 -0700
Committer: Davor Bonaci <da...@google.com>
Committed: Tue May 9 17:37:05 2017 -0700
----------------------------------------------------------------------
.../org/apache/beam/sdk/extensions/gcp/GcpCoreApiSurfaceTest.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/beam/blob/9443ee87/sdks/java/extensions/google-cloud-platform-core/src/test/java/org/apache/beam/sdk/extensions/gcp/GcpCoreApiSurfaceTest.java
----------------------------------------------------------------------
diff --git a/sdks/java/extensions/google-cloud-platform-core/src/test/java/org/apache/beam/sdk/extensions/gcp/GcpCoreApiSurfaceTest.java b/sdks/java/extensions/google-cloud-platform-core/src/test/java/org/apache/beam/sdk/extensions/gcp/GcpCoreApiSurfaceTest.java
index a8772c3..625c248 100644
--- a/sdks/java/extensions/google-cloud-platform-core/src/test/java/org/apache/beam/sdk/extensions/gcp/GcpCoreApiSurfaceTest.java
+++ b/sdks/java/extensions/google-cloud-platform-core/src/test/java/org/apache/beam/sdk/extensions/gcp/GcpCoreApiSurfaceTest.java
@@ -50,7 +50,8 @@ public class GcpCoreApiSurfaceTest {
"org.codehaus.jackson",
// via Avro
"org.joda.time",
- "org.junit");
+ "org.junit",
+ "sun.reflect");
assertThat(
ApiSurface.getSdkApiSurface(getClass().getClassLoader()), containsOnlyPackages(allowed));
[3/4] beam git commit: Shade dependencies in sdks/core
Posted by da...@apache.org.
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/62f2173a
Tree: http://git-wip-us.apache.org/repos/asf/beam/tree/62f2173a
Diff: http://git-wip-us.apache.org/repos/asf/beam/diff/62f2173a
Branch: refs/heads/master
Commit: 62f2173a1c03ba0433ab4941b7546f2d789b998f
Parents: c567550
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 17:37:05 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/62f2173a/sdks/java/core/pom.xml
----------------------------------------------------------------------
diff --git a/sdks/java/core/pom.xml b/sdks/java/core/pom.xml
index 7ed6c8a..ef1873d 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/62f2173a/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);
}
[4/4] beam git commit: This closes #3004
Posted by da...@apache.org.
This closes #3004
Project: http://git-wip-us.apache.org/repos/asf/beam/repo
Commit: http://git-wip-us.apache.org/repos/asf/beam/commit/78a4b8e4
Tree: http://git-wip-us.apache.org/repos/asf/beam/tree/78a4b8e4
Diff: http://git-wip-us.apache.org/repos/asf/beam/diff/78a4b8e4
Branch: refs/heads/master
Commit: 78a4b8e4fb014d40f7f6ea3117931f185b9e742b
Parents: c567550 9443ee8
Author: Davor Bonaci <da...@google.com>
Authored: Tue May 9 17:38:48 2017 -0700
Committer: Davor Bonaci <da...@google.com>
Committed: Tue May 9 17:38:48 2017 -0700
----------------------------------------------------------------------
sdks/java/core/pom.xml | 74 ++++++++++++++++++++
.../org/apache/beam/sdk/util/ApiSurface.java | 10 ++-
.../extensions/gcp/GcpCoreApiSurfaceTest.java | 3 +-
3 files changed, 85 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
[2/4] beam git commit: Fix checkstyle error
Posted by da...@apache.org.
Fix checkstyle error
Project: http://git-wip-us.apache.org/repos/asf/beam/repo
Commit: http://git-wip-us.apache.org/repos/asf/beam/commit/098e6f2b
Tree: http://git-wip-us.apache.org/repos/asf/beam/tree/098e6f2b
Diff: http://git-wip-us.apache.org/repos/asf/beam/diff/098e6f2b
Branch: refs/heads/master
Commit: 098e6f2b0195fb650d326edb8159ec3688b585f9
Parents: 62f2173
Author: Vikas Kedigehalli <vi...@google.com>
Authored: Tue May 9 14:28:24 2017 -0700
Committer: Davor Bonaci <da...@google.com>
Committed: Tue May 9 17:37:05 2017 -0700
----------------------------------------------------------------------
.../core/src/main/java/org/apache/beam/sdk/util/ApiSurface.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/beam/blob/098e6f2b/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 685efef..735190b 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
@@ -356,7 +356,7 @@ public class ApiSurface {
try {
clazz = classInfo.load();
} catch (NoClassDefFoundError e) {
- // TODO(BEAM-2231): Ignore any NoClassDefFoundError errors as a workaround.
+ // TODO: Ignore any NoClassDefFoundError errors as a workaround. (BEAM-2231)
LOG.warn("Failed to load class: {}", classInfo.toString(), e);
continue;
}