Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTony Homer2019-05-21 15:17:22 -0400
committerTony Homer2019-05-29 17:46:35 -0400
commit4d035915ec778e497e51b056e199cba9fe8bac12 (patch)
tree43045886986bee6cb78f1840af0bbabe53751762
parent2fb483e104fcfdd42144ad5c6e7c253471741128 (diff)
downloadm2e-core-4d035915ec778e497e51b056e199cba9fe8bac12.tar.gz
m2e-core-4d035915ec778e497e51b056e199cba9fe8bac12.tar.xz
m2e-core-4d035915ec778e497e51b056e199cba9fe8bac12.zip
Bug 547338 - Update to guava 24.1.1+
fix CVE-2018-10237 added Orbit 2019-06 M3 repo CQ: 19822 Change-Id: I85cc8cd8f37c9abb7914ec2a5e42d5ae034c74a9 Signed-off-by: Tony Homer <tony.homer@intel.com>
-rw-r--r--org.eclipse.m2e.core/META-INF/MANIFEST.MF2
-rw-r--r--org.eclipse.m2e.editor.xml/META-INF/MANIFEST.MF2
-rw-r--r--org.eclipse.m2e.sourcelookup/META-INF/MANIFEST.MF2
-rw-r--r--pom.xml5
4 files changed, 8 insertions, 3 deletions
diff --git a/org.eclipse.m2e.core/META-INF/MANIFEST.MF b/org.eclipse.m2e.core/META-INF/MANIFEST.MF
index 5cc20d05..efbe0d23 100644
--- a/org.eclipse.m2e.core/META-INF/MANIFEST.MF
+++ b/org.eclipse.m2e.core/META-INF/MANIFEST.MF
@@ -13,7 +13,7 @@ Require-Bundle: org.eclipse.osgi;bundle-version="3.10.0",
org.eclipse.m2e.workspace.cli;bundle-version="0.1.0",
org.eclipse.core.runtime;bundle-version="3.12.0",
org.eclipse.core.resources;bundle-version="3.9.0",
- com.google.guava;bundle-version="[21.0,22.0)"
+ com.google.guava;bundle-version="[27.1,28.0)"
Bundle-ActivationPolicy: lazy
Bundle-ClassPath: .
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/org.eclipse.m2e.editor.xml/META-INF/MANIFEST.MF b/org.eclipse.m2e.editor.xml/META-INF/MANIFEST.MF
index 061ca29a..70619082 100644
--- a/org.eclipse.m2e.editor.xml/META-INF/MANIFEST.MF
+++ b/org.eclipse.m2e.editor.xml/META-INF/MANIFEST.MF
@@ -22,7 +22,7 @@ Require-Bundle: org.eclipse.core.runtime,
org.eclipse.ui.ide,
org.eclipse.core.filesystem,
org.eclipse.ui.forms,
- com.google.guava;bundle-version="[21.0,22.0)"
+ com.google.guava;bundle-version="[27.1,28.0)"
Export-Package: org.eclipse.m2e.editor.xml;x-internal:=true,
org.eclipse.m2e.editor.xml.internal;x-internal:=true,
org.eclipse.m2e.editor.xml.internal.lifecycle;x-internal:=true,
diff --git a/org.eclipse.m2e.sourcelookup/META-INF/MANIFEST.MF b/org.eclipse.m2e.sourcelookup/META-INF/MANIFEST.MF
index 9e9a28e0..899f4e7d 100644
--- a/org.eclipse.m2e.sourcelookup/META-INF/MANIFEST.MF
+++ b/org.eclipse.m2e.sourcelookup/META-INF/MANIFEST.MF
@@ -15,7 +15,7 @@ Require-Bundle: org.eclipse.m2e.launching;bundle-version="[1.12.0,1.13.0)",
org.eclipse.core.expressions;bundle-version="3.4.400",
org.eclipse.debug.ui;bundle-version="3.10.0",
org.eclipse.core.resources,
- com.google.guava;bundle-version="15.0.0",
+ com.google.guava;bundle-version="[27.1,28.0)",
com.google.gson;bundle-version="2.2.4",
org.eclipse.core.variables;bundle-version="3.2.0"
Import-Package: org.slf4j;version="1.6.2"
diff --git a/pom.xml b/pom.xml
index fc6c8aec..54b228ca 100644
--- a/pom.xml
+++ b/pom.xml
@@ -78,6 +78,11 @@
<layout>p2</layout>
<url>http://download.eclipse.org/cbi/updates/license</url>
</repository>
+ <repository>
+ <id>Orbit 2019-06 M3</id>
+ <layout>p2</layout>
+ <url>https://download.eclipse.org/tools/orbit/downloads/drops/S20190521195709/repository/</url>
+ </repository>
</repositories>
<pluginRepositories>

Back to the top