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.

Sign up for GitHub

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

Move baseline to Java 17 #349

Merged
merged 1 commit into from
Oct 25, 2024
Merged

Move baseline to Java 17 #349

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 1 addition & 2 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@ jobs:
with:
distribution: temurin
java-version: |
11
17
21
cache: 'maven'
Expand All @@ -49,7 +48,7 @@ jobs:
- name: build with maven
run: |
mvn -q -N "io.takari:maven:${{env.IO_TAKARI_MAVEN_WRAPPER_VERSION}}:wrapper" "-Dmaven=${{env.MAVEN_VERSION}}"
./mvnw -B -ntp formatter:validate verify --file pom.xml "-Dexpected-cpu=x64,aarch64" "-Djava11.home=${{env.JAVA_HOME_11_X64}}${{env.JAVA_HOME_11_ARM64}}" "-Djava17.home=${{env.JAVA_HOME_17_X64}}${{env.JAVA_HOME_17_ARM64}}"
./mvnw -B -ntp formatter:validate verify --file pom.xml "-Dexpected-cpu=x64,aarch64" "-Djava17.home=${{env.JAVA_HOME_17_X64}}${{env.JAVA_HOME_17_ARM64}}"

quality:
needs: [ build ]
Expand Down
0 annotation/build-test-java11 → annotation/build-release-17
View file
Open in desktop
File renamed without changes.
15 changes: 0 additions & 15 deletions annotation/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,17 +17,6 @@
<groupId>jakarta.enterprise</groupId>
<artifactId>jakarta.enterprise.cdi-api</artifactId>
<scope>provided</scope>
<exclusions>
<!-- keep the dependency tree of this module as small as possible -->
<exclusion>
<groupId>jakarta.el</groupId>
<artifactId>jakarta.el-api</artifactId>
</exclusion>
<exclusion>
<groupId>jakarta.interceptor</groupId>
<artifactId>jakarta.interceptor-api</artifactId>
</exclusion>
</exclusions>
</dependency>
</dependencies>

Expand All @@ -37,10 +26,6 @@
<groupId>org.jboss.jandex</groupId>
<artifactId>jandex-maven-plugin</artifactId>
</plugin>
<plugin>
<groupId>io.github.dmlloyd.module-info</groupId>
<artifactId>module-info</artifactId>
</plugin>
</plugins>
</build>
<profiles>
Expand Down
6 changes: 6 additions & 0 deletions annotation/src/main/java/module-info.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
module io.smallrye.common.annotation {
requires static jakarta.cdi;
requires static jakarta.inject;

exports io.smallrye.common.annotation;
}
0 classloader/build-test-java11 → classloader/build-release-17
View file
Open in desktop
File renamed without changes.
0 constraint/build-test-java11 → constraint/build-release-17
View file
Open in desktop
File renamed without changes.
20 changes: 12 additions & 8 deletions constraint/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,27 +16,31 @@
<dependency>
<groupId>org.jboss.logging</groupId>
<artifactId>jboss-logging</artifactId>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.jboss.logging</groupId>
<artifactId>jboss-logging-annotations</artifactId>
</dependency>
<dependency>
<groupId>org.jboss.logging</groupId>
<artifactId>jboss-logging-processor</artifactId>
</dependency>
</dependencies>

<build>
<plugins>
<plugin>
<groupId>io.github.dmlloyd.module-info</groupId>
<artifactId>module-info</artifactId>
</plugin>
<plugin>
<groupId>org.jboss.bridger</groupId>
<artifactId>bridger</artifactId>
</plugin>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<annotationProcessorPaths>
<annotationProcessorPath>
<groupId>org.jboss.logging</groupId>
<artifactId>jboss-logging-processor</artifactId>
</annotationProcessorPath>
</annotationProcessorPaths>
</configuration>
</plugin>
</plugins>
</build>

Expand Down
6 changes: 6 additions & 0 deletions constraint/src/main/java/module-info.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
module io.smallrye.common.constraint {
requires org.jboss.logging;
requires static org.jboss.logging.annotations;

exports io.smallrye.common.constraint;
}
4 changes: 0 additions & 4 deletions constraint/src/main/java/module-info.yml
View file
Open in desktop

