Skip to content

Commit 2d48a7c

Browse files
MikeEdgarMikeEdgar
authored
Use jdk11 profile for CI with older dependencies, update build matrices (#2372)
* Use jdk11 profile for CI with older dependencies, update build matrices Signed-off-by: Michael Edgar <[email protected]> * Remove JDK 25 (needs updates to smallrye-parent) Signed-off-by: Michael Edgar <[email protected]> * Add JDK version to TCK report artifact name, fix TCK matrix Signed-off-by: Michael Edgar <[email protected]> * Use jdk11 dependencies through jdk16 Signed-off-by: Michael Edgar <[email protected]> * Publish TCK reports for multiple JDK versions, simplify build packages Signed-off-by: Michael Edgar <[email protected]> --------- Signed-off-by: Michael Edgar <[email protected]>
1 parent 31be1b2 commit 2d48a7c

File tree

3 files changed

+43
-41
lines changed

3 files changed

+43
-41
lines changed

‎.github/workflows/build.yml‎

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,14 @@ jobs:
101101
strategy:
102102
fail-fast: false
103103
matrix:
104+
java:
105+
- 11
106+
- 17
107+
- 21
108+
tck-version:
109+
- "4.0.2"
110+
- "4.1"
111+
104112
include:
105113
# Disable older TCK jobs prior to 4.0 GA release
106114
#- tck-version: "2.0.1"
@@ -111,7 +119,7 @@ jobs:
111119
- title: "4.1.x"
112120
tck-version: "4.1"
113121

114-
name: MicroProfile OpenAPI TCK ${{ matrix.title }}
122+
name: MicroProfile OpenAPI TCK ${{ matrix.title }} with jdk ${{ matrix.java }}
115123
steps:
116124
- uses: actions/checkout@v5
117125
name: checkout
@@ -130,19 +138,19 @@ jobs:
130138
java-version: 17
131139

132140
- name: build with maven
133-
run: mvn -B install -pl '!testsuite/coverage,!testsuite/data,!testsuite/extra,!tools,!tools/gradle-plugin,!tools/maven-plugin,!ui,!ui/open-api-ui,!ui/open-api-ui-forms' -DskipTests
141+
run: mvn -B install -pl 'testsuite/tck' -am -DskipTests
134142

135143
- uses: actions/setup-java@v5
136144
name: set up jdk
137145
with:
138146
distribution: 'temurin'
139-
java-version: 11
147+
java-version: ${{ matrix.java }}
140148

141149
- name: execute tck ${{ matrix.tck-version }}
142150
run: mvn -B test -f testsuite/tck/pom.xml -Dsmallrye.commit=$(git rev-parse HEAD) -Dversion.eclipse.microprofile.openapi=${{ matrix.tck-version }}
143151

144152
- uses: actions/upload-artifact@v4
145153
name: tck-report
146154
with:
147-
name: "tck-report-${{ matrix.tck-version }}"
155+
name: "tck-report-${{ matrix.tck-version }}-jdk${{ matrix.java }}"
148156
path: "testsuite/tck/target/surefire-reports/microprofile-openapi-tck-report.html"

‎.github/workflows/publish-tck.yml‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,15 @@ jobs:
1414

1515
strategy:
1616
matrix:
17-
include:
18-
# Disable older TCK jobs prior to 4.0 GA release
19-
#- tck-version: "2.0.1"
20-
#- tck-version: "3.0"
21-
#- tck-version: "3.1.1"
22-
- tck-version: "4.0.2"
23-
- tck-version: "4.1"
17+
java:
18+
- 11
19+
- 17
20+
- 21
21+
tck-version:
22+
- "4.0.2"
23+
- "4.1"
2424

25-
name: MicroProfile OpenAPI TCK ${{ matrix.tck-version }}
25+
name: MicroProfile OpenAPI TCK ${{ matrix.tck-version }} with jdk ${{ matrix.java }}
2626
steps:
2727
- uses: actions/checkout@v5
2828
name: checkout ${{inputs.version}}
@@ -49,16 +49,16 @@ jobs:
4949
name: set up jdk
5050
with:
5151
distribution: 'temurin'
52-
java-version: 11
52+
java-version: ${{ matrix.java }}
5353

5454
- name: execute tck ${{ matrix.tck-version }}
5555
run: mvn -B test -f testsuite/tck/pom.xml -Dsmallrye.commit=$(git rev-parse HEAD) -Dversion.eclipse.microprofile.openapi=${{ matrix.tck-version }}
5656

5757
- name: stage tck report
58-
run: mv testsuite/tck/target/surefire-reports/microprofile-openapi-tck-report.html ./microprofile-openapi-tck-report-${{ matrix.tck-version }}.html
58+
run: mv testsuite/tck/target/surefire-reports/microprofile-openapi-tck-report.html ./microprofile-openapi-tck-report-${{ matrix.tck-version }}-jdk${{ matrix.java }}.html
5959

6060
- name: upload tck report to release
6161
env:
6262
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
6363
run: |
64-
gh release upload ${{ inputs.version }} microprofile-openapi-tck-report-${{ matrix.tck-version }}.html
64+
gh release upload ${{ inputs.version }} microprofile-openapi-tck-report-${{ matrix.tck-version }}-jdk${{ matrix.java }}.html

‎pom.xml‎

Lines changed: 20 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,8 @@
2121
<jackson-bom.version>2.20.0</jackson-bom.version>
2222
<version.eclipse.microprofile.config>3.0.3</version.eclipse.microprofile.config>
2323
<version.io.smallrye.jandex>3.5.0</version.io.smallrye.jandex>
24-
<version.io.smallrye.smallrye-config>3.10.2</version.io.smallrye.smallrye-config>
24+
<version.io.smallrye.smallrye-config>3.14.0</version.io.smallrye.smallrye-config>
25+
<version.io.smallrye.smallrye-common-classloader>2.13.9</version.io.smallrye.smallrye-common-classloader>
2526
<version.eclipse.microprofile.openapi>4.1</version.eclipse.microprofile.openapi>
2627
<version.org.hamcrest>1.3</version.org.hamcrest>
2728
<version.org.hamcrest.java-hamcrest>2.0.0.0</version.org.hamcrest.java-hamcrest>
@@ -32,9 +33,7 @@
3233
<version.testng>7.11.0</version.testng>
3334
<version.arquillian.jetty>2.0.0.Final</version.arquillian.jetty>
3435
<version.jetty>11.0.24</version.jetty>
35-
36-
<!-- Use Jakarta EE 10 versions -->
37-
<version.resteasy>6.2.3.Final</version.resteasy>
36+
<version.resteasy>7.0.0.Final</version.resteasy>
3837
<version.weld.core>5.1.2.Final</version.weld.core>
3938

4039
<!--
@@ -129,7 +128,7 @@
129128
<dependency>
130129
<groupId>io.smallrye.common</groupId>
131130
<artifactId>smallrye-common-classloader</artifactId>
132-
<version>2.8.0</version>
131+
<version>${version.io.smallrye.smallrye-common-classloader}</version>
133132
</dependency>
134133
<dependency>
135134
<groupId>io.smallrye.config</groupId>
@@ -369,24 +368,6 @@
369368
<build>
370369
<pluginManagement>
371370
<plugins>
372-
<plugin>
373-
<groupId>org.asciidoctor</groupId>
374-
<artifactId>asciidoctor-maven-plugin</artifactId>
375-
<configuration>
376-
<sourceHighlighter>coderay</sourceHighlighter>
377-
<attributes>
378-
<icons>font</icons>
379-
<pagenums />
380-
<version>${project.version}</version>
381-
<idprefix />
382-
<idseparator>-</idseparator>
383-
<allow-uri-read>true</allow-uri-read>
384-
<revnumber>${project.version}</revnumber>
385-
<revdate>${maven.build.timestamp}</revdate>
386-
<organization>${project.organization.name}</organization>
387-
</attributes>
388-
</configuration>
389-
</plugin>
390371
<plugin>
391372
<groupId>org.codehaus.mojo</groupId>
392373
<artifactId>build-helper-maven-plugin</artifactId>
@@ -428,7 +409,6 @@
428409
<plugin>
429410
<groupId>org.apache.maven.plugins</groupId>
430411
<artifactId>maven-resources-plugin</artifactId>
431-
<version>${version.maven-resources-plugin}</version>
432412
</plugin>
433413
<plugin>
434414
<groupId>com.github.eirslett</groupId>
@@ -452,9 +432,23 @@
452432
</profile>
453433

454434
<profile>
455-
<id>jdk11plus</id>
435+
<id>jdk11</id>
436+
<activation>
437+
<jdk>[11,17)</jdk>
438+
</activation>
439+
<properties>
440+
<jboss.extra.opts>--add-modules java.se</jboss.extra.opts>
441+
<maven.compiler.release>11</maven.compiler.release>
442+
<version.io.smallrye.smallrye-common-classloader>2.8.0</version.io.smallrye.smallrye-common-classloader>
443+
<version.io.smallrye.smallrye-config>3.10.2</version.io.smallrye.smallrye-config>
444+
<version.resteasy>6.2.3.Final</version.resteasy>
445+
</properties>
446+
</profile>
447+
448+
<profile>
449+
<id>jdk17plus</id>
456450
<activation>
457-
<jdk>[11,)</jdk>
451+
<jdk>[17,)</jdk>
458452
</activation>
459453
<properties>
460454
<jboss.extra.opts>--add-modules java.se</jboss.extra.opts>

0 commit comments

Comments
 (0)