Skip to content

Commit

Permalink
Merge pull request clusterbench#492 from rhusar/sort-deps
Browse files Browse the repository at this point in the history 
chore: sort dependencies
  • Loading branch information
@rhusar
rhusar authored Sep 12, 2024
2 parents c54725c + 75c2fd4 commit 0d66e6b
Show file tree
Hide file tree
Showing 6 changed files with 53 additions and 53 deletions.
10 changes: 5 additions & 5 deletions clusterbench-common/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,20 +22,20 @@
</properties>

<dependencies>
<!-- Jakarta dependencies -->
<dependency>
<groupId>jakarta.servlet</groupId>
<artifactId>jakarta.servlet-api</artifactId>
<groupId>jakarta.annotation</groupId>
<artifactId>jakarta.annotation-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>jakarta.ejb</groupId>
<artifactId>jakarta.ejb-api</artifactId>
<scope>provided</scope>
</dependency>
<!-- Jakarta dependencies -->
<dependency>
<groupId>jakarta.annotation</groupId>
<artifactId>jakarta.annotation-api</artifactId>
<groupId>jakarta.servlet</groupId>
<artifactId>jakarta.servlet-api</artifactId>
<scope>provided</scope>
</dependency>
<!-- Test dependencies -->
Expand Down
32 changes: 16 additions & 16 deletions clusterbench-ee10-web/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,25 +26,14 @@

<dependencies>
<!-- Project dependencies -->
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>clusterbench-ee10-ejb</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>clusterbench-common</artifactId>
<scope>compile</scope>
</dependency>
<!-- Jakarta dependencies -->
<dependency>
<groupId>jakarta.servlet</groupId>
<artifactId>jakarta.servlet-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>jakarta.inject</groupId>
<artifactId>jakarta.inject-api</artifactId>
<groupId>${project.groupId}</groupId>
<artifactId>clusterbench-ee10-ejb</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
Expand All @@ -57,10 +46,15 @@
<artifactId>jakarta.faces-api</artifactId>
<scope>provided</scope>
</dependency>
<!-- @org.wildfly.clustering.web.annotation.Immutable -->
<dependency>
<groupId>org.wildfly</groupId>
<artifactId>wildfly-clustering-web-api</artifactId>
<groupId>jakarta.inject</groupId>
<artifactId>jakarta.inject-api</artifactId>
<scope>provided</scope>
</dependency>
<!-- Jakarta dependencies -->
<dependency>
<groupId>jakarta.servlet</groupId>
<artifactId>jakarta.servlet-api</artifactId>
<scope>provided</scope>
</dependency>
<!-- /debug servlet -->
Expand All @@ -69,6 +63,12 @@
<artifactId>jgroups</artifactId>
<scope>provided</scope>
</dependency>
<!-- @org.wildfly.clustering.web.annotation.Immutable -->
<dependency>
<groupId>org.wildfly</groupId>
<artifactId>wildfly-clustering-web-api</artifactId>
<scope>provided</scope>
</dependency>
</dependencies>

<build>
Expand Down
14 changes: 7 additions & 7 deletions integration-tests/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,13 +24,6 @@

<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.junit</groupId>
<artifactId>junit-bom</artifactId>
<version>${version.org.junit.jupiter}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>org.jboss.arquillian</groupId>
<artifactId>arquillian-bom</artifactId>
Expand All @@ -45,6 +38,13 @@
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>org.junit</groupId>
<artifactId>junit-bom</artifactId>
<version>${version.org.junit.jupiter}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
</dependencies>
</dependencyManagement>

Expand Down
12 changes: 6 additions & 6 deletions integration-tests/tomcat-10.1/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,10 @@
</properties>

<dependencies>
<!-- Needed by ARQ -->
<dependency>
<groupId>org.jboss.test</groupId>
<artifactId>clusterbench-ee10-web</artifactId>
<classifier>classes</classifier>
<groupId>jakarta.servlet</groupId>
<artifactId>jakarta.servlet-api</artifactId>
<scope>test</scope>
</dependency>
<dependency>
Expand All @@ -49,10 +49,10 @@
<artifactId>arquillian-junit-container</artifactId>
<scope>test</scope>
</dependency>
<!-- Needed by ARQ -->
<dependency>
<groupId>jakarta.servlet</groupId>
<artifactId>jakarta.servlet-api</artifactId>
<groupId>org.jboss.test</groupId>
<artifactId>clusterbench-ee10-web</artifactId>
<classifier>classes</classifier>
<scope>test</scope>
</dependency>
</dependencies>
Expand Down
24 changes: 12 additions & 12 deletions integration-tests/wildfly/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,16 +24,16 @@
<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.junit</groupId>
<artifactId>junit-bom</artifactId>
<version>${version.org.junit.jupiter}</version>
<groupId>org.jboss.arquillian</groupId>
<artifactId>arquillian-bom</artifactId>
<version>${version.org.jboss.arquillian}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>org.jboss.arquillian</groupId>
<artifactId>arquillian-bom</artifactId>
<version>${version.org.jboss.arquillian}</version>
<groupId>org.junit</groupId>
<artifactId>junit-bom</artifactId>
<version>${version.org.junit.jupiter}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
Expand All @@ -42,23 +42,23 @@

<dependencies>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter</artifactId>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.jboss.arquillian.junit5</groupId>
<artifactId>arquillian-junit5-core</artifactId>
<artifactId>arquillian-junit5-container</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.jboss.arquillian.junit5</groupId>
<artifactId>arquillian-junit5-container</artifactId>
<artifactId>arquillian-junit5-core</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter</artifactId>
<scope>test</scope>
</dependency>
<dependency>
Expand Down
14 changes: 7 additions & 7 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -68,20 +68,20 @@
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>org.wildfly</groupId>
<artifactId>wildfly-clustering-web-api</artifactId>
<!-- TODO this should be managed by the BOM! -->
<version>${version.org.wildfly}</version>
<scope>provided</scope>
</dependency>
<!-- Only for Dependabot, this is never referenced via Maven dependencies -->
<dependency>
<groupId>org.wildfly.cloud</groupId>
<artifactId>wildfly-cloud-galleon-pack</artifactId>
<version>${version.org.wildfly.cloud-feature-pack}</version>
<type>zip</type>
</dependency>
<dependency>
<groupId>org.wildfly</groupId>
<artifactId>wildfly-clustering-web-api</artifactId>
<!-- TODO this should be managed by the BOM! -->
<version>${version.org.wildfly}</version>
<scope>provided</scope>
</dependency>
<!-- Test dependencies -->
<dependency>
<groupId>org.junit.jupiter</groupId>
Expand Down

0 comments on commit 0d66e6b

Please sign in to comment.