Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Post 4.0.2 release changes #8176

Merged
merged 2 commits into from
Dec 20, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions docs/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@
<artifactId>maven-javadoc-plugin</artifactId>
<executions>
<execution>
<id>default</id>
<id>attach-javadocs</id>
<goals>
<goal>jar</goal>
</goals>
Expand All @@ -95,7 +95,7 @@
<artifactId>helidon-javadoc-maven-plugin</artifactId>
<executions>
<execution>
<phase>package</phase>
<phase>generate-resources</phase>
<goals>
<goal>javadoc</goal>
</goals>
Expand Down
34 changes: 1 addition & 33 deletions etc/scripts/release.sh
Original file line number Diff line number Diff line change
Expand Up @@ -174,35 +174,6 @@ update_version(){
fi
}

release_site(){
if [ -n "${STAGING_REPO_ID}" ] ; then
readonly MAVEN_REPO_URL="https://oss.sonatype.org/service/local/staging/deployByRepositoryId/${STAGING_REPO_ID}/"
else
readonly MAVEN_REPO_URL="https://oss.sonatype.org/service/local/staging/deploy/maven2/"
fi

# Generate site
mvn ${MAVEN_ARGS} site

# Sign site jar
gpg -ab ${WS_DIR}/target/helidon-project-${FULL_VERSION}-site.jar

# Deploy site.jar and signature file explicitly using deploy-file
mvn ${MAVEN_ARGS} deploy:deploy-file \
-Dfile="${WS_DIR}/target/helidon-project-${FULL_VERSION}-site.jar" \
-Dfiles="${WS_DIR}/target/helidon-project-${FULL_VERSION}-site.jar.asc" \
-Dclassifier="site" \
-Dclassifiers="site" \
-Dtypes="jar.asc" \
-DgeneratePom="false" \
-DgroupId="io.helidon" \
-DartifactId="helidon-project" \
-Dversion="${FULL_VERSION}" \
-Durl="${MAVEN_REPO_URL}" \
-DrepositoryId="ossrh" \
-DretryFailedDeploymentCount="10"
}

release_build(){
# Do the release work in a branch
local GIT_BRANCH="release/${FULL_VERSION}"
Expand Down Expand Up @@ -240,7 +211,7 @@ release_build(){

# Perform deployment
mvn ${MAVEN_ARGS} clean deploy \
-Prelease,archetypes \
-Prelease,archetypes,javadoc,docs \
-DskipTests \
-DstagingRepositoryId="${STAGING_REPO_ID}" \
-DretryFailedDeploymentCount="10"
Expand All @@ -252,9 +223,6 @@ release_build(){
done
fi

# Release site (documentation, javadocs)
release_site

# Close the nexus staging repository
mvn ${MAVEN_ARGS} nexus-staging:rc-close \
-DstagingRepositoryId="${STAGING_REPO_ID}" \
Expand Down
1 change: 1 addition & 0 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -1293,6 +1293,7 @@
<artifactId>maven-javadoc-plugin</artifactId>
<executions>
<execution>
<id>attach-javadocs</id>
<goals>
<goal>jar</goal>
</goals>
Expand Down