This file was deleted.

0 cpu/build-test-java11 → cpu/build-release-17
View file
Open in desktop
File renamed without changes.
4 changes: 0 additions & 4 deletions cpu/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,6 @@

<build>
<plugins>
<plugin>
<groupId>io.github.dmlloyd.module-info</groupId>
<artifactId>module-info</artifactId>
</plugin>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
Expand Down
5 changes: 5 additions & 0 deletions cpu/src/main/java/module-info.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
module smallrye.common.cpu.main {
requires jdk.unsupported;

exports io.smallrye.common.cpu;
}
0 expression/build-test-java11 → expression/build-release-17
View file
Open in desktop
File renamed without changes.
15 changes: 9 additions & 6 deletions expression/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,6 @@
<groupId>org.jboss.logging</groupId>
<artifactId>jboss-logging-annotations</artifactId>
</dependency>
<dependency>
<groupId>org.jboss.logging</groupId>
<artifactId>jboss-logging-processor</artifactId>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter</artifactId>
Expand All @@ -39,8 +35,15 @@
<build>
<plugins>
<plugin>
<groupId>io.github.dmlloyd.module-info</groupId>
<artifactId>module-info</artifactId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<annotationProcessorPaths>
<annotationProcessorPath>
<groupId>org.jboss.logging</groupId>
<artifactId>jboss-logging-processor</artifactId>
</annotationProcessorPath>
</annotationProcessorPaths>
</configuration>
</plugin>
</plugins>
</build>
Expand Down
8 changes: 8 additions & 0 deletions expression/src/main/java/module-info.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
module io.smallrye.common.expression {
requires io.smallrye.common.constraint;
requires io.smallrye.common.function;
requires org.jboss.logging;
requires static org.jboss.logging.annotations;

exports io.smallrye.common.expression;
}
6 changes: 0 additions & 6 deletions expression/src/main/java/module-info.yml
View file
Open in desktop

This file was deleted.

0 function/build-test-java11 → function/build-release-17
View file
Open in desktop
File renamed without changes.
15 changes: 9 additions & 6 deletions function/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,17 +25,20 @@
<groupId>org.jboss.logging</groupId>
<artifactId>jboss-logging-annotations</artifactId>
</dependency>
<dependency>
<groupId>org.jboss.logging</groupId>
<artifactId>jboss-logging-processor</artifactId>
</dependency>
</dependencies>

<build>
<plugins>
<plugin>
<groupId>io.github.dmlloyd.module-info</groupId>
<artifactId>module-info</artifactId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<annotationProcessorPaths>
<annotationProcessorPath>
<groupId>org.jboss.logging</groupId>
<artifactId>jboss-logging-processor</artifactId>
</annotationProcessorPath>
</annotationProcessorPaths>
</configuration>
</plugin>
</plugins>
</build>
Expand Down
7 changes: 7 additions & 0 deletions function/src/main/java/module-info.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
module io.smallrye.common.function {
requires io.smallrye.common.constraint;
requires org.jboss.logging;
requires static org.jboss.logging.annotations;

exports io.smallrye.common.function;
}
4 changes: 0 additions & 4 deletions function/src/main/java/module-info.yml
View file
Open in desktop

This file was deleted.

0 io/build-test-java11 → io/build-release-17
View file
Open in desktop
File renamed without changes.
0 net/build-test-java11 → net/build-release-17
View file
Open in desktop
File renamed without changes.
15 changes: 9 additions & 6 deletions net/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,6 @@
<groupId>org.jboss.logging</groupId>
<artifactId>jboss-logging-annotations</artifactId>
</dependency>
<dependency>
<groupId>org.jboss.logging</groupId>
<artifactId>jboss-logging-processor</artifactId>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter</artifactId>
Expand All @@ -43,8 +39,15 @@
<build>
<plugins>
<plugin>
<groupId>io.github.dmlloyd.module-info</groupId>
<artifactId>module-info</artifactId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<annotationProcessorPaths>
<annotationProcessorPath>
<groupId>org.jboss.logging</groupId>
<artifactId>jboss-logging-processor</artifactId>
</annotationProcessorPath>
</annotationProcessorPaths>
</configuration>
</plugin>
</plugins>
</build>
Expand Down
9 changes: 9 additions & 0 deletions net/src/main/java/module-info.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
module io.smallrye.common.net {
requires io.smallrye.common.constraint;
requires org.jboss.logging;
requires static org.graalvm.nativeimage;
requires static org.graalvm.word;
requires static org.jboss.logging.annotations;

exports io.smallrye.common.net;
}
5 changes: 0 additions & 5 deletions net/src/main/java/module-info.yml
View file
Open in desktop

