Skip to content
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.

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

Fix for WFMP-209, Can't use maven http transport with maven < 3.9 #343

Merged
merged 1 commit into from
Jun 5, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
28 changes: 0 additions & 28 deletions plugin/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -143,34 +143,6 @@
<scope>provided</scope>
<optional>true</optional>
</dependency>
<dependency>
<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>
<artifactId>galleon-maven-plugin</artifactId>
Expand Down
13 changes: 8 additions & 5 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,9 @@
<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.apache.maven.resolver>1.9.6</version.org.apache.maven.resolver>
<!-- maven dependencies only required by tests -->
<version.org.apache.maven.wagon>3.5.3</version.org.apache.maven.wagon>

<version.org.eclipse.sisu>0.3.5</version.org.eclipse.sisu>
<version.org.twdata.maven>2.3.1</version.org.twdata.maven>

Expand Down Expand Up @@ -297,18 +300,18 @@
<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>
<groupId>org.apache.maven.wagon</groupId>
<artifactId>wagon-http</artifactId>
<version>${version.org.apache.maven.wagon}</version>
</dependency>
<dependency>
<groupId>org.apache.maven.resolver</groupId>
<artifactId>maven-resolver-util</artifactId>
<artifactId>maven-resolver-transport-wagon</artifactId>
<version>${version.org.apache.maven.resolver}</version>
</dependency>
<dependency>
<groupId>org.apache.maven.resolver</groupId>
<artifactId>maven-resolver-named-locks</artifactId>
<artifactId>maven-resolver-util</artifactId>
<version>${version.org.apache.maven.resolver}</version>
</dependency>
<dependency>
Expand Down
8 changes: 7 additions & 1 deletion tests/standalone-tests/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,13 @@
</dependency>
<dependency>
<groupId>org.apache.maven.resolver</groupId>
<artifactId>maven-resolver-transport-http</artifactId>
<artifactId>maven-resolver-transport-wagon</artifactId>
<scope>test</scope>
</dependency>
<!-- Only required by tests -->
<dependency>
<groupId>org.apache.maven.wagon</groupId>
<artifactId>wagon-http</artifactId>
<scope>test</scope>
</dependency>
<dependency>
Expand Down