Skip to content

Commit 2f6add5

Browse files
committed
Merge remote-tracking branch 'origin/fix/10.0.x/rollback-jdk21-requirement' into release/11.0.17
2 parents 8a93d85 + 4670d3e commit 2f6add5

File tree

3 files changed

+9
-4
lines changed

3 files changed

+9
-4
lines changed

documentation/jetty-documentation/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@
2323
<fail>false</fail>
2424
<rules>
2525
<requireJavaVersion>
26-
<version>[21,)</version>
27-
<message>[ERROR] OLD JDK [${java.version}] in use. Jetty documentation ${project.version} MUST use JDK 21 or newer</message>
26+
<version>[17,)</version>
27+
<message>[ERROR] OLD JDK [${java.version}] in use. Jetty documentation ${project.version} MUST use JDK 17 or newer</message>
2828
</requireJavaVersion>
2929
</rules>
3030
</configuration>

pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2232,8 +2232,8 @@
22322232
<configuration>
22332233
<rules>
22342234
<requireJavaVersion>
2235-
<version>[21,)</version>
2236-
<message>[ERROR] OLD JDK [${java.version}] in use. Jetty Release ${project.version} MUST use JDK 21 or newer</message>
2235+
<version>[17,)</version>
2236+
<message>[ERROR] OLD JDK [${java.version}] in use. Jetty Release ${project.version} MUST use JDK 17 or newer</message>
22372237
</requireJavaVersion>
22382238
</rules>
22392239
</configuration>

scripts/release-jetty.sh

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -163,6 +163,11 @@ if proceedyn "Are you sure you want to release using above? (y/N)" n; then
163163
# This is equivalent to 'mvn release:perform'
164164
if proceedyn "Build/Deploy from tag $TAG_NAME? (Y/n)" y; then
165165
mvn clean deploy -Peclipse-release $DEPLOY_OPTS
166+
echo "IMPORTANT NOTICE: You will need to build+deploy jetty-documentation on JDK21 to make the documentation sane!"
167+
echo "Switch to a new window, make sure you are using JDK21, and run the following command:"
168+
echo "$ mvn clean deploy -Peclipse-release $DEPLOY_OPTS -pl :jetty-documentation"
169+
if proceedyn "Did you build and deploy jetty-documentation in JDK21? (y/N)" n; then
170+
fi
166171
fi
167172
if proceedyn "Update working directory for $VER_NEXT? (Y/n)" y; then
168173
echo "Update VERSION.txt for $VER_NEXT"

0 commit comments

Comments
 (0)