Skip to content

Commit 15fa27e

Browse files
committed
Move to Java 17
1 parent a4b77d5 commit 15fa27e

File tree

6 files changed

+7
-124
lines changed

6 files changed

+7
-124
lines changed

.github/workflows/build.yml

Lines changed: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,9 @@ jobs:
2424
strategy:
2525
matrix:
2626
java: [
27-
{ 'version': '11', 'opts': '' },
2827
{ 'version': '17', 'opts': '' },
2928
{ 'version': '21', 'opts': '' },
30-
{ 'version': '22', 'opts': '' }
29+
{ 'version': '25', 'opts': '' }
3130
]
3231
name: build with jdk ${{matrix.java.version}}
3332

@@ -66,17 +65,11 @@ jobs:
6665
- uses: actions/setup-java@v4
6766
with:
6867
distribution: 'temurin'
69-
java-version: 11
68+
java-version: 17
7069
cache: 'maven'
7170
cache-dependency-path: '**/pom.xml'
7271

7372
- name: build with docs and coverage
74-
run: mvn verify -Pcoverage javadoc:javadoc
75-
76-
- uses: actions/setup-java@v4
77-
with:
78-
distribution: 'temurin'
79-
java-version: 17
80-
81-
- name: sonar
82-
run: mvn sonar:sonar -Psonar -Dsonar.token=${{secrets.SONAR_TOKEN}}
73+
run: |
74+
mvn verify -Pcoverage javadoc:javadoc
75+
mvn sonar:sonar -Psonar -Dsonar.token=${{secrets.SONAR_TOKEN}}

.github/workflows/publish-tck.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
runs-on: ubuntu-latest
1515
strategy:
1616
matrix:
17-
java: [ 11, 17, 21 ]
17+
java: [ 17, 21, 25 ]
1818

1919
steps:
2020
- uses: actions/checkout@v4

core/src/main/java12/io/smallrye/context/Jdk12ContextualCompletableFuture.java

Lines changed: 0 additions & 52 deletions
This file was deleted.

core/src/main/java12/io/smallrye/context/impl/JdkSpecificImpl.java

Lines changed: 0 additions & 26 deletions
This file was deleted.

pom.xml

Lines changed: 1 addition & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<groupId>io.smallrye</groupId>
77
<artifactId>smallrye-parent</artifactId>
8-
<version>47</version>
8+
<version>48</version>
99
</parent>
1010

1111
<artifactId>smallrye-context-propagation-parent</artifactId>
@@ -144,38 +144,6 @@
144144
<module>storage</module>
145145
</modules>
146146

147-
<build>
148-
<plugins>
149-
<plugin>
150-
<artifactId>maven-enforcer-plugin</artifactId>
151-
<version>3.6.2</version>
152-
<executions>
153-
<execution>
154-
<id>enforce-versions</id>
155-
<goals>
156-
<goal>enforce</goal>
157-
</goals>
158-
<configuration>
159-
<rules>
160-
<requireJavaVersion>
161-
<version>11</version>
162-
<message>This project must be built with Java 11 or later.</message>
163-
</requireJavaVersion>
164-
</rules>
165-
</configuration>
166-
</execution>
167-
</executions>
168-
</plugin>
169-
<plugin>
170-
<groupId>org.apache.maven.plugins</groupId>
171-
<artifactId>maven-compiler-plugin</artifactId>
172-
<configuration>
173-
<release>11</release>
174-
</configuration>
175-
</plugin>
176-
</plugins>
177-
</build>
178-
179147
<profiles>
180148
<profile>
181149
<id>unpublished</id>

testsuite/extra/build-test-java12

Whitespace-only changes.

0 commit comments

Comments
 (0)