Please use the latest version of guava 32.1.3.jre #31

eclipse-cdo · Nov 22, 2023 · 54631bc · 54631bc
1 parent be97997
commit 54631bc
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 75 deletions.
diff --git a/plugins/org.eclipse.emf.cdo.compare/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.compare/META-INF/MANIFEST.MF
@@ -14,8 +14,8 @@ Require-Bundle: org.eclipse.emf.cdo;bundle-version="[4.0.0,5.0.0)";visibility:=r
 Export-Package: org.eclipse.emf.cdo.compare;version="4.7.3",
  org.eclipse.emf.cdo.internal.compare.bundle;version="4.7.3";x-friends:="org.eclipse.emf.cdo.tests"
 Bundle-ActivationPolicy: lazy
-Import-Package: com.google.common.base;version="[27.0.0,30.2.0)",
- com.google.common.collect;version="[27.0.0,30.2.0)",
- com.google.common.cache;version="[27.0.0,30.2.0)",
- com.google.common.util.concurrent;version="[27.0.0,30.2.0)"
+Import-Package: com.google.common.base;version="[27.0.0,33.0.0)",
+ com.google.common.collect;version="[27.0.0,33.0.0)",
+ com.google.common.cache;version="[27.0.0,33.0.0)",
+ com.google.common.util.concurrent;version="[27.0.0,33.0.0)"
 Automatic-Module-Name: org.eclipse.emf.cdo.compare
diff --git a/plugins/org.eclipse.emf.cdo.ui.compare/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.ui.compare/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.emf.cdo.ui.compare;singleton:=true
-Bundle-Version: 4.7.2.qualifier
+Bundle-Version: 4.7.3.qualifier
 Bundle-Activator: org.eclipse.emf.cdo.ui.internal.compare.bundle.OM$Activator
 Bundle-Vendor: %providerName
 Bundle-ClassPath: .
@@ -17,11 +17,11 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
  org.eclipse.emf.compare.edit;bundle-version="[3.0.0,5.0.0)",
  org.eclipse.emf.compare.rcp.ui;bundle-version="[3.0.0,5.0.0)",
  org.eclipse.emf.compare.ide.ui;bundle-version="[3.0.0,5.0.0)"
-Import-Package: com.google.common.base;version="[27.0.0,30.2.0)",
- com.google.common.collect;version="[27.0.0,30.2.0)",
- com.google.common.cache;version="[27.0.0,30.2.0)",
- com.google.common.util.concurrent;version="[27.0.0,30.2.0)"
-Export-Package: org.eclipse.emf.cdo.ui.compare;version="4.7.2",
- org.eclipse.emf.cdo.ui.internal.compare;version="4.7.2";x-friends:="org.eclipse.emf.cdo.explorer.ui",
- org.eclipse.emf.cdo.ui.internal.compare.bundle;version="4.7.2";x-internal:=true
+Import-Package: com.google.common.base;version="[27.0.0,33.0.0)",
+ com.google.common.collect;version="[27.0.0,33.0.0)",
+ com.google.common.cache;version="[27.0.0,33.0.0)",
+ com.google.common.util.concurrent;version="[27.0.0,33.0.0)"
+Export-Package: org.eclipse.emf.cdo.ui.compare;version="4.7.3",
+ org.eclipse.emf.cdo.ui.internal.compare;version="4.7.3";x-friends:="org.eclipse.emf.cdo.explorer.ui",
+ org.eclipse.emf.cdo.ui.internal.compare.bundle;version="4.7.3";x-internal:=true
 Automatic-Module-Name: org.eclipse.emf.cdo.ui.compare
diff --git a/plugins/org.eclipse.emf.cdo.ui.compare/pom.xml b/plugins/org.eclipse.emf.cdo.ui.compare/pom.xml
@@ -25,7 +25,7 @@
 
   <groupId>org.eclipse.emf.cdo</groupId>
   <artifactId>org.eclipse.emf.cdo.ui.compare</artifactId>
-  <version>4.7.2-SNAPSHOT</version>
+  <version>4.7.3-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
 </project>
diff --git a/plugins/org.gastro.server.web/src-gen/templates/MenuCardTemplate.java b/plugins/org.gastro.server.web/src-gen/templates/MenuCardTemplate.java