Skip to content

chore: pom cleanup. #11

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

Merged
rhusar merged 1 commit into from
Nov 25, 2024
Merged

chore: pom cleanup. #11

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
4 changes: 2 additions & 2 deletions load-balancing-demo/client/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
<version>2.1.0.Final-SNAPSHOT</version>
</parent>
<artifactId>mod_cluster-demo-client</artifactId>
<name>mod_cluster Examples: Demo - Client</name>
<packaging>jar</packaging>
<name>mod_cluster Examples: Demo - Client</name>
<dependencies>
<dependency>
<groupId>jfree</groupId>
Expand Down Expand Up @@ -40,4 +40,4 @@
</plugin>
</plugins>
</build>
</project>
</project>
16 changes: 8 additions & 8 deletions load-balancing-demo/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
</parent>

<artifactId>mod_cluster-demo</artifactId>
<name>mod_cluster Examples: Demo (parent)</name>
<packaging>pom</packaging>
<name>mod_cluster Examples: Demo (parent)</name>

<modules>
<module>client</module>
Expand All @@ -35,16 +35,16 @@
<artifactId>jakarta.servlet-api</artifactId>
<version>${version.jakarta.servlet-api}</version>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
<version>${version.http-client}</version>
</dependency>
<dependency>
<groupId>jfree</groupId>
<artifactId>jfreechart</artifactId>
<version>${version.jfreechart}</version>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
<version>${version.http-client}</version>
</dependency>
</dependencies>
</dependencyManagement>

Expand All @@ -54,13 +54,13 @@
<directory>${basedir}/src/main/resources</directory>
</resource>
<resource>
<filtering>true</filtering>
<directory>${project.build.sourceDirectory}</directory>
<excludes>
<exclude>**/*.java</exclude>
</excludes>
<filtering>true</filtering>
</resource>
</resources>
</build>

</project>
</project>
12 changes: 6 additions & 6 deletions load-balancing-demo/server/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,19 +12,19 @@
</parent>

<artifactId>mod_cluster-demo-server</artifactId>
<name>mod_cluster Examples: Demo - Server</name>
<packaging>war</packaging>
<name>mod_cluster Examples: Demo - Server</name>

<dependencies>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
</dependency>
<dependency>
<groupId>jakarta.servlet</groupId>
<artifactId>jakarta.servlet-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
</dependency>
</dependencies>

</project>
</project>
84 changes: 42 additions & 42 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,18 +4,18 @@
~ SPDX-License-Identifier: Apache-2.0
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">

<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.jboss</groupId>
<artifactId>jboss-parent</artifactId>
<version>47</version>
</parent>

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

<licenses>
<license>
Expand All @@ -25,11 +25,15 @@
</license>
</licenses>

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

<scm>
<connection>scm:git:[email protected]:modcluster/mod_cluster-examples.git</connection>
<developerConnection>scm:git:[email protected]:modcluster/mod_cluster-examples.git</developerConnection>
<url>https://github.com/modcluster/mod_cluster-examples</url>
<tag>HEAD</tag>
<url>https://github.com/modcluster/mod_cluster-examples</url>
</scm>

<properties>
Expand All @@ -44,10 +48,6 @@
<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 -->
Expand All @@ -74,47 +74,49 @@
</dependency>
<dependency>
<groupId>org.jboss.mod_cluster</groupId>
<artifactId>mod_cluster-load-spi</artifactId>
<artifactId>mod_cluster-demo</artifactId>
<version>${version.mod_cluster}</version>
</dependency>
<dependency>
<groupId>org.jboss.mod_cluster</groupId>
<artifactId>mod_cluster-demo</artifactId>
<artifactId>mod_cluster-demo-client</artifactId>
<version>${version.mod_cluster}</version>
</dependency>
<dependency>
<groupId>org.jboss.mod_cluster</groupId>
<artifactId>mod_cluster-demo-client</artifactId>
<artifactId>mod_cluster-demo-server</artifactId>
<version>${version.mod_cluster}</version>
</dependency>
<dependency>
<groupId>org.jboss.mod_cluster</groupId>
<artifactId>mod_cluster-demo-server</artifactId>
<artifactId>mod_cluster-load-spi</artifactId>
<version>${version.mod_cluster}</version>
</dependency>
</dependencies>
</dependencyManagement>

<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId>
<configuration>
<autoVersionSubmodules>true</autoVersionSubmodules>
<tagNameFormat>@{project.version}</tagNameFormat>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
</plugin>
</plugins>
<pluginManagement>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
<configuration>
<linkXRef>false</linkXRef>
<configLocation>wildfly-checkstyle/checkstyle.xml</configLocation>
<consoleOutput>true</consoleOutput>
<failsOnError>true</failsOnError>
<includeTestSourceDirectory>true</includeTestSourceDirectory>
<excludes>**/*$logger.java,**/*$bundle.java</excludes>
<useFile />
</configuration>
<dependencies>
<dependency>
<groupId>org.wildfly.checkstyle</groupId>
<artifactId>wildfly-checkstyle-config</artifactId>
<version>${version.org.wildfly.checkstyle-config}</version>
</dependency>
</dependencies>
<executions>
<execution>
<id>check-style</id>
Expand All @@ -124,25 +126,23 @@
</goals>
</execution>
</executions>
<dependencies>
<dependency>
<groupId>org.wildfly.checkstyle</groupId>
<artifactId>wildfly-checkstyle-config</artifactId>
<version>${version.org.wildfly.checkstyle-config}</version>
</dependency>
</dependencies>
<configuration>
<linkXRef>false</linkXRef>
<configLocation>wildfly-checkstyle/checkstyle.xml</configLocation>
<consoleOutput>true</consoleOutput>
<failsOnError>true</failsOnError>
<includeTestSourceDirectory>true</includeTestSourceDirectory>
<excludes>**/*$logger.java,**/*$bundle.java</excludes>
<useFile/>
</configuration>
</plugin>
</plugins>
</pluginManagement>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId>
<configuration>
<autoVersionSubmodules>true</autoVersionSubmodules>
<tagNameFormat>@{project.version}</tagNameFormat>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
</plugin>
</plugins>
</build>

</project>