Skip to content

Commit

Permalink
Moved JDK16 tests to normal tests
Browse files Browse the repository at this point in the history
  • Loading branch information
mskacelik authored and jmartisk committed Nov 27, 2024
1 parent 94f7f1f commit e5c96b9
Show file tree
Hide file tree
Showing 11 changed files with 103 additions and 387 deletions.
9 changes: 4 additions & 5 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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}}
15 changes: 0 additions & 15 deletions pom.xml
Original file line number Diff line number Diff line change
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.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

Loading

0 comments on commit e5c96b9

Please sign in to comment.