You are viewing a plain text version of this content. The canonical link for it is here.
Posted to issues@maven.apache.org by GitBox <gi...@apache.org> on 2018/07/08 22:01:17 UTC
[GitHub] slachiewicz closed pull request #169: [MNG-6344] Upgrade Guice to
4.2 wit AOP (cglib)
slachiewicz closed pull request #169: [MNG-6344] Upgrade Guice to 4.2 wit AOP (cglib)
URL: https://github.com/apache/maven/pull/169
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/maven-core/pom.xml b/maven-core/pom.xml
index 6fd47c5c3a..e2c90f5a94 100644
--- a/maven-core/pom.xml
+++ b/maven-core/pom.xml
@@ -103,7 +103,6 @@ under the License.
<dependency>
<groupId>com.google.inject</groupId>
<artifactId>guice</artifactId>
- <classifier>no_aop</classifier>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
diff --git a/maven-embedder/pom.xml b/maven-embedder/pom.xml
index 2994f04f5c..ec8f4cda65 100644
--- a/maven-embedder/pom.xml
+++ b/maven-embedder/pom.xml
@@ -77,7 +77,6 @@ under the License.
<dependency>
<groupId>com.google.inject</groupId>
<artifactId>guice</artifactId>
- <classifier>no_aop</classifier>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
diff --git a/maven-model-builder/pom.xml b/maven-model-builder/pom.xml
index a009b5cfb8..6f33ce5ef0 100644
--- a/maven-model-builder/pom.xml
+++ b/maven-model-builder/pom.xml
@@ -75,7 +75,6 @@ under the License.
<dependency>
<groupId>com.google.inject</groupId>
<artifactId>guice</artifactId>
- <classifier>no_aop</classifier>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/maven-resolver-provider/pom.xml b/maven-resolver-provider/pom.xml
index 20dda36eef..4fa894a7ec 100644
--- a/maven-resolver-provider/pom.xml
+++ b/maven-resolver-provider/pom.xml
@@ -73,7 +73,6 @@ under the License.
<dependency>
<groupId>com.google.inject</groupId>
<artifactId>guice</artifactId>
- <classifier>no_aop</classifier>
<optional>true</optional>
<exclusions>
<exclusion>
diff --git a/pom.xml b/pom.xml
index b90e4847a5..6239fe6805 100644
--- a/pom.xml
+++ b/pom.xml
@@ -237,12 +237,6 @@ under the License.
<artifactId>guice</artifactId>
<version>${guiceVersion}</version>
</dependency>
- <dependency>
- <groupId>com.google.inject</groupId>
- <artifactId>guice</artifactId>
- <version>${guiceVersion}</version>
- <classifier>no_aop</classifier>
- </dependency>
<dependency>
<groupId>org.eclipse.sisu</groupId>
<artifactId>org.eclipse.sisu.plexus</artifactId>
diff --git a/src/site/xdoc/index.xml b/src/site/xdoc/index.xml
index 78c47fbacc..c6d71ee226 100644
--- a/src/site/xdoc/index.xml
+++ b/src/site/xdoc/index.xml
@@ -71,7 +71,7 @@ under the License.
<area shape="rect" coords="685,455,775,491" alt="plexus-utils" href="https://codehaus-plexus.github.io/plexus-utils" />
<area shape="rect" coords="542,167,783,502" alt="plexus" href="https://codehaus-plexus.github.io/" />
<area shape="rect" coords="401,393,509,524" alt="sisu" href="http://www.eclipse.org/projects/project_summary.php?projectid=technology.sisu" />
- <area shape="rect" coords="416,543,493,577" alt="guice" href="http://code.google.com/p/google-guice/" />
+ <area shape="rect" coords="416,543,493,577" alt="guice" href="https://github.com/google/guice" />
<area shape="rect" coords="550,543,673,577" alt="javax.inject" href="http://docs.oracle.com/javaee/6/api/javax/inject/package-summary.html" />
</map>
</p>
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services