Skip to content

Commit a1747f9

Browse files
committed
Update Gretty in preparation for version 5
1 parent b355505 commit a1747f9

File tree

8 files changed

+19
-365
lines changed

8 files changed

+19
-365
lines changed

.java-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
11.0
1+
17.0

README.md

Lines changed: 6 additions & 338 deletions
Large diffs are not rendered by default.

RELEASING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ CTRL-D
1717
- Check build passes on GitHub Actions.
1818
- Tag new release commit using `git tag -a -s -m "release ?.?.?" v?.?.?` or `git tag v?.?.? <commit-hash>` if using an existing commit.
1919
- Checkout tag.
20-
- Set JDK path to a JDK11 installation.
20+
- Set JDK path to a JDK17 installation.
2121

2222
- Check `~/.gradle/gradle.properties` for credentials for `plugins.gradle.org` and `Sonatype` and for a GPG key name:
2323

buildSrc/src/main/groovy/grettybuild.common.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -98,8 +98,8 @@ ext.configurePublications = { String publicationName ->
9898
rootProject.tasks.testAllIntegrationTests.dependsOn project.tasks.publishToPrivateRepository
9999
}
100100

101-
sourceCompatibility = JavaVersion.VERSION_11
102-
targetCompatibility = JavaVersion.VERSION_11
101+
sourceCompatibility = JavaVersion.VERSION_17
102+
targetCompatibility = JavaVersion.VERSION_17
103103

104104
java {
105105
withJavadocJar()

changes.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,11 @@
22

33
[![logo](https://gretty-gradle-plugin.github.io/gretty-doc/images/gretty_logo.png "gretty logo")](https://github.com/gretty-gradle-plugin/gretty)
44

5+
### Version 5.0.0
6+
September 19, 2025, Gretty 5.0.0 is out and available at [Gradle Plugins](https://plugins.gradle.org/plugin/org.gretty) and [Maven Central](https://search.maven.org/artifact/org.gretty/gretty).
7+
8+
* Support Tomcat 11 and Jetty 12 (thanks [@codeconsole](https://github.com/codeconsole))
9+
510
### Version 4.1.10
611

712
* Re-publish of 4.1.8 (which was wrongly marked as 4.1.9)

docker_integration_tests.sh

Lines changed: 1 addition & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -5,21 +5,12 @@ export common_gradle_args="--console=plain --no-daemon -Porg.gradle.java.install
55

66
#ci.yml plugin build step
77
./docker_gradlew.sh \
8-
--java 11 \
8+
--java 17 \
99
--gradle 7 \
1010
--gradle-home .docker-gradle \
1111
$common_gradle_args \
1212
publishToPrivateRepo
1313

14-
#ci.yml matrix case #1
15-
./docker_gradlew.sh \
16-
--java 11 \
17-
--gradle 7 \
18-
--gradle-home .docker-gradle \
19-
--working-dir integrationTests \
20-
$common_gradle_args \
21-
testAll
22-
2314
#ci.yml matrix case #2
2415
./docker_gradlew.sh \
2516
--java 17 \
@@ -40,16 +31,6 @@ export common_gradle_args="--console=plain --no-daemon -Porg.gradle.java.install
4031

4132
# a set of tests with java toolchain:
4233

43-
#ci.yml matrix case #1 + toolchain java v17
44-
./docker_gradlew.sh \
45-
--java 17 --java 11 \
46-
--gradle 7 \
47-
--gradle-home .docker-gradle \
48-
--working-dir integrationTests \
49-
$common_gradle_args \
50-
-PtoolchainJavaVersion=17 \
51-
testAllJavaToolchain
52-
5334
#ci.yml matrix case #2 + toolchain java v21
5435
./docker_gradlew.sh \
5536
--java 21 --java 17 \

gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ developerId = gretty-gradle-plugin
66
developerName = Andrey Hihlovskiy
77
license = MIT
88
group = org.gretty
9-
version = 4.2.0-SNAPSHOT
9+
version = 5.0.0-SNAPSHOT
1010
jetty11_version = 11.0.26
1111
jetty11_servlet_api_version = 5.0.0
1212
jetty12_version = 12.0.29

integrationTests/buildSrc/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,8 @@ subprojects {
4848
afterEvaluate {
4949
if(plugins.findPlugin('java')) {
5050

51-
sourceCompatibility = JavaVersion.VERSION_11
52-
targetCompatibility = JavaVersion.VERSION_11
51+
sourceCompatibility = JavaVersion.VERSION_17
52+
targetCompatibility = JavaVersion.VERSION_17
5353

5454
[compileJava, compileTestJava]*.options*.encoding = 'UTF-8'
5555

0 commit comments

Comments
 (0)