Skip to content

Commit

Permalink
Merge pull request #312 from jfdenise/cleanup_deps
Browse files Browse the repository at this point in the history 
Fix for WFMP-198, Cleanup maven dependencies
  • Loading branch information
@jamezp
jamezp authored Mar 29, 2023
2 parents 0a023e0 + 11f65a9 commit 6237672
Show file tree
Hide file tree
Showing 4 changed files with 126 additions and 168 deletions.
41 changes: 35 additions & 6 deletions plugin/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -122,19 +122,18 @@
<dependency>
<groupId>javax.inject</groupId>
<artifactId>javax.inject</artifactId>
<scope>provided</scope>
</dependency>

<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-compress</artifactId>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-core</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-api</artifactId>
<scope>provided</scope>
</dependency>
<!-- dependencies to annotations -->
<dependency>
Expand All @@ -145,8 +144,32 @@
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.eclipse.aether</groupId>
<artifactId>aether-api</artifactId>
<groupId>org.apache.maven.resolver</groupId>
<artifactId>maven-resolver-api</artifactId>
</dependency>
<dependency>
<groupId>org.apache.maven.resolver</groupId>
<artifactId>maven-resolver-spi</artifactId>
</dependency>
<dependency>
<groupId>org.apache.maven.resolver</groupId>
<artifactId>maven-resolver-impl</artifactId>
</dependency>
<dependency>
<groupId>org.apache.maven.resolver</groupId>
<artifactId>maven-resolver-connector-basic</artifactId>
</dependency>
<dependency>
<groupId>org.apache.maven.resolver</groupId>
<artifactId>maven-resolver-transport-http</artifactId>
</dependency>
<dependency>
<groupId>org.apache.maven.resolver</groupId>
<artifactId>maven-resolver-util</artifactId>
</dependency>
<dependency>
<groupId>org.apache.maven.resolver</groupId>
<artifactId>maven-resolver-named-locks</artifactId>
</dependency>
<dependency>
<groupId>org.jboss.galleon</groupId>
Expand All @@ -161,6 +184,12 @@
<groupId>org.twdata.maven</groupId>
<artifactId>mojo-executor</artifactId>
<version>${version.org.twdata.maven}</version>
<exclusions>
<exclusion>
<groupId>*</groupId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.wildfly.core</groupId>
Expand Down
133 changes: 0 additions & 133 deletions plugin/src/main/java/org/wildfly/plugin/common/Archives.java
View file

This file was deleted.

91 changes: 66 additions & 25 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -100,19 +100,18 @@
<version.org.wildfly.prospero>1.0.0.Beta7</version.org.wildfly.prospero>
<!-- maven dependencies -->
<version.javax.inject.javax.inject>1</version.javax.inject.javax.inject>
<version.org.apache.maven.maven-core>3.3.9</version.org.apache.maven.maven-core>
<version.org.apache.maven.maven-core>3.6.2</version.org.apache.maven.maven-core>
<version.org.apache.maven.plugin-testing.maven-plugin-testing-harness>3.3.0
</version.org.apache.maven.plugin-testing.maven-plugin-testing-harness>
<version.org.apache.maven.plugin-tools>3.7.0</version.org.apache.maven.plugin-tools>
<version.org.apache.maven.shared>0.9.1</version.org.apache.maven.shared>
<version.org.eclipse.aether>1.1.0</version.org.eclipse.aether>
<version.org.apache.maven.resolver>1.9.6</version.org.apache.maven.resolver>
<version.org.eclipse.sisu>0.3.5</version.org.eclipse.sisu>
<version.org.twdata.maven>2.3.1</version.org.twdata.maven>

<!-- other dependencies -->
<version.com.bernardomg.maven.skins>2.3.2</version.com.bernardomg.maven.skins>
<version.junit.junit>4.13.2</version.junit.junit>
<version.org.apache.commons.compress>1.22</version.org.apache.commons.compress>
<version.org.mockito.mockito>5.2.0</version.org.mockito.mockito>

<!-- Require at least Java 11 to compile -->
Expand All @@ -125,7 +124,6 @@
<plugin.fork.embedded>true</plugin.fork.embedded>
<!-- used by tests -->
<version.org.jboss.logging.slf4j-jboss-logging>1.2.1.Final</version.org.jboss.logging.slf4j-jboss-logging>
<version.org.eclipse.aether>1.1.0</version.org.eclipse.aether>

