Skip to content

Commit

Permalink
Rollback JDK21 requirements during Compile + Jar creation.
Browse files Browse the repository at this point in the history
Only have JDK21 requirement for jetty-documentation in release script.

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
  • Loading branch information
joakime committed Oct 6, 2023
1 parent 90fdd42 commit 4670d3e
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 4 deletions.
4 changes: 2 additions & 2 deletions documentation/jetty-documentation/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@
<fail>false</fail>
<rules>
<requireJavaVersion>
<version>[21,)</version>
<message>[ERROR] OLD JDK [${java.version}] in use. Jetty documentation ${project.version} MUST use JDK 21 or newer</message>
<version>[17,)</version>
<message>[ERROR] OLD JDK [${java.version}] in use. Jetty documentation ${project.version} MUST use JDK 17 or newer</message>
</requireJavaVersion>
</rules>
</configuration>
Expand Down
4 changes: 2 additions & 2 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2216,8 +2216,8 @@
<configuration>
<rules>
<requireJavaVersion>
<version>[21,)</version>
<message>[ERROR] OLD JDK [${java.version}] in use. Jetty Release ${project.version} MUST use JDK 21 or newer</message>
<version>[17,)</version>
<message>[ERROR] OLD JDK [${java.version}] in use. Jetty Release ${project.version} MUST use JDK 17 or newer</message>
</requireJavaVersion>
</rules>
</configuration>
Expand Down
5 changes: 5 additions & 0 deletions scripts/release-jetty.sh
Original file line number Diff line number Diff line change
Expand Up @@ -163,6 +163,11 @@ if proceedyn "Are you sure you want to release using above? (y/N)" n; then
# This is equivalent to 'mvn release:perform'
if proceedyn "Build/Deploy from tag $TAG_NAME? (Y/n)" y; then
mvn clean deploy -Peclipse-release $DEPLOY_OPTS
echo "IMPORTANT NOTICE: You will need to build+deploy jetty-documentation on JDK21 to make the documentation sane!"
echo "Switch to a new window, make sure you are using JDK21, and run the following command:"
echo "$ mvn clean deploy -Peclipse-release $DEPLOY_OPTS -pl :jetty-documentation"
if proceedyn "Did you build and deploy jetty-documentation in JDK21? (y/N)" n; then
fi
fi
if proceedyn "Update working directory for $VER_NEXT? (Y/n)" y; then
echo "Update VERSION.txt for $VER_NEXT"
Expand Down

0 comments on commit 4670d3e

Please sign in to comment.