[
https://issues.apache.org/jira/browse/BEAM-4060?focusedWorklogId=104698&page=com.atlassian.jira.plugin.system.issuetabpanels:worklog-tabpanel#worklog-104698
]
ASF GitHub Bot logged work on BEAM-4060:
----------------------------------------
Author: ASF GitHub Bot
Created on: 22/May/18 17:17
Start Date: 22/May/18 17:17
Worklog Time Spent: 10m
Work Description: lukecwik closed pull request #5453: [BEAM-4060] Add the
pom.xml and pom.properties file to the artifact when publishing
URL: https://github.com/apache/beam/pull/5453
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/build_rules.gradle b/build_rules.gradle
index 019140cb0e5..ff070d3aaa8 100644
--- a/build_rules.gradle
+++ b/build_rules.gradle
@@ -563,6 +563,32 @@ ext.applyJavaNature = {
if (isRelease() || project.hasProperty('publishing')) {
apply plugin: "maven-publish"
+ // Create a task which emulates the maven-archiver plugin in generating a
+ // pom.properties file.
+ task generatePomPropertiesFileForMavenJavaPublication {
+ outputs.file "${project.buildDir}/publications/mavenJava/pom.properties"
+ doLast {
+ new
File("${project.buildDir}/publications/mavenJava/pom.properties").text =
+"""version=${project.version}
+groupId=${project.group}
+artifactId=${project.name}
+"""
+ }
+ }
+
+ // Have the shaded include both the generate pom.xml and its properties
file
+ // emulating the behavior of the maven-archiver plugin.
+ shadowJar {
+ dependsOn 'generatePomFileForMavenJavaPublication'
+ into("META-INF/maven/${project.group}/${project.name}") {
+ from "${project.buildDir}/publications/mavenJava/pom.xml"
+ }
+ dependsOn 'generatePomPropertiesFileForMavenJavaPublication'
+ into("META-INF/maven/${project.group}/${project.name}") {
+ from "${project.buildDir}/publications/mavenJava/pom.properties"
+ }
+ }
+
// Only build artifacts for archives if we are publishing
artifacts.archives shadowJar
artifacts.archives shadowTestJar
@@ -601,7 +627,7 @@ ext.applyJavaNature = {
model {
tasks.generatePomFileForMavenJavaPublication {
- destination = file("$buildDir/generated-pom.xml")
+ destination = file("$buildDir/publications/mavenJava/pom.xml")
}
tasks.publishMavenJavaPublicationToMavenLocal {
dependsOn project.tasks.signArchives
@@ -784,7 +810,7 @@ ext.applyJavaNature = {
elem.insertBefore(hdr, elem.getFirstChild())
// create the sign pom artifact
- def pomFile = file("${project.buildDir}/generated-pom.xml")
+ def pomFile =
file("${project.buildDir}/publications/mavenJava/pom.xml")
writeTo(pomFile)
if (isRelease()) {
def pomAscFile = signing.sign(pomFile).signatureFiles[0]
----------------------------------------------------------------
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: 104698)
Time Spent: 0.5h (was: 20m)
> meta-info/poms missing in snapshots
> -----------------------------------
>
> Key: BEAM-4060
> URL: https://issues.apache.org/jira/browse/BEAM-4060
> Project: Beam
> Issue Type: Sub-task
> Components: build-system
> Affects Versions: 2.5.0
> Reporter: Rafal Wojdyla
> Assignee: Luke Cwik
> Priority: Blocker
> Fix For: 2.5.0
>
> Time Spent: 0.5h
> Remaining Estimate: 0h
>
> Current snapshots are missing bunch of meta-info files, including pom.xml and
> pom.properties:
> 2.4.0-SNAPSHOT example:
> {noformat}
> jar -tf
> ~/.ivy2/cache/org.apache.beam/beam-runners-direct-java/jars/beam-runners-direct-java-2.4.0-SNAPSHOT.jar
> | grep META-INFMETA-INF/
> META-INF/DEPENDENCIES
> META-INF/LICENSE
> META-INF/MANIFEST.MF
> META-INF/NOTICE
> META-INF/maven/
> META-INF/maven/com.google.code.findbugs/
> META-INF/maven/com.google.code.findbugs/jsr305/
> META-INF/maven/com.google.code.findbugs/jsr305/pom.properties
> META-INF/maven/com.google.code.findbugs/jsr305/pom.xml
> META-INF/maven/com.google.guava/
> META-INF/maven/com.google.guava/guava/
> META-INF/maven/com.google.guava/guava/pom.properties
> META-INF/maven/com.google.guava/guava/pom.xml
> META-INF/maven/com.google.protobuf/
> META-INF/maven/com.google.protobuf/protobuf-java-util/
> META-INF/maven/com.google.protobuf/protobuf-java-util/pom.properties
> META-INF/maven/com.google.protobuf/protobuf-java-util/pom.xml
> META-INF/maven/com.google.protobuf/protobuf-java/
> META-INF/maven/com.google.protobuf/protobuf-java/pom.properties
> META-INF/maven/com.google.protobuf/protobuf-java/pom.xml
> META-INF/maven/org.apache.beam/
> META-INF/maven/org.apache.beam/beam-model-pipeline/
> META-INF/maven/org.apache.beam/beam-model-pipeline/pom.properties
> META-INF/maven/org.apache.beam/beam-model-pipeline/pom.xml
> META-INF/maven/org.apache.beam/beam-runners-core-construction-java/
> META-INF/maven/org.apache.beam/beam-runners-core-construction-java/pom.properties
> META-INF/maven/org.apache.beam/beam-runners-core-construction-java/pom.xml
> META-INF/maven/org.apache.beam/beam-runners-core-java/
> META-INF/maven/org.apache.beam/beam-runners-core-java/pom.properties
> META-INF/maven/org.apache.beam/beam-runners-core-java/pom.xml
> META-INF/maven/org.apache.beam/beam-runners-direct-java/
> META-INF/maven/org.apache.beam/beam-runners-direct-java/pom.properties
> META-INF/maven/org.apache.beam/beam-runners-direct-java/pom.xml
> META-INF/services/
> META-INF/services/org.apache.beam.runners.direct.repackaged.runners.core.construction.CoderTranslatorRegistrar
> META-INF/services/org.apache.beam.runners.direct.repackaged.runners.core.construction.TransformPayloadTranslatorRegistrar
> META-INF/services/org.apache.beam.sdk.options.PipelineOptionsRegistrar
> META-INF/services/org.apache.beam.sdk.runners.PipelineRunnerRegistrar
> {noformat}
> 2.5.0-SNAPSHOT:
> {noformat}
> circleci@5abc19b95c60:~/scio$ jar -tf
> ~/.ivy2/cache/org.apache.beam/beam-runners-direct-java/jars/beam-runners-direct-java-2.5.0-SNAPSHOT.jar
> | grep META-INF
> META-INF/
> META-INF/MANIFEST.MF
> META-INF/services/
> META-INF/maven/
> META-INF/maven/com.google.guava/
> META-INF/maven/com.google.guava/guava/
> META-INF/maven/com.google.guava/guava/pom.properties
> META-INF/maven/com.google.guava/guava/pom.xml
> META-INF/maven/com.google.protobuf/
> META-INF/maven/com.google.protobuf/protobuf-java-util/
> META-INF/maven/com.google.protobuf/protobuf-java-util/pom.properties
> META-INF/maven/com.google.protobuf/protobuf-java-util/pom.xml
> META-INF/maven/com.google.protobuf/protobuf-java/
> META-INF/maven/com.google.protobuf/protobuf-java/pom.properties
> META-INF/maven/com.google.protobuf/protobuf-java/pom.xml
> META-INF/services/org.apache.beam.repackaged.beam_runners_direct_java.runners.core.construction.TransformPayloadTranslatorRegistrar
> META-INF/services/org.apache.beam.sdk.runners.PipelineRunnerRegistrar
> META-INF/services/org.apache.beam.sdk.options.PipelineOptionsRegistrar
> META-INF/services/org.apache.beam.repackaged.beam_runners_direct_java.runners.core.construction.CoderTranslatorRegistrar
> {noformat}
--
This message was sent by Atlassian JIRA
(v7.6.3#76005)
