Skip to content

Commit 8190cfa

Browse files
committed
Simplify publishToMaven.jenkinsfile
- There is no need to filter out wanted content because the aggregator only aggregates what we want to publish. - There is no need to enrich the poms because the aggregator creates poms the meet the nexus publishing requirements and tests that the poms do actually conform. - There is no need to create javadoc stubs because the aggregator generates one (for every artifact with a corresponding `sources.jar`. - There is no need to recompute checksums because nothing is modified.
1 parent 1ead435 commit 8190cfa

File tree

1 file changed

+0
-57
lines changed

1 file changed

+0
-57
lines changed

JenkinsJobs/Releng/publishToMaven.jenkinsfile

Lines changed: 0 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ pipeline {
1515
}
1616
environment {
1717
// Filter out all the feature, test, and product IUs that are not published. Escape dots to match them literally
18-
EXCLUDED_ARTIFACTS = "${'.feature.group$|.feature.jar$|.test|org.eclipse.equinox.executable|org.eclipse.platform.ide|org.eclipse.sdk.ide|_root$'.replace('.', '\\.')}"
1918
REPO = "${WORKSPACE}/repo"
2019
PATH = "${installMavenDaemon('1.0.2')}/bin:${PATH}"
2120
// Folder ~/.m2 is not writable for builds, ensure mvnd metadata are written within the workspace.
@@ -58,70 +57,14 @@ pipeline {
5857
mv ${repoRaw}/final ${REPO}
5958
rm -rf ${repoRaw}
6059

61-
echo "==== Enrich POMs ===="
62-
# Add some required information to the generated poms:
63-
# - dynamic content (retrieved mostly from MANIFEST.MF):
64-
# - name
65-
# - url
66-
# - scm connection, tag and url
67-
# - semi dynamic
68-
# - developers (based on static map git-repo-base -> project leads)
69-
# - static content
70-
# - license
71-
# - organization
72-
# - issue management
73-
74-
enrichPomsSourceFile="${MAVEN_PUBLISH_BASE}/src/org/eclipse/platform/releng/maven/pom/EnrichPoms.java"
75-
set -x
76-
java ${enrichPomsSourceFile} ${REPO}/org/eclipse/{platform,jdt,pde}
77-
set +x
78-
79-
echo "==== Add Javadoc stubs ===="
80-
81-
# (groupSimpleName, javadocArtifactGA)
82-
function createJavadocs() {
83-
group=${1}
84-
jar="${1}-javadoc.jar"
85-
artifact=${2}
86-
if [ -r ${jar} ]; then
87-
rm ${jar}
88-
fi
89-
echo -e "Corresponding javadoc can be found in artifact ${artifact}\\n" > README.txt
90-
jar cf ${jar} README.txt
91-
for pom in org/eclipse/${group}/*/*/*.pom; do
92-
pomFolder=$(dirname ${pom})
93-
# This is not working because EXCLUDED_ARTIFACTS_PATTERN is not defined and the empty string matches everything.
94-
# if [[ ! $pomFolder =~ ${EXCLUDED_ARTIFACTS_PATTERN} ]]; then
95-
javadoc=`echo ${pom} | sed -e "s|\\(.*\\)\\.pom|\\1-javadoc.jar|"`
96-
cp ${jar} ${javadoc}
97-
# fi
98-
done
99-
}
100-
10160
pushd ${REPO}
102-
createJavadocs platform org.eclipse.platform:org.eclipse.platform.doc.isv
103-
createJavadocs jdt org.eclipse.jdt:org.eclipse.jdt.doc.isv
104-
createJavadocs pde org.eclipse.pde:org.eclipse.pde.doc.user
105-
106-
107-
echo "==== Recalculate pom-file hashes ===="
108-
109-
# Because the pom enhancer modified the poms the checksums are wrong which produces noisy warnings.
110-
# So regenerate the sha1 for every pom.
111-
for i in $(find org -name *.pom); do
112-
echo "Recalculate checksum of $i"
113-
sha1sum -b < $i | awk '{print $1}' > $i.sha1
114-
done
11561

11662
echo "========== Repo aggregation completed ========="
11763

11864
# Find all the artifact folders for all projects
11965
for project in {platform,jdt,pde}; do
12066
for pomPath in org/eclipse/${project}/*/*/*.pom; do
12167
artifactId=$(basename $(dirname $(dirname ${pomPath})))
122-
if [[ $artifactId =~ ${EXCLUDED_ARTIFACTS} ]]; then
123-
continue # Skip excluded artifact
124-
fi
12568
version=$(basename $(dirname ${pomPath}))
12669
groupPath=$(dirname $(dirname $(dirname ${pomPath})))
12770
groupId=${groupPath//'/'/.}

0 commit comments

Comments
 (0)