This file was deleted.

0 os/build-test-java11 → os/build-release-17
View file
Open in desktop
File renamed without changes.
0 ref/build-test-java11 → ref/build-release-17
View file
Open in desktop
File renamed without changes.
9 changes: 0 additions & 9 deletions ref/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,15 +23,6 @@
</dependency>
</dependencies>

<build>
<plugins>
<plugin>
<groupId>io.github.dmlloyd.module-info</groupId>
<artifactId>module-info</artifactId>
</plugin>
</plugins>
</build>

<profiles>
<profile>
<id>coverage</id>
Expand Down
6 changes: 6 additions & 0 deletions ref/src/main/java/module-info.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
module io.smallrye.common.ref {
requires io.smallrye.common.constraint;
requires static org.graalvm.nativeimage;

exports io.smallrye.common.ref;
}
4 changes: 0 additions & 4 deletions ref/src/main/java/module-info.yml
View file
Open in desktop

This file was deleted.

5 changes: 5 additions & 0 deletions resource/src/main/java/module-info.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
module io.smallrye.common.resource {
requires io.smallrye.common.constraint;

exports io.smallrye.common.resource;
}
4 changes: 0 additions & 4 deletions resource/src/main/java/module-info.yml
View file
Open in desktop

This file was deleted.

0 version/build-test-java11 → version/build-release-17
View file
Open in desktop
File renamed without changes.
16 changes: 9 additions & 7 deletions version/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,6 @@
<artifactId>jboss-logging-annotations</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.jboss.logging</groupId>
<artifactId>jboss-logging-processor</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.jboss.logging</groupId>
<artifactId>jboss-logging</artifactId>
Expand Down Expand Up @@ -57,8 +52,15 @@
<build>
<plugins>
<plugin>
<groupId>io.github.dmlloyd.module-info</groupId>
<artifactId>module-info</artifactId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<annotationProcessorPaths>
<annotationProcessorPath>
<groupId>org.jboss.logging</groupId>
<artifactId>jboss-logging-processor</artifactId>
</annotationProcessorPath>
</annotationProcessorPaths>
</configuration>
</plugin>
</plugins>
</build>
Expand Down
7 changes: 7 additions & 0 deletions version/src/main/java/module-info.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
module io.smallrye.common.version {
requires io.smallrye.common.constraint;
requires org.jboss.logging;
requires static org.jboss.logging.annotations;

exports io.smallrye.common.version;
}
5 changes: 0 additions & 5 deletions version/src/main/java/module-info.yml
View file
Open in desktop

This file was deleted.

0 vertx-context/build-test-java11 → vertx-context/build-release-17
View file
Open in desktop
File renamed without changes.
4 changes: 0 additions & 4 deletions vertx-context/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,10 +42,6 @@

<build>
<plugins>
<plugin>
<groupId>io.github.dmlloyd.module-info</groupId>
<artifactId>module-info</artifactId>
</plugin>
<plugin>
<groupId>org.jboss.jandex</groupId>
<artifactId>jandex-maven-plugin</artifactId>
Expand Down
6 changes: 6 additions & 0 deletions vertx-context/src/main/java/module-info.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
module io.smallrye.common.vertx {
requires io.smallrye.common.constraint;
requires io.vertx.core;

exports io.smallrye.common.vertx;
}
6 changes: 0 additions & 6 deletions vertx-context/src/main/java/module-info.yml
View file
Open in desktop

This file was deleted.