Skip to content

FELIX-6876 - Look up Wagon from the plugin container in the remote OBR goals #592

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

Draft
slachiewicz wants to merge 2 commits into
base: master
Choose a base branch
from
+553 −28
Draft

FELIX-6876 - Look up Wagon from the plugin container in the remote OBR goals #592

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5c9273a
FELIX-6876 - Look up Wagon from the plugin container in the remote OB…
slachiewicz Nov 4, 2026
1650b60
FELIX-6876 - Clear the Wagon reference when releasing it
slachiewicz Nov 5, 2026
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
29 changes: 29 additions & 0 deletions tools/maven-bundle-plugin/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -220,6 +220,35 @@
<version>3.8.1</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-settings</artifactId>
<version>3.8.1</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-settings-builder</artifactId>
<version>3.8.1</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.maven.wagon</groupId>
<artifactId>wagon-provider-api</artifactId>
<version>3.5.3</version>
<scope>provided</scope>
</dependency>
<!-- Wagon providers for the remote OBR goals, so that file: and http(s): work without the ones bundled in Maven -->
<dependency>
<groupId>org.apache.maven.wagon</groupId>
<artifactId>wagon-file</artifactId>
<version>3.5.3</version>
</dependency>
<dependency>
<groupId>org.apache.maven.wagon</groupId>
<artifactId>wagon-http</artifactId>
<version>3.5.3</version>
</dependency>
<dependency>
<groupId>org.apache.maven.reporting</groupId>
<artifactId>maven-reporting-api</artifactId>
Expand Down
15 changes: 11 additions & 4 deletions tools/maven-bundle-plugin/src/main/java/org/apache/felix/obrplugin/ObrDeploy.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@
import java.util.regex.Pattern;

import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.manager.WagonManager;
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.plugin.AbstractMojo;
import org.apache.maven.plugin.MojoExecutionException;
Expand All @@ -40,6 +39,8 @@
import org.apache.maven.plugins.annotations.Parameter;
import org.apache.maven.project.MavenProject;
import org.apache.maven.settings.Settings;
import org.apache.maven.settings.crypto.SettingsDecrypter;
import org.codehaus.plexus.PlexusContainer;


/**
Expand Down Expand Up @@ -123,10 +124,16 @@ public final class ObrDeploy extends AbstractMojo
private Settings settings;

/**
* The Wagon manager.
* The Plexus container, used to look up the Wagon for the repository protocol.
*/
@Component
private WagonManager m_wagonManager;
private PlexusContainer m_container;

/**
* Decrypts the passwords of the server and proxy settings.
*/
@Component
private SettingsDecrypter m_settingsDecrypter;

/**
* Attached source artifact
Expand Down Expand Up @@ -182,7 +189,7 @@ else if ( "javadoc".equals( artifact.getClassifier() ) )
Log log = getLog();
ObrUpdate update;

RemoteFileManager remoteFile = new RemoteFileManager( m_wagonManager, settings, log );
RemoteFileManager remoteFile = new RemoteFileManager( m_container, m_settingsDecrypter, settings, log );
openRepositoryConnection( remoteFile );

// ======== LOCK REMOTE OBR ========
Expand Down
15 changes: 11 additions & 4 deletions tools/maven-bundle-plugin/src/main/java/org/apache/felix/obrplugin/ObrDeployFile.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@
import java.util.Arrays;
import java.util.List;

import org.apache.maven.artifact.manager.WagonManager;
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugin.logging.Log;
Expand All @@ -34,6 +33,8 @@
import org.apache.maven.plugins.annotations.Parameter;
import org.apache.maven.project.MavenProject;
import org.apache.maven.settings.Settings;
import org.apache.maven.settings.crypto.SettingsDecrypter;
import org.codehaus.plexus.PlexusContainer;


/**
Expand Down Expand Up @@ -99,10 +100,16 @@ public final class ObrDeployFile extends AbstractFileMojo
private Settings settings;

/**
* The Wagon manager.
* The Plexus container, used to look up the Wagon for the repository protocol.
*/
@Component
private WagonManager m_wagonManager;
private PlexusContainer m_container;

/**
* Decrypts the passwords of the server and proxy settings.
*/
@Component
private SettingsDecrypter m_settingsDecrypter;


public void execute() throws MojoExecutionException
Expand Down Expand Up @@ -135,7 +142,7 @@ else if ( "NONE".equalsIgnoreCase( remoteOBR ) || "false".equalsIgnoreCase( remo
Log log = getLog();
ObrUpdate update;

RemoteFileManager remoteFile = new RemoteFileManager( m_wagonManager, settings, log );
RemoteFileManager remoteFile = new RemoteFileManager( m_container, m_settingsDecrypter, settings, log );
remoteFile.connect( repositoryId, url );

// ======== LOCK REMOTE OBR ========
Expand Down
15 changes: 11 additions & 4 deletions tools/maven-bundle-plugin/src/main/java/org/apache/felix/obrplugin/ObrRemoteClean.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,6 @@
import javax.xml.transform.dom.DOMSource;
import javax.xml.transform.stream.StreamResult;

import org.apache.maven.artifact.manager.WagonManager;
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.plugin.AbstractMojo;
import org.apache.maven.plugin.MojoExecutionException;
Expand All @@ -59,6 +58,8 @@
import org.apache.maven.plugins.annotations.Parameter;
import org.apache.maven.project.MavenProject;
import org.apache.maven.settings.Settings;
import org.apache.maven.settings.crypto.SettingsDecrypter;
import org.codehaus.plexus.PlexusContainer;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
Expand Down Expand Up @@ -136,10 +137,16 @@ public final class ObrRemoteClean extends AbstractMojo
private Settings settings;

/**
* The Wagon manager.
* The Plexus container, used to look up the Wagon for the repository protocol.
*/
@Component
private WagonManager m_wagonManager;
private PlexusContainer m_container;

/**
* Decrypts the passwords of the server and proxy settings.
*/
@Component
private SettingsDecrypter m_settingsDecrypter;


public void execute() throws MojoExecutionException
Expand Down Expand Up @@ -170,7 +177,7 @@ else if ( "NONE".equalsIgnoreCase( remoteOBR ) || "false".equalsIgnoreCase( remo

Log log = getLog();

RemoteFileManager remoteFile = new RemoteFileManager( m_wagonManager, settings, log );
RemoteFileManager remoteFile = new RemoteFileManager( m_container, m_settingsDecrypter, settings, log );
openRepositoryConnection( remoteFile );
if ( null == prefixUrl )
{
Expand Down
Loading
Loading