<!-- checkstyle configuration -->
<linkXRef>false</linkXRef>
Expand Down Expand Up @@ -164,7 +162,11 @@
<artifactId>sisu-maven-plugin</artifactId>
<version>${version.org.eclipse.sisu}</version>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-plugin-plugin</artifactId>
<version>${version.org.apache.maven.maven-core}</version>
</plugin>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
Expand Down Expand Up @@ -238,11 +240,6 @@
<version>${version.javax.inject.javax.inject}</version>
</dependency>

<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-compress</artifactId>
<version>${version.org.apache.commons.compress}</version>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-core</artifactId>
Expand Down Expand Up @@ -271,14 +268,50 @@
<version>${version.org.apache.maven.plugin-tools}</version>
</dependency>
<dependency>
<groupId>org.eclipse.aether</groupId>
<artifactId>aether-api</artifactId>
<version>${version.org.eclipse.aether}</version>
<groupId>org.apache.maven.resolver</groupId>
<artifactId>maven-resolver-api</artifactId>
<version>${version.org.apache.maven.resolver}</version>
</dependency>
<dependency>
<groupId>org.apache.maven.resolver</groupId>
<artifactId>maven-resolver-spi</artifactId>
<version>${version.org.apache.maven.resolver}</version>
</dependency>
<dependency>
<groupId>org.apache.maven.resolver</groupId>
<artifactId>maven-resolver-impl</artifactId>
<version>${version.org.apache.maven.resolver}</version>
</dependency>
<dependency>
<groupId>org.apache.maven.resolver</groupId>
<artifactId>maven-resolver-connector-basic</artifactId>
<version>${version.org.apache.maven.resolver}</version>
</dependency>
<dependency>
<groupId>org.apache.maven.resolver</groupId>
<artifactId>maven-resolver-transport-http</artifactId>
<version>${version.org.apache.maven.resolver}</version>
</dependency>
<dependency>
<groupId>org.apache.maven.resolver</groupId>
<artifactId>maven-resolver-util</artifactId>
<version>${version.org.apache.maven.resolver}</version>
</dependency>
<dependency>
<groupId>org.apache.maven.resolver</groupId>
<artifactId>maven-resolver-named-locks</artifactId>
<version>${version.org.apache.maven.resolver}</version>
</dependency>
<dependency>
<groupId>org.jboss.galleon</groupId>
<artifactId>galleon-maven-plugin</artifactId>
<version>${version.org.jboss.galleon}</version>
<exclusions>
<exclusion>
<groupId>*</groupId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.jboss.galleon</groupId>
Expand All @@ -289,6 +322,24 @@
<groupId>org.jboss.galleon</groupId>
<artifactId>galleon-maven-universe</artifactId>
<version>${version.org.jboss.galleon}</version>
<exclusions>
<exclusion>
<groupId>org.apache.maven.shared</groupId>
<artifactId>maven-artifact-transfer</artifactId>
</exclusion>
<exclusion>
<groupId>org.apache.maven</groupId>
<artifactId>maven-artifact</artifactId>
</exclusion>
<exclusion>
<groupId>org.eclipse.aether</groupId>
<artifactId>aether-api</artifactId>
</exclusion>
<exclusion>
<groupId>org.eclipse.aether</groupId>
<artifactId>aether-util</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.jboss.logging</groupId>
Expand Down Expand Up @@ -361,8 +412,8 @@
<version>${version.org.wildfly.prospero}</version>
<exclusions>
<exclusion>
<groupId>org.wildfly.channel</groupId>
<artifactId>channel-core</artifactId>
<groupId>*</groupId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency>
Expand Down Expand Up @@ -398,16 +449,6 @@
<artifactId>mockito-core</artifactId>
<version>${version.org.mockito.mockito}</version>
</dependency>
<dependency>
<groupId>org.eclipse.aether</groupId>
<artifactId>aether-connector-basic</artifactId>
<version>${version.org.eclipse.aether}</version>
</dependency>
<dependency>
<groupId>org.eclipse.aether</groupId>
<artifactId>aether-transport-http</artifactId>
<version>${version.org.eclipse.aether}</version>
</dependency>
<dependency>
<groupId>org.jboss.slf4j</groupId>
<artifactId>slf4j-jboss-logging</artifactId>
Expand Down
Loading

0 comments on commit 6237672

Please sign in to comment.