[
https://issues.apache.org/jira/browse/BEAM-3608?focusedWorklogId=168593&page=com.atlassian.jira.plugin.system.issuetabpanels:worklog-tabpanel#worklog-168593
]
ASF GitHub Bot logged work on BEAM-3608:
----------------------------------------
Author: ASF GitHub Bot
Created on: 22/Nov/18 00:33
Start Date: 22/Nov/18 00:33
Worklog Time Spent: 10m
Work Description: chamikaramj closed pull request #7111: Cherry-pick PR
#7109 [BEAM-3608, BEAM-5819] Pass through parameters needed for publishingfor
Guava and disable publishing for vendored dependencies when performing a normal
release.
URL: https://github.com/apache/beam/pull/7111
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git
a/buildSrc/src/main/groovy/org/apache/beam/gradle/VendorJavaPlugin.groovy
b/buildSrc/src/main/groovy/org/apache/beam/gradle/VendorJavaPlugin.groovy
index 70f87db9fcc..1b870fcacd2 100644
--- a/buildSrc/src/main/groovy/org/apache/beam/gradle/VendorJavaPlugin.groovy
+++ b/buildSrc/src/main/groovy/org/apache/beam/gradle/VendorJavaPlugin.groovy
@@ -136,10 +136,10 @@ artifactId=${project.name}
}
project.check.dependsOn 'validateVendoring'
- project.apply plugin: 'maven-publish'
-
// Only publish vendored dependencies if specifically requested.
if (project.hasProperty("vendoredDependenciesOnly")) {
+ project.apply plugin: 'maven-publish'
+
// Have the shaded jar include both the generate pom.xml and its
properties file
// emulating the behavior of the maven-archiver plugin.
project.shadowJar {
diff --git a/vendor/guava-20_0/build.gradle b/vendor/guava-20_0/build.gradle
index 2b51af84159..3f01d68b084 100644
--- a/vendor/guava-20_0/build.gradle
+++ b/vendor/guava-20_0/build.gradle
@@ -29,5 +29,7 @@ vendorJava(
"com.google.common":
"org.apache.beam.vendor.guava.v20_0.com.google.common",
"com.google.thirdparty":
"org.apache.beam.vendor.guava.v20_0.com.google.thirdparty",
],
- artifactId: "beam-vendor-guava-20_0"
+ groupId: group,
+ artifactId: "beam-vendor-guava-20_0",
+ version: version,
)
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
Issue Time Tracking
-------------------
Worklog Id: (was: 168593)
Time Spent: 7.5h (was: 7h 20m)
> Vendor Guava
> ------------
>
> Key: BEAM-3608
> URL: https://issues.apache.org/jira/browse/BEAM-3608
> Project: Beam
> Issue Type: Sub-task
> Components: runner-core, sdk-java-core
> Reporter: Kenneth Knowles
> Assignee: Kenneth Knowles
> Priority: Major
> Time Spent: 7.5h
> Remaining Estimate: 0h
>
> Instead of shading as part of our build, we can shade before build so that it
> is apparent when reading code, and in IDEs, that a particular class resides
> in a hidden namespace.
> {{import com.google.common.reflect.TypeToken}}
> becomes something like
> {{import org.apache.beam.private.guava21.com.google.common.reflect.TypeToken}}
> So we can very trivially ban `org.apache.beam.private` from public APIs
> unless they are annotated {{@Internal}}, and it makes sharing between our own
> modules never get broken by shading again.
--
This message was sent by Atlassian JIRA
(v7.6.3#76005)
