Skip to content

Commit

Permalink
Moving to Java 11 as default Java version.
Browse files Browse the repository at this point in the history
Moving the version to 0.2.x and using 0.1.x branch for Java 8 support

Signed-off-by: Emmanuel Hugonnet <[email protected]>
  • Loading branch information
ehsavoie committed Jan 5, 2024
1 parent 289e1c2 commit d755399
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 40 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
matrix:
os: [ubuntu-latest, windows-latest]
jdk-distribution: [temurin]
jdk-version: [8]
jdk-version: ['11', '17', '21']
steps:
- name: Configure runner - Linux
if: contains(matrix.os, 'ubuntu')
Expand Down
2 changes: 2 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,3 +25,5 @@ To bootstrap a server use it the same way as other transport implementations. Th
}
}
```

The branch 0.1.x is there to support Java 8.
53 changes: 14 additions & 39 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
<groupId>org.jboss.xnio.netty</groupId>
<artifactId>netty-xnio-transport</artifactId>
<name>netty-xnio-transport</name>
<version>0.1.11.Final-SNAPSHOT</version>
<version>0.2.0.Final-SNAPSHOT</version>
<inceptionYear>2013</inceptionYear>
<packaging>jar</packaging>

Expand Down Expand Up @@ -66,7 +66,7 @@
</distributionManagement>

<prerequisites>
<maven>3.6.0</maven>
<maven>3.9.6</maven>
</prerequisites>

<build>
Expand All @@ -83,6 +83,9 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<argLine> --add-opens java.base/jdk.internal.misc=ALL-UNNAMED -Dio.netty.tryReflectionSetAccessible=true</argLine>
</configuration>
</plugin>
</plugins>
</build>
Expand Down Expand Up @@ -141,52 +144,24 @@
<version>${jboss.logging.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcpkix-jdk15on</artifactId>
<version>${org.bouncycastle.version}</version>
<scope>test</scope>
</dependency>
</dependencies>

<properties>
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
<target.jdk>${maven.compiler.target}</target.jdk>
<jdk.min.version>1.8</jdk.min.version>
<jdk.min.version>11</jdk.min.version>
<netty.version>4.1.104.Final</netty.version>
<xnio.version>3.8.12.Final</xnio.version>
<jboss.logging.version>3.4.0.Final</jboss.logging.version>
<jboss.logging.version>3.5.3.Final</jboss.logging.version>
<junit.version>5.10.1</junit.version>
<org.bouncycastle.version>1.70</org.bouncycastle.version>
</properties>

<profiles>
<profile>
<id>java11</id>
<activation>
<jdk>[11,)</jdk>
</activation>
<properties>
<jboss.logging.version>3.5.3.Final</jboss.logging.version>
<org.bouncycastle.version>1.70</org.bouncycastle.version>
<jdk.min.version>11</jdk.min.version>
</properties>
<dependencies>
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcpkix-jdk15on</artifactId>
<version>${org.bouncycastle.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<argLine> --add-opens java.base/jdk.internal.misc=ALL-UNNAMED -Dio.netty.tryReflectionSetAccessible=true</argLine>
</configuration>
</plugin>
</plugins>
</build>
</profile>
</profiles>

<repositories>
<repository>
<id>jboss-public-repository-group</id>
Expand Down

0 comments on commit d755399

Please sign in to comment.