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

Updated version of java from 11 to 17 #2228

Merged
merged 4 commits into from
Nov 27, 2024
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
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
java: [11, 17]
java: [17, 21]
name: build with jdk ${{matrix.java}}

steps:
Expand Down
11 changes: 5 additions & 6 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:

- uses: actions/[email protected]
with:
java-version: 11
java-version: 17
server-id: 'oss.sonatype'
server-username: 'MAVEN_DEPLOY_USERNAME'
server-password: 'MAVEN_DEPLOY_TOKEN'
Expand All @@ -37,7 +37,7 @@ jobs:

- name: Install graphviz
run: sudo apt install graphviz

- name: maven release ${{steps.metadata.outputs.current-version}}
env:
MAVEN_DEPLOY_USERNAME: ${{secrets.MAVEN_DEPLOY_USERNAME}}
Expand All @@ -52,11 +52,10 @@ jobs:
echo "version=${{steps.metadata.outputs.current-version}}" > tools/gradle-plugin/gradle.properties
git add tools/gradle-plugin/gradle.properties
git commit -m "Update Gradle plugin version"
# make sure the server/integration-tests-jdk16 gets its version updated too: include the jdk16plus profile
mvn -X -e -B release:prepare -Prelease -Pjdk16plus -DreleaseVersion=${{steps.metadata.outputs.current-version}} -DdevelopmentVersion=${{steps.metadata.outputs.next-version}}
mvn -X -e -B release:prepare -Prelease -DreleaseVersion=${{steps.metadata.outputs.current-version}} -DdevelopmentVersion=${{steps.metadata.outputs.next-version}}
git checkout ${{github.base_ref}}
git rebase release
mvn -X -e -B release:perform -Prelease -Pjdk16plus
mvn -X -e -B release:perform -Prelease
git push
git push --tags

Expand All @@ -69,4 +68,4 @@ jobs:
name: milestone release
with:
github-token: ${{secrets.GITHUB_TOKEN}}
milestone-title: ${{steps.metadata.outputs.current-version}}
milestone-title: ${{steps.metadata.outputs.current-version}}
Original file line number Diff line number Diff line change
Expand Up @@ -47,12 +47,12 @@ public void arraysTest() throws IOException, URISyntaxException {
prop("longPrimitiveArray", new long[] { 789L, 947894L, 1874448L }),
prop("longObjectArray", new Long[] { 789L, 947894L, 1874448L }),

prop("floatPrimitiveArray", new float[] { 1567.654f, 8765f, 123789456.1851f }),
prop("floatObjectArray", new Float[] { 1567.654f, 8765f, 123789456.1851f }),
prop("floatPrimitiveArray", new float[] { 1567.6f, 8765f, 3.14159f }),
prop("floatObjectArray", new Float[] { 1567.6f, 8765f, 3.14159f }),

prop("doublePrimitiveArray",
new double[] { 789.3242d, 1815d, 98765421.654897d }),
prop("doubleObjectArray", new Double[] { 789.3242d, 1815d, 98765421.654897d }),
new double[] { 789.3d, 1815d, 3.14159d }),
prop("doubleObjectArray", new Double[] { 789.3d, 1815d, 3.14159d }),

prop("bigIntegerArray",
new BigInteger[] { BigInteger.ZERO, BigInteger.ONE, BigInteger.TEN }),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,9 +44,9 @@ public void iterableTest() throws IOException, URISyntaxException {

prop("longObjectList", List.of(789L, 947894L, 1874448L)),

prop("floatObjectList", List.of(1567.654f, 8765f, 123789456.1851f)),
prop("floatObjectList", List.of(1567.1f, 8765f, 3.14159f)),

prop("doubleObjectList", List.of(789.3242d, 1815d, 98765421.654897d)),
prop("doubleObjectList", List.of(789.1d, 1815d, 3.14159d)),

prop("bigIntegerList",
List.of(BigInteger.ZERO, BigInteger.ONE, BigInteger.TEN)),
Expand Down
8 changes: 4 additions & 4 deletions client/tck/src/main/resources/core/arrays.graphql
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,11 @@ query arrayHolderQuery {
longPrimitiveArray: [789, 947894, 1874448],
longObjectArray: [789, 947894, 1874448],

floatPrimitiveArray: [1567.654, 8765.0, 1.23789456E8],
floatObjectArray: [1567.654, 8765.0, 1.23789456E8],
floatPrimitiveArray: [1567.6, 8765.0, 3.14159],
floatObjectArray: [1567.6, 8765.0, 3.14159],

doublePrimitiveArray: [789.3242, 1815.0, 9.8765421654897E7],
doubleObjectArray: [789.3242, 1815.0, 9.8765421654897E7],
doublePrimitiveArray: [789.3, 1815.0, 3.14159],
doubleObjectArray: [789.3, 1815.0, 3.14159],

bigIntegerArray: [0, 1, 10]
bigDecimalArray: [0, 1, 10]
Expand Down
4 changes: 2 additions & 2 deletions client/tck/src/main/resources/core/iterable.graphql
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ query iterableHolderQuery {

longObjectList: [789, 947894, 1874448]

floatObjectList: [1567.654, 8765.0, 1.23789456E8]
floatObjectList: [1567.1, 8765.0, 3.14159]

doubleObjectList: [789.3242, 1815.0, 9.8765421654897E7]
doubleObjectList: [789.1, 1815.0, 3.14159]

bigIntegerList: [0, 1, 10]

Expand Down
21 changes: 3 additions & 18 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -62,9 +62,9 @@

<!-- JDK stuff -->
<jboss.extra.opts>--add-modules java.se</jboss.extra.opts>
<maven.compiler.release>11</maven.compiler.release>
<maven.compiler.source>11</maven.compiler.source>
<maven.compiler.target>11</maven.compiler.target>
<maven.compiler.release>17</maven.compiler.release>
<maven.compiler.source>17</maven.compiler.source>
<maven.compiler.target>17</maven.compiler.target>
<version.impsort.plugin>1.8.0</version.impsort.plugin>
<version.kotlinx.metadata.jvm>0.7.0</version.kotlinx.metadata.jvm>
<version.kotlin.compiler>1.9.0</version.kotlin.compiler>
Expand Down Expand Up @@ -568,21 +568,6 @@
</build>

<profiles>
<!-- !!! make sure this profile appears before the 'release' module - we need the release module
to be the last one in the reactor to make sure it does its job. If integration-tests-jdk16 becomes the
last module, release pipeline will break, because nexus-staging-maven-plugin performs the upload
in the last module, so the last module can't have staging disabled (which the JDK16 module does have). -->
<profile>
<id>jdk16plus</id>
<activation>
<jdk>[16,)</jdk>
</activation>
<!-- the 'server' submodule also adds its 'integration-tests-jdk16' child in this profile -->
<modules>
<module>server/integration-tests-jdk16</module>
</modules>
</profile>

<profile>
<id>release</id>
<activation>
Expand Down
246 changes: 0 additions & 246 deletions server/integration-tests-jdk16/pom.xml

This file was deleted.

Loading
Loading