diff options
| author | Igor Fedorenko | 2014-03-19 17:39:45 +0000 |
|---|---|---|
| committer | Igor Fedorenko | 2014-03-19 17:39:45 +0000 |
| commit | caf06736f62cf5c5b584de284a2f639416c1acf0 (patch) | |
| tree | ad2a8eb3374c95ec0744cfc134dc256099606605 | |
| parent | 85b51dee7e275799414182030f8e46cb5e7151a6 (diff) | |
| download | m2e-core-caf06736f62cf5c5b584de284a2f639416c1acf0.tar.gz m2e-core-caf06736f62cf5c5b584de284a2f639416c1acf0.tar.xz m2e-core-caf06736f62cf5c5b584de284a2f639416c1acf0.zip | |
430714 hid guava from m2e-maven-runtime
Change-Id: I963269452f3535df621f5bb5a063962f2d36fcf6
Signed-off-by: Igor Fedorenko <igor@ifedorenko.com>
| -rw-r--r-- | m2e-maven-runtime/org.eclipse.m2e.maven.runtime/pom.xml | 1 | ||||
| -rw-r--r-- | org.eclipse.m2e.core/META-INF/MANIFEST.MF | 3 | ||||
| -rw-r--r-- | org.eclipse.m2e.feature/feature.xml | 7 | ||||
| -rw-r--r-- | pom.xml | 7 |
4 files changed, 16 insertions, 2 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 8b11298a..e0b74c6e 100644 --- a/m2e-maven-runtime/org.eclipse.m2e.maven.runtime/pom.xml +++ b/m2e-maven-runtime/org.eclipse.m2e.maven.runtime/pom.xml @@ -148,7 +148,6 @@ org.sonatype.plexus.*, org.eclipse.aether.*, com.google.inject.*, - com.google.common.*, javax.inject.*, com.squareup.okhttp.*, io.tesla.*, diff --git a/org.eclipse.m2e.core/META-INF/MANIFEST.MF b/org.eclipse.m2e.core/META-INF/MANIFEST.MF index 90bb0b0a..fbd628c4 100644 --- a/org.eclipse.m2e.core/META-INF/MANIFEST.MF +++ b/org.eclipse.m2e.core/META-INF/MANIFEST.MF @@ -12,7 +12,8 @@ Require-Bundle: org.eclipse.m2e.maven.runtime;bundle-version="[1.5.0,1.6.0)", org.eclipse.m2e.archetype.common;bundle-version="[1.5.0,1.6.0)", org.eclipse.m2e.maven.indexer;bundle-version="[1.5.0,1.6.0)", - org.slf4j.api;bundle-version="1.6.2" + org.slf4j.api;bundle-version="1.6.2", + com.google.guava;bundle-version="[14.0.1,16.0.0)" Bundle-ActivationPolicy: lazy Bundle-ClassPath: . Bundle-RequiredExecutionEnvironment: JavaSE-1.6, diff --git a/org.eclipse.m2e.feature/feature.xml b/org.eclipse.m2e.feature/feature.xml index 54269180..74ee4e40 100644 --- a/org.eclipse.m2e.feature/feature.xml +++ b/org.eclipse.m2e.feature/feature.xml @@ -154,4 +154,11 @@ version="0.0.0" unpack="false"/> + <plugin + id="com.google.guava" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + </feature> @@ -66,6 +66,13 @@ <layout>p2</layout> <url>${eclipse-repo.url}</url> </repository> + <repository> + <!-- 430714 used to locate guava 15 --> + <!-- TODO remove when compatible guava version is available from ${eclipse-repo.url} --> + <id>orbit</id> + <layout>p2</layout> + <url>http://download.eclipse.org/tools/orbit/downloads/drops/S20140227085123/repository/</url> + </repository> </repositories> <pluginRepositories> |