diff --git a/pom.xml b/pom.xml
index ecfac9d..5c67c89 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
net.md-5
specialsource-maven-plugin
- 1.2.6-SNAPSHOT
+ 2.0.0-SNAPSHOT
maven-plugin
SpecialSourceMP
@@ -27,14 +27,14 @@
UTF-8
3.5
- 3.0
+ 3.2.5
net.md-5
SpecialSource
- 1.11.2
+ 1.11.3
jar
compile
@@ -43,26 +43,13 @@
org.apache.maven
maven-plugin-api
${mavenVersion}
-
-
- org.apache.maven
- maven-model
- ${mavenVersion}
+ provided
org.apache.maven
maven-core
${mavenVersion}
-
-
- org.apache.maven
- maven-compat
- ${mavenVersion}
-
-
- org.apache.maven
- maven-artifact
- ${mavenVersion}
+ provided
org.apache.maven.plugin-tools
@@ -70,12 +57,6 @@
${mavenPluginVersion}
provided
-
-
- org.codehaus.plexus
- plexus-digest
- 1.0
-
diff --git a/src/main/java/net/md_5/specialsource/mavenplugin/InstallRemappedFileMojo.java b/src/main/java/net/md_5/specialsource/mavenplugin/InstallRemappedFileMojo.java
deleted file mode 100644
index 1ef96a3..0000000
--- a/src/main/java/net/md_5/specialsource/mavenplugin/InstallRemappedFileMojo.java
+++ /dev/null
@@ -1,605 +0,0 @@
-/**
- * Copyright 2013 the original author or authors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package net.md_5.specialsource.mavenplugin;
-
-import net.md_5.specialsource.*;
-import net.md_5.specialsource.provider.JarProvider;
-import net.md_5.specialsource.util.FileLocator;
-import org.apache.maven.artifact.Artifact;
-import org.apache.maven.artifact.factory.ArtifactFactory;
-import org.apache.maven.artifact.installer.ArtifactInstallationException;
-import org.apache.maven.artifact.installer.ArtifactInstaller;
-import org.apache.maven.artifact.metadata.ArtifactMetadata;
-import org.apache.maven.artifact.repository.ArtifactRepository;
-import org.apache.maven.artifact.repository.layout.ArtifactRepositoryLayout;
-import org.apache.maven.model.Model;
-import org.apache.maven.model.io.xpp3.MavenXpp3Writer;
-import org.apache.maven.plugin.AbstractMojo;
-import org.apache.maven.plugin.MojoExecutionException;
-import org.apache.maven.plugin.MojoFailureException;
-import org.apache.maven.plugins.annotations.Component;
-import org.apache.maven.plugins.annotations.LifecyclePhase;
-import org.apache.maven.plugins.annotations.Mojo;
-import org.apache.maven.plugins.annotations.Parameter;
-import org.codehaus.plexus.digest.Digester;
-import org.codehaus.plexus.digest.DigesterException;
-import org.codehaus.plexus.util.FileUtils;
-import org.apache.maven.project.MavenProject;
-import org.apache.maven.project.MavenProjectHelper;
-import org.apache.maven.project.artifact.ProjectArtifactMetadata;
-import org.apache.maven.project.validation.ModelValidationResult;
-import org.apache.maven.project.validation.ModelValidator;
-import org.codehaus.plexus.util.IOUtil;
-import org.codehaus.plexus.util.WriterFactory;
-
-import java.io.File;
-import java.io.IOException;
-import java.io.Writer;
-import java.util.*;
-
-/**
- * Install remapped dependencies
- *
- * Based on maven-install-plugin
- */
-@Mojo(name = "install-remapped-file", defaultPhase = LifecyclePhase.INITIALIZE)
-public class InstallRemappedFileMojo extends AbstractMojo {
-
- @Component
- protected ArtifactFactory artifactFactory;
-
- @Component
- protected ArtifactInstaller installer;
-
- @Parameter( property = "localRepository", required = true, readonly = true )
- protected ArtifactRepository localRepository;
-
- /**
- * Flag whether to create checksums (MD5, SHA-1) or not.
- *
- * @since 2.2
- */
- @Parameter( property = "createChecksum", defaultValue = "false" )
- protected boolean createChecksum;
-
- /**
- * Whether to update the metadata to make the artifact a release version.
- */
- @Parameter( property = "updateReleaseInfo", defaultValue = "false" )
- protected boolean updateReleaseInfo;
-
- /**
- * Digester for MD5.
- */
- @Component( hint = "md5" )
- protected Digester md5Digester;
-
- /**
- * Digester for SHA-1.
- */
- @Component( hint = "sha1" )
- protected Digester sha1Digester;
-
-
- /**
- * GroupId of the artifact to be installed.
- */
- @Parameter( property = "groupId", required = true )
- protected String groupId;
-
- /**
- * ArtifactId of the artifact to be installed.
- */
- @Parameter( property = "artifactId", required = true )
- protected String artifactId;
-
- /**
- * Version of the artifact to be installed.
- */
- @Parameter( property = "version", required = true )
- protected String version;
-
- /**
- * Packaging type of the artifact to be installed.
- */
- @Parameter( property = "packaging", defaultValue = "jar" )
- protected String packaging;
-
- /**
- * Classifier type of the artifact to be installed. For example, "sources" or "javadoc". Defaults to none which
- * means this is the project's main artifact.
- *
- */
- @Parameter( property = "classifier" )
- protected String classifier;
-
- /**
- * The input jar(s) to be remapped and installed. May be remote URLs.
- */
- @Parameter( property = "in-jars", required = true )
- private String[] inJars;
-
- /**
- * The bundled API docs for the artifact.
- *
- */
- @Parameter( property = "javadoc" )
- private File javadoc;
-
- /**
- * The bundled sources for the artifact.
- *
- */
- @Parameter( property = "sources" )
- private File sources;
-
- /**
- * Mapping input file and options
- */
- @Parameter( required = true )
- private String srgIn;
- @Parameter
- private boolean reverse;
- @Parameter
- private boolean numeric;
- @Parameter
- private boolean generateAPI;
- @Parameter
- private String inShadeRelocation;
- @Parameter
- private String outShadeRelocation;
- @Parameter
- private String[] accessTransformers;
- @Parameter
- private String[] excludedPackages;
-
- /**
- * Output options
- */
-
- @Parameter ( defaultValue = "false" )
- private boolean replaceMainArtifact;
-
- @Parameter( defaultValue = "${project.build.directory}" )
- private File outputDirectory;
-
- @Parameter ( defaultValue = "false" )
- private boolean attachArtifact;
-
- @Parameter ( defaultValue = "jar" )
- private String attachArtifactType;
-
- @Parameter ( defaultValue = "" )
- private String attachArtifactClassifier;
-
- @Parameter ( defaultValue = "true" )
- private boolean installArtifact;
-
- /**
- * Map that contains the repository layouts.
- */
- @Component( role = ArtifactRepositoryLayout.class )
- private Map repositoryLayouts;
-
- /**
- * The current Maven project.
- */
- @Component
- private MavenProject project;
-
- @Component
- private MavenProjectHelper projectHelper;
-
- /**
- * The component used to validate the user-supplied artifact coordinates.
- */
- @Component
- private ModelValidator modelValidator; // TODO: what is the non-deprecated replacement for mvn 3? maven-install-plugin uses this but its on mvn 2.0.6
-
- public void execute() throws MojoFailureException, MojoExecutionException {
- // Validate
- validateArtifactInformation();
-
- Artifact artifact =
- artifactFactory.createArtifactWithClassifier( groupId, artifactId, version, packaging, classifier );
-
- File existingFile = getLocalRepoFile(artifact);
- if (existingFile != null && existingFile.exists()) {
- System.out.println("Using cached remapped artifact "+ existingFile.getPath()); // delete file to reinstall
- return; // success
- }
-
- // Remap
- File outJar = null;
- try {
- // load input jar(s), as one combined jar (for jarmods)
- List files = new ArrayList();
- for (String filename : inJars) {
- files.add(FileLocator.getFile(filename));
- }
- Jar inJar = Jar.init(files);
-
- // temporary output file
- outJar = File.createTempFile(groupId + "." + artifactId + "-" + version, "." + packaging);
-
- // mappings
- JarMapping mapping = new JarMapping();
- if (excludedPackages != null) {
- for (String packageName : excludedPackages) {
- mapping.addExcludedPackage(packageName);
- }
- }
- mapping.loadMappings(srgIn, reverse, numeric, inShadeRelocation, outShadeRelocation);
- mapping.setFallbackInheritanceProvider(new JarProvider(inJar));
-
-
- // access transformers
- RemapperProcessor preprocessor = null;
- if (accessTransformers != null) {
- AccessMap accessMap = new AccessMap();
-
- for (String filename : accessTransformers) {
- if (filename != null && filename.length() != 0) {
- accessMap.loadAccessTransformer(filename);
- }
- }
-
- preprocessor = new RemapperProcessor(null, null, accessMap);
- }
-
- // Do the remap
- JarRemapper remapper = new JarRemapper(preprocessor, mapping);
- remapper.setGenerateAPI(generateAPI);
- remapper.remapJar(inJar, outJar);
- } catch (Exception ex) {
- ex.printStackTrace();
- throw new MojoExecutionException("Error creating remapped jar at "+outJar+": " + ex.getMessage(), ex);
- }
-
- // Replace main artifact with this remapped artifact
- if (replaceMainArtifact) {
- getLog().info("Replacing original artifact with remapped artifact.");
- File originalArtifact = project.getArtifact().getFile();
- originalArtifact.delete();
- if (!outJar.renameTo(originalArtifact)) {
- throw new MojoExecutionException("Error replacing remapped jar at "+originalArtifact+" with "+outJar);
- }
- }
-
- // Attach output artifact to this project
- if (attachArtifact) {
- if (attachArtifactClassifier == null || attachArtifactClassifier.equals("")) {
- attachArtifactClassifier = null;
- }
-
- getLog().info("Attaching artifact " + outJar.getPath());
- projectHelper.attachArtifact(project, attachArtifactType, attachArtifactClassifier, outJar);
- }
-
- // Install output artifact to local repository
- if (installArtifact) {
- installArtifact(artifact, outJar);
- }
- }
-
- private void installArtifact(Artifact artifact, File outJar) throws MojoExecutionException {
- // Install POM
- File generatedPomFile = generatePomFile();
- ArtifactMetadata pomMetadata = new ProjectArtifactMetadata( artifact, generatedPomFile );
- if ( !getLocalRepoFile( pomMetadata ).exists() )
- {
- getLog().debug( "Installing generated POM" );
- artifact.addMetadata( pomMetadata );
- }
- else
- {
- getLog().debug( "Skipping installation of generated POM, already present in local repository" );
- }
-
- if ( updateReleaseInfo )
- {
- artifact.setRelease( true );
- }
-
-
- // Install artifact (based on maven-install-plugin)
-
- Collection metadataFiles = new LinkedHashSet();
-
- try
- {
- installer.install( outJar, artifact, localRepository );
- installChecksums( artifact, metadataFiles );
- }
- catch ( ArtifactInstallationException e )
- {
- throw new MojoExecutionException(
- "Error installing artifact '" + artifact.getDependencyConflictId() + "' at "+outJar+": " + e.getMessage(), e );
- }
- finally
- {
- if ( generatedPomFile != null )
- {
- generatedPomFile.delete();
- }
- }
-
- if ( sources != null )
- {
- artifact = artifactFactory.createArtifactWithClassifier( groupId, artifactId, version, "jar", "sources" );
- try
- {
- installer.install( sources, artifact, localRepository );
- installChecksums( artifact, metadataFiles );
- }
- catch ( ArtifactInstallationException e )
- {
- throw new MojoExecutionException( "Error installing sources " + sources + ": " + e.getMessage(), e );
- }
- }
-
- if ( javadoc != null )
- {
- artifact = artifactFactory.createArtifactWithClassifier( groupId, artifactId, version, "jar", "javadoc" );
- try
- {
- installer.install( javadoc, artifact, localRepository );
- installChecksums( artifact, metadataFiles );
- }
- catch ( ArtifactInstallationException e )
- {
- throw new MojoExecutionException( "Error installing API docs " + javadoc + ": " + e.getMessage(), e );
- }
- }
-
- installChecksums( metadataFiles );
-
- // Remove temporary file after it has been installed
- outJar.delete();
-
- /* TODO: set as dependency?
- may not be feasible to add dynamically - instead, add in your pom.xml by hand then 'mvn initialize' & 'mvn package'
-
- mvn dependency:list
-
- http://maven.40175.n5.nabble.com/How-to-add-a-dependency-dynamically-during-the-build-in-a-plugin-td116484.html
- "How to add a dependency dynamically during the build in a plugin?"
- no solution
-
- https://gist.github.com/agaricusb/5073308/raw/aeae7738ec5da5274eab143d9f92c439f9b07f47/gistfile1.txt
- "Maven: A Developer's Notebook - Chapter 6. Writing Maven Plugins > Adding Dynamic Dependencies"
- adding to classpath..
-
- // Add dependency
- Dependency dependency = new Dependency();
- dependency.setGroupId(groupId);
- dependency.setArtifactId(artifactId);
- dependency.setVersion(version);
- dependency.setScope("compile"); // TODO: system?
- //dependency.setSystemPath();
-
- project.getDependencies().add(dependency);*/
- }
-
- /**
- * Validates the user-supplied artifact information.
- *
- * @throws MojoExecutionException If any artifact coordinate is invalid.
- */
- private void validateArtifactInformation()
- throws MojoExecutionException
- {
- Model model = generateModel();
-
- ModelValidationResult result = modelValidator.validate( model );
-
- if ( result.getMessageCount() > 0 )
- {
- throw new MojoExecutionException(
- "The artifact information is incomplete or not valid:\n" + result.render( " " ) );
- }
- }
-
-
- /**
- * Generates a minimal model from the user-supplied artifact information.
- *
- * @return The generated model, never null.
- */
- private Model generateModel()
- {
- Model model = new Model();
-
- model.setModelVersion( "4.0.0" );
-
- model.setGroupId( groupId );
- model.setArtifactId( artifactId );
- model.setVersion( version );
- model.setPackaging( packaging );
-
- model.setDescription( "POM was created from specialsource-maven-plugin" );
-
- return model;
- }
-
- /**
- * Generates a (temporary) POM file from the plugin configuration. It's the responsibility of the caller to delete
- * the generated file when no longer needed.
- *
- * @return The path to the generated POM file, never null.
- * @throws MojoExecutionException If the POM file could not be generated.
- */
- private File generatePomFile()
- throws MojoExecutionException
- {
- Model model = generateModel();
-
- Writer writer = null;
- try
- {
- File pomFile = File.createTempFile( "mvninstall", ".pom" );
-
- writer = WriterFactory.newXmlWriter(pomFile);
- new MavenXpp3Writer().write( writer, model );
-
- return pomFile;
- }
- catch ( IOException e )
- {
- throw new MojoExecutionException( "Error writing temporary POM file: " + e.getMessage(), e );
- }
- finally
- {
- IOUtil.close(writer);
- }
- }
-
- // TODO: extend maven-install-plugin AbstractInstallMojo??
-
- /**
- * Gets the path of the specified artifact within the local repository. Note that the returned path need not exist
- * (yet).
- *
- * @param artifact The artifact whose local repo path should be determined, must not be null.
- * @return The absolute path to the artifact when installed, never null.
- */
- protected File getLocalRepoFile( Artifact artifact )
- {
- String path = localRepository.pathOf( artifact );
- return new File( localRepository.getBasedir(), path );
- }
-
- /**
- * Gets the path of the specified artifact metadata within the local repository. Note that the returned path need
- * not exist (yet).
- *
- * @param metadata The artifact metadata whose local repo path should be determined, must not be null.
- * @return The absolute path to the artifact metadata when installed, never null.
- */
- protected File getLocalRepoFile( ArtifactMetadata metadata )
- {
- String path = localRepository.pathOfLocalRepositoryMetadata( metadata, localRepository );
- return new File( localRepository.getBasedir(), path );
- }
-
- /**
- * Installs the checksums for the specified artifact if this has been enabled in the plugin configuration. This
- * method creates checksums for files that have already been installed to the local repo to account for on-the-fly
- * generated/updated files. For example, in Maven 2.0.4- the ProjectArtifactMetadata did not install
- * the original POM file (cf. MNG-2820). While the plugin currently requires Maven 2.0.6, we continue to hash the
- * installed POM for robustness with regard to future changes like re-introducing some kind of POM filtering.
- *
- * @param artifact The artifact for which to create checksums, must not be null.
- * @param metadataFiles The set where additional metadata files will be registered for later checksum installation,
- * must not be null.
- * @throws MojoExecutionException If the checksums could not be installed.
- */
- protected void installChecksums( Artifact artifact, Collection metadataFiles )
- throws MojoExecutionException
- {
- if ( !createChecksum )
- {
- return;
- }
-
- File artifactFile = getLocalRepoFile( artifact );
- installChecksums( artifactFile );
-
- Collection metadatas = artifact.getMetadataList();
- if ( metadatas != null )
- {
- for ( Iterator it = metadatas.iterator(); it.hasNext(); )
- {
- ArtifactMetadata metadata = (ArtifactMetadata) it.next();
- File metadataFile = getLocalRepoFile( metadata );
- metadataFiles.add( metadataFile );
- }
- }
- }
-
- /**
- * Installs the checksums for the specified metadata files.
- *
- * @param metadataFiles The collection of metadata files to install checksums for, must not be null.
- * @throws MojoExecutionException If the checksums could not be installed.
- */
- protected void installChecksums( Collection metadataFiles )
- throws MojoExecutionException
- {
- for ( Iterator it = metadataFiles.iterator(); it.hasNext(); )
- {
- File metadataFile = (File) it.next();
- installChecksums( metadataFile );
- }
- }
-
- /**
- * Installs the checksums for the specified file (if it exists).
- *
- * @param installedFile The path to the already installed file in the local repo for which to generate checksums,
- * must not be null.
- * @throws MojoExecutionException If the checksums could not be installed.
- */
- private void installChecksums( File installedFile )
- throws MojoExecutionException
- {
- boolean signatureFile = installedFile.getName().endsWith( ".asc" );
- if ( installedFile.isFile() && !signatureFile )
- {
- installChecksum( installedFile, installedFile, md5Digester, ".md5" );
- installChecksum( installedFile, installedFile, sha1Digester, ".sha1" );
- }
- }
-
- /**
- * Installs a checksum for the specified file.
- *
- * @param originalFile The path to the file from which the checksum is generated, must not be null.
- * @param installedFile The base path from which the path to the checksum files is derived by appending the given
- * file extension, must not be null.
- * @param digester The checksum algorithm to use, must not be null.
- * @param ext The file extension (including the leading dot) to use for the checksum file, must not be
- * null.
- * @throws MojoExecutionException If the checksum could not be installed.
- */
- private void installChecksum( File originalFile, File installedFile, Digester digester, String ext )
- throws MojoExecutionException
- {
- String checksum;
- getLog().debug( "Calculating " + digester.getAlgorithm() + " checksum for " + originalFile );
- try
- {
- checksum = digester.calc( originalFile );
- }
- catch ( DigesterException e )
- {
- throw new MojoExecutionException( "Failed to calculate " + digester.getAlgorithm() + " checksum for "
- + originalFile, e );
- }
-
- File checksumFile = new File( installedFile.getAbsolutePath() + ext );
- getLog().debug( "Installing checksum to " + checksumFile );
- try
- {
- checksumFile.getParentFile().mkdirs();
- FileUtils.fileWrite( checksumFile.getAbsolutePath(), "UTF-8", checksum );
- }
- catch ( IOException e )
- {
- throw new MojoExecutionException( "Failed to install checksum to " + checksumFile, e );
- }
- }
-}
diff --git a/src/main/java/net/md_5/specialsource/mavenplugin/RemapMojo.java b/src/main/java/net/md_5/specialsource/mavenplugin/RemapMojo.java
index f69cc91..478d5e3 100644
--- a/src/main/java/net/md_5/specialsource/mavenplugin/RemapMojo.java
+++ b/src/main/java/net/md_5/specialsource/mavenplugin/RemapMojo.java
@@ -16,15 +16,9 @@
package net.md_5.specialsource.mavenplugin;
import net.md_5.specialsource.*;
-import net.md_5.specialsource.provider.ClassLoaderProvider;
import net.md_5.specialsource.provider.JarProvider;
import net.md_5.specialsource.provider.JointProvider;
import org.apache.maven.artifact.Artifact;
-import org.apache.maven.artifact.factory.ArtifactFactory;
-import org.apache.maven.artifact.repository.ArtifactRepository;
-import org.apache.maven.artifact.resolver.ArtifactNotFoundException;
-import org.apache.maven.artifact.resolver.ArtifactResolutionException;
-import org.apache.maven.artifact.resolver.ArtifactResolver;
import org.apache.maven.model.Dependency;
import org.apache.maven.plugin.AbstractMojo;
import org.apache.maven.plugin.MojoExecutionException;
@@ -36,14 +30,19 @@
import org.apache.maven.project.MavenProject;
import org.apache.maven.project.MavenProjectHelper;
import org.codehaus.plexus.util.IOUtil;
+import org.eclipse.aether.RepositorySystem;
+import org.eclipse.aether.RepositorySystemSession;
+import org.eclipse.aether.artifact.DefaultArtifact;
+import org.eclipse.aether.repository.RemoteRepository;
+import org.eclipse.aether.resolution.ArtifactRequest;
+import org.eclipse.aether.resolution.ArtifactResolutionException;
+import org.eclipse.aether.resolution.ArtifactResult;
+import org.eclipse.aether.transfer.ArtifactNotFoundException;
import java.io.File;
import java.io.FileInputStream;
import java.io.FileOutputStream;
import java.io.IOException;
-import java.net.URL;
-import java.net.URLClassLoader;
-import java.util.ArrayList;
import java.util.List;
/**
@@ -57,23 +56,20 @@ public class RemapMojo extends AbstractMojo {
/**
* The current Maven project.
*/
- @Component
+ @Parameter( defaultValue = "${project}", required = true, readonly = true )
private MavenProject project;
@Component
private MavenProjectHelper projectHelper;
@Component
- private ArtifactResolver artifactResolver;
-
- @Component
- private ArtifactFactory artifactFactory;
+ private RepositorySystem repoSystem;
- @Parameter( property = "localRepository", required = true, readonly = true )
- private ArtifactRepository localRepository;
+ @Parameter( defaultValue = "${repositorySystemSession}", required = true, readonly = true )
+ private RepositorySystemSession repoSession;
- @Parameter( defaultValue = "${project.remoteArtifactRepositories}" )
- private List remoteRepositories;
+ @Parameter( defaultValue = "${project.remoteProjectRepositories}", required = true, readonly = true )
+ private List remoteRepositories;
/**
* The destination directory for the shaded artifact.
@@ -152,9 +148,11 @@ private File resolveArtifact(String artifactString) throws ArtifactResolutionExc
}
private File resolveArtifact(String groupId, String artifactId, String version, String type, String classifier) throws ArtifactResolutionException, ArtifactNotFoundException {
- Artifact artifact = artifactFactory.createArtifactWithClassifier(groupId, artifactId, version, type, classifier);
- artifactResolver.resolve(artifact, remoteRepositories, localRepository);
- return artifact.getFile();
+ org.eclipse.aether.artifact.Artifact artifact = new DefaultArtifact(groupId, artifactId, classifier, type, version);
+
+ ArtifactRequest remoteRequest = new ArtifactRequest(artifact, remoteRepositories, null);
+ ArtifactResult remoteResult = repoSystem.resolveArtifact(repoSession, remoteRequest); // throws org.eclipse.aether.resolution.ArtifactResolutionException
+ return remoteResult.getArtifact().getFile();
}
public void execute() throws MojoExecutionException, MojoFailureException {