You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by kh...@apache.org on 2020/05/22 18:45:23 UTC

[maven-artifact-transfer] branch master updated: Revert "[MSHARED-817] Change eclipse aether dependency scope to provided"

This is an automated email from the ASF dual-hosted git repository.

khmarbaise pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-artifact-transfer.git


The following commit(s) were added to refs/heads/master by this push:
     new d4df338  Revert "[MSHARED-817] Change eclipse aether dependency scope to provided"
d4df338 is described below

commit d4df3387215336eb52358f054e742ad44ad9e88f
Author: Karl Heinz Marbaise <kh...@apache.org>
AuthorDate: Sat May 2 12:18:15 2020 +0200

    Revert "[MSHARED-817] Change eclipse aether dependency scope to provided"
    
    This reverts commit 5d86480fcdf4f7ae779aec9c7444ad7b709eaa04.
---
 pom.xml                                            | 46 +++++++++++++++++-----
 .../deploy/internal/DefaultProjectDeployer.java    |  3 --
 .../install/internal/DefaultProjectInstaller.java  |  4 --
 3 files changed, 36 insertions(+), 17 deletions(-)

diff --git a/pom.xml b/pom.xml
index c18ac10..ed02fe7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -95,6 +95,40 @@
         </executions>
       </plugin>
       <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-shade-plugin</artifactId>
+        <!--
+         ! explicit overwrite cause otherwise we get an 2.4.3...instead. 
+         -->
+        <version>3.1.0</version>
+        <executions>
+          <execution>
+            <phase>package</phase>
+            <goals>
+              <goal>shade</goal>
+            </goals>
+            <configuration>
+              <artifactSet>
+                <includes>
+                  <include>org.eclipse.aether:aether-util</include>
+                </includes>
+              </artifactSet>
+              <filters>
+                <filter>
+                  <artifact>org.eclipse.aether:aether-util</artifact>
+                  <includes>
+                    <!-- to prevent java.lang.ClassNotFoundException: org.eclipse.aether.util.artifact.SubArtifact (M3.1.1 - M3.3.3) -->
+                    <include>org/eclipse/aether/util/artifact/SubArtifact.class</include>
+                    <!-- to prevent java.lang.ClassNotFoundException: org.eclipse.aether.util.filter.* (M3.1.1+ ) -->
+                    <include>org/eclipse/aether/util/filter/*</include>
+                  </includes>
+                </filter>
+              </filters>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
         <groupId>org.apache.rat</groupId>
         <artifactId>apache-rat-plugin</artifactId>
         <configuration>
@@ -182,7 +216,7 @@
       <groupId>org.sonatype.aether</groupId>
       <artifactId>aether-impl</artifactId>
       <version>1.7</version>
-      <scope>provided</scope>
+      <scope>test</scope>
     </dependency>
 
     <!-- Maven 3.1.x and above -->
@@ -196,7 +230,7 @@
       <groupId>org.eclipse.aether</groupId>
       <artifactId>aether-util</artifactId>
       <version>0.9.0.M2</version>
-      <scope>provided</scope>
+      <!-- provided scoped dependencies aren't shaded -->
     </dependency>
     <dependency>
       <groupId>org.eclipse.aether</groupId>
@@ -205,14 +239,6 @@
       <scope>provided</scope>
     </dependency>
 
-    <!-- Allow importing the aether-util library from the user's distribution -->
-    <dependency>
-      <groupId>org.codehaus.plexus</groupId>
-      <artifactId>plexus-classworlds</artifactId>
-      <version>2.2.3</version>
-      <optional>true</optional>
-    </dependency>
-
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-api</artifactId>
diff --git a/src/main/java/org/apache/maven/shared/transfer/project/deploy/internal/DefaultProjectDeployer.java b/src/main/java/org/apache/maven/shared/transfer/project/deploy/internal/DefaultProjectDeployer.java
index 56c9aa3..1a066dc 100644
--- a/src/main/java/org/apache/maven/shared/transfer/project/deploy/internal/DefaultProjectDeployer.java
+++ b/src/main/java/org/apache/maven/shared/transfer/project/deploy/internal/DefaultProjectDeployer.java
@@ -31,7 +31,6 @@ import org.apache.maven.project.ProjectBuildingRequest;
 import org.apache.maven.project.artifact.ProjectArtifactMetadata;
 import org.apache.maven.shared.transfer.artifact.deploy.ArtifactDeployer;
 import org.apache.maven.shared.transfer.artifact.deploy.ArtifactDeployerException;
-import org.apache.maven.shared.transfer.project.MavenAetherUtils;
 import org.apache.maven.shared.transfer.project.NoFileAssignedException;
 import org.apache.maven.shared.transfer.project.deploy.ProjectDeployer;
 import org.apache.maven.shared.transfer.project.deploy.ProjectDeployerRequest;
@@ -71,8 +70,6 @@ class DefaultProjectDeployer
     {
         validateParameters( buildingRequest, projectDeployerRequest, artifactRepository );
 
-        MavenAetherUtils.importAetherLibrary();
-
         Artifact artifact = projectDeployerRequest.getProject().getArtifact();
         String packaging = projectDeployerRequest.getProject().getPackaging();
         File pomFile = projectDeployerRequest.getProject().getFile();
diff --git a/src/main/java/org/apache/maven/shared/transfer/project/install/internal/DefaultProjectInstaller.java b/src/main/java/org/apache/maven/shared/transfer/project/install/internal/DefaultProjectInstaller.java
index 41a61c8..94701ea 100644
--- a/src/main/java/org/apache/maven/shared/transfer/project/install/internal/DefaultProjectInstaller.java
+++ b/src/main/java/org/apache/maven/shared/transfer/project/install/internal/DefaultProjectInstaller.java
@@ -34,7 +34,6 @@ import org.apache.maven.project.artifact.ProjectArtifact;
 import org.apache.maven.project.artifact.ProjectArtifactMetadata;
 import org.apache.maven.shared.transfer.artifact.install.ArtifactInstaller;
 import org.apache.maven.shared.transfer.artifact.install.ArtifactInstallerException;
-import org.apache.maven.shared.transfer.project.MavenAetherUtils;
 import org.apache.maven.shared.transfer.project.NoFileAssignedException;
 import org.apache.maven.shared.transfer.project.install.ProjectInstaller;
 import org.apache.maven.shared.transfer.project.install.ProjectInstallerRequest;
@@ -71,9 +70,6 @@ class DefaultProjectInstaller
     {
 
         validateParameters( buildingRequest, installerRequest );
-
-        MavenAetherUtils.importAetherLibrary();
-
         MavenProject project = installerRequest.getProject();
 
         Artifact artifact = project.getArtifact();