diff options
author | Jason van Zyl | 2013-09-29 03:07:01 +0000 |
---|---|---|
committer | Igor Fedorenko | 2013-10-06 19:08:22 +0000 |
commit | 85527e1eb1638654d8f33a7106900ef9d1158bc2 (patch) | |
tree | bb9427a78ab8b089f02085e84f33ffa90a8bfc09 /m2e-maven-runtime/org.eclipse.m2e.maven.runtime/pom.xml | |
parent | 51cad437f6dcaf9330cfe215038bcd6edc0ff368 (diff) | |
download | m2e-core-85527e1eb1638654d8f33a7106900ef9d1158bc2.tar.gz m2e-core-85527e1eb1638654d8f33a7106900ef9d1158bc2.tar.xz m2e-core-85527e1eb1638654d8f33a7106900ef9d1158bc2.zip |
416882 updated m2e maven runtime to maven 3.1.1
Signed-off-by: Igor Fedorenko <igor@ifedorenko.com>
Diffstat (limited to 'm2e-maven-runtime/org.eclipse.m2e.maven.runtime/pom.xml')
-rw-r--r-- | m2e-maven-runtime/org.eclipse.m2e.maven.runtime/pom.xml | 83 |
1 files changed, 17 insertions, 66 deletions
diff --git a/m2e-maven-runtime/org.eclipse.m2e.maven.runtime/pom.xml b/m2e-maven-runtime/org.eclipse.m2e.maven.runtime/pom.xml index 82e07f97..84c79d03 100644 --- a/m2e-maven-runtime/org.eclipse.m2e.maven.runtime/pom.xml +++ b/m2e-maven-runtime/org.eclipse.m2e.maven.runtime/pom.xml @@ -23,15 +23,8 @@ <properties> <!-- maven core version --> - <maven.version>3.0.4</maven.version> - - <!-- the following MUST match <maven.version/> above. I wish I could make scope=import do this for me --> - <sisu-guice.version>3.1.0</sisu-guice.version> - <sisu.version>2.3.0</sisu.version> - <aether.version>1.13.1</aether.version> - - <guava.version>11.0.2</guava.version> - + <maven.version>3.1.1</maven.version> + <guava.version>14.0.1</guava.version> <!-- below are m2e-specific addons --> <plexus-build-api.version>0.0.7</plexus-build-api.version> <wagon-ahc.version>1.2.1</wagon-ahc.version> @@ -41,59 +34,27 @@ <dependency> <groupId>org.apache.maven</groupId> <artifactId>maven-core</artifactId> - <exclusions> - <exclusion> - <!-- exclude aggregate OSGi bundle --> - <artifactId>sisu-inject-plexus</artifactId> - <groupId>org.sonatype.sisu</groupId> - </exclusion> - </exclusions> + <optional>true</optional> </dependency> <dependency> <groupId>org.apache.maven</groupId> <artifactId>maven-embedder</artifactId> - <exclusions> - <exclusion> - <artifactId>sisu-inject-plexus</artifactId> - <groupId>org.sonatype.sisu</groupId> - </exclusion> - </exclusions> + <optional>true</optional> </dependency> <dependency> <groupId>org.apache.maven</groupId> <artifactId>maven-compat</artifactId> - <exclusions> - <exclusion> - <artifactId>sisu-inject-plexus</artifactId> - <groupId>org.sonatype.sisu</groupId> - </exclusion> - </exclusions> + <optional>true</optional> </dependency> <dependency> - <groupId>org.sonatype.sisu.inject</groupId> - <artifactId>guice-plexus-shim</artifactId> - <version>${sisu.version}</version> + <groupId>org.eclipse.sisu</groupId> + <artifactId>org.eclipse.sisu.plexus</artifactId> <optional>true</optional> - <exclusions> - <exclusion> - <groupId>org.sonatype.sisu</groupId> - <artifactId>sisu-guice</artifactId> - </exclusion> - <exclusion> - <artifactId>jsr250-api</artifactId> - <groupId>javax.annotation</groupId> - </exclusion> - <exclusion> - <artifactId>cdi-api</artifactId> - <groupId>javax.enterprise</groupId> - </exclusion> - </exclusions> </dependency> <dependency> <groupId>org.sonatype.sisu</groupId> <artifactId>sisu-guice</artifactId> - <version>${sisu-guice.version}</version> <classifier>no_aop</classifier> <optional>true</optional> <exclusions> @@ -110,6 +71,7 @@ <exclusions> <exclusion> <!-- as of version 1.3.9 includes LGPL'ed sources, can't ship with an EPL project --> + <!-- http://dev.eclipse.org/ipzilla/show_bug.cgi?id=7302 --> <groupId>com.google.code.findbugs</groupId> <artifactId>jsr305</artifactId> </exclusion> @@ -124,7 +86,13 @@ </dependency> <dependency> - <groupId>org.sonatype.aether</groupId> + <groupId>org.eclipse.aether</groupId> + <artifactId>aether-impl</artifactId> + <optional>true</optional> + </dependency> + + <dependency> + <groupId>org.eclipse.aether</groupId> <artifactId>aether-connector-wagon</artifactId> <exclusions> <exclusion> @@ -139,29 +107,11 @@ <optional>true</optional> </dependency> <dependency> - <groupId>org.sonatype.aether</groupId> - <artifactId>aether-impl</artifactId> - <optional>true</optional> - </dependency> - <dependency> - <groupId>org.sonatype.aether</groupId> - <artifactId>aether-connector-asynchttpclient</artifactId> - <version>${aether.version}</version> - <optional>true</optional> - <exclusions> - <exclusion> - <groupId>com.ning</groupId> - <artifactId>async-http-client</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> <groupId>org.sonatype.maven</groupId> <artifactId>wagon-ahc</artifactId> <version>${wagon-ahc.version}</version> <optional>true</optional> </dependency> - <dependency> <groupId>org.apache.maven.wagon</groupId> <artifactId>wagon-file</artifactId> @@ -195,10 +145,11 @@ <_exportcontents> META-INF.plexus;-noimport:=true, + META-INF.sisu;-noimport:=true, org.apache.maven.*, org.codehaus.plexus.*, org.sonatype.plexus.*, - org.sonatype.aether.*, + org.eclipse.aether.*, com.google.inject.*, com.google.common.*, javax.inject.*, |