Skip to content

Commit

Permalink
chore: Cleanup pom, move to JDK 17.
Browse files Browse the repository at this point in the history
  • Loading branch information
@rhusar
rhusar committed Nov 22, 2024
1 parent 00b4ff7 commit a3c462a
Show file tree
Hide file tree
Showing 5 changed files with 69 additions and 93 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
strategy:
matrix:
os: [ ubuntu-latest ]
java: [ 11 ]
java: [ 17 ]
steps:
- name: Checkout
uses: actions/checkout@v2
Expand Down
4 changes: 2 additions & 2 deletions load-balancing-demo/client/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@
<parent>
<groupId>org.jboss.mod_cluster</groupId>
<artifactId>mod_cluster-demo</artifactId>
<version>2.0.4.Final-SNAPSHOT</version>
<version>2.1.0.Final-SNAPSHOT</version>
</parent>
<artifactId>mod_cluster-demo-client</artifactId>
<name>mod_cluster: Demo - Client</name>
<name>mod_cluster Examples: Demo - Client</name>
<packaging>jar</packaging>
<dependencies>
<dependency>
Expand Down
88 changes: 2 additions & 86 deletions load-balancing-demo/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,21 +8,17 @@
<parent>
<groupId>org.jboss.mod_cluster</groupId>
<artifactId>mod_cluster-examples-parent</artifactId>
<version>2.0.4.Final-SNAPSHOT</version>
<version>2.1.0.Final-SNAPSHOT</version>
</parent>
<artifactId>mod_cluster-demo</artifactId>
<name>mod_cluster: Demo (parent)</name>
<name>mod_cluster Examples: Demo (parent)</name>
<packaging>pom</packaging>
<modules>
<module>client</module>
<module>server</module>
</modules>

<properties>
<!-- Require and build for JDK 11 -->
<jdk.min.version>11</jdk.min.version>
<jdk.release.version>11</jdk.release.version>

<!-- Common dependency -->
<version.jboss-logging>3.5.3.Final</version.jboss-logging>
<version.jboss-logging-processor>2.2.1.Final</version.jboss-logging-processor>
Expand All @@ -34,85 +30,10 @@
<version.junit>4.13.2</version.junit>
<version.mockito>5.8.0</version.mockito>
<version.javax.servlet-3.0>1.0.2.Final</version.javax.servlet-3.0>

<!-- Plugin versions -->
<version.org.wildfly.checkstyle-config>1.0.8.Final</version.org.wildfly.checkstyle-config>
<version.org.jacoco.jacoco-maven-plugin>0.8.11</version.org.jacoco.jacoco-maven-plugin>
</properties>

<profiles>
<!-- Code coverage report using JaCoCo -->
<profile>
<id>coverage</id>
<activation>
<property>
<name>coverage</name>
</property>
</activation>
<modules>
<module>code-coverage</module>
</modules>
<build>
<plugins>
<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
<executions>
<execution>
<id>jacoco-prepare-agent</id>
<goals>
<goal>prepare-agent</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
</profiles>

<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.jboss.mod_cluster</groupId>
<artifactId>mod_cluster-container-spi</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.jboss.mod_cluster</groupId>
<artifactId>mod_cluster-container-tomcat-8.5</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.jboss.mod_cluster</groupId>
<artifactId>mod_cluster-container-tomcat-9.0</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.jboss.mod_cluster</groupId>
<artifactId>mod_cluster-core</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.jboss.mod_cluster</groupId>
<artifactId>mod_cluster-load-spi</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.jboss.mod_cluster</groupId>
<artifactId>mod_cluster-demo</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.jboss.mod_cluster</groupId>
<artifactId>mod_cluster-demo-client</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.jboss.mod_cluster</groupId>
<artifactId>mod_cluster-demo-server</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.jboss.spec.javax.servlet</groupId>
<artifactId>jboss-servlet-api_3.0_spec</artifactId>
Expand Down Expand Up @@ -264,11 +185,6 @@
<useFile />
</configuration>
</plugin>
<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
<version>${version.org.jacoco.jacoco-maven-plugin}</version>
</plugin>
</plugins>
</pluginManagement>
</build>
Expand Down
4 changes: 2 additions & 2 deletions load-balancing-demo/server/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@
<parent>
<groupId>org.jboss.mod_cluster</groupId>
<artifactId>mod_cluster-demo</artifactId>
<version>2.0.4.Final-SNAPSHOT</version>
<version>2.1.0.Final-SNAPSHOT</version>
</parent>
<artifactId>mod_cluster-demo-server</artifactId>
<name>mod_cluster: Demo - Server</name>
<name>mod_cluster Examples: Demo - Server</name>
<packaging>war</packaging>
<dependencies>
<dependency>
Expand Down
64 changes: 62 additions & 2 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,14 @@
<parent>
<groupId>org.jboss</groupId>
<artifactId>jboss-parent</artifactId>
<version>41</version>
<version>47</version>
</parent>

<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.mod_cluster</groupId>
<artifactId>mod_cluster-examples-parent</artifactId>
<version>2.0.4.Final-SNAPSHOT</version>
<name>mod_cluster Examples (parent)</name>
<version>2.1.0.Final-SNAPSHOT</version>
<packaging>pom</packaging>

<licenses>
Expand All @@ -31,8 +32,67 @@
<tag>HEAD</tag>
</scm>

<properties>
<!-- Require and build for JDK 17 -->
<maven.compiler.target>17</maven.compiler.target>
<maven.compiler.source>17</maven.compiler.source>

<!-- Dependency versions -->
<version.mod_cluster>2.0.0.Final</version.mod_cluster>

<!-- Plugin versions -->
<version.org.wildfly.checkstyle-config>1.0.8.Final</version.org.wildfly.checkstyle-config>
</properties>

<modules>
<module>load-balancing-demo</module>
</modules>

<dependencyManagement>
<dependencies>
<!-- mod_cluster -->
<!-- TODO replace with a BOM once available -->
<dependency>
<groupId>org.jboss.mod_cluster</groupId>
<artifactId>mod_cluster-container-spi</artifactId>
<version>${version.mod_cluster}</version>
</dependency>
<dependency>
<groupId>org.jboss.mod_cluster</groupId>
<artifactId>mod_cluster-container-tomcat-8.5</artifactId>
<version>${version.mod_cluster}</version>
</dependency>
<dependency>
<groupId>org.jboss.mod_cluster</groupId>
<artifactId>mod_cluster-container-tomcat-9.0</artifactId>
<version>${version.mod_cluster}</version>
</dependency>
<dependency>
<groupId>org.jboss.mod_cluster</groupId>
<artifactId>mod_cluster-core</artifactId>
<version>${version.mod_cluster}</version>
</dependency>
<dependency>
<groupId>org.jboss.mod_cluster</groupId>
<artifactId>mod_cluster-load-spi</artifactId>
<version>${version.mod_cluster}</version>
</dependency>
<dependency>
<groupId>org.jboss.mod_cluster</groupId>
<artifactId>mod_cluster-demo</artifactId>
<version>${version.mod_cluster}</version>
</dependency>
<dependency>
<groupId>org.jboss.mod_cluster</groupId>
<artifactId>mod_cluster-demo-client</artifactId>
<version>${version.mod_cluster}</version>
</dependency>
<dependency>
<groupId>org.jboss.mod_cluster</groupId>
<artifactId>mod_cluster-demo-server</artifactId>
<version>${version.mod_cluster}</version>
</dependency>
</dependencies>
</dependencyManagement>

</project>

0 comments on commit a3c462a

Please sign in to comment.