Merge pull request #271 from eclipse/cd_orbit_update

fix broken deps in orbit
eclipse · Oct 13, 2023 · 62067fa · 62067fa
2 parents b4baf8a + 020f603
commit 62067fa
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 11 deletions.
diff --git a/maven/org.eclipse.emf.mwe2.parent/pom.xml b/maven/org.eclipse.emf.mwe2.parent/pom.xml
@@ -30,9 +30,9 @@
 		<maven-deploy-version>2.8.2</maven-deploy-version>
 		<maven-javadoc-version>3.4.1</maven-javadoc-version>
 		<commons-cli.version>1.5.0</commons-cli.version>
-		<guava.version>32.1.2-jre</guava.version>
+		<guava.version>32.1.3-jre</guava.version>
 		<google-inject.version>7.0.0</google-inject.version>
-		<log4j.version>1.2.24</log4j.version>
+		<log4j.version>1.2.25</log4j.version>
 		<commons-logging.version>1.1.3</commons-logging.version>
 		<cbi-plugins.version>1.3.5</cbi-plugins.version>
 

diff --git a/maven/org.eclipse.emf.mwe2.repository/category.xml b/maven/org.eclipse.emf.mwe2.repository/category.xml
@@ -6,8 +6,8 @@
    <feature id="org.eclipse.emf.mwe.sdk" version="0.0.0">
       <category name="mwe2lang"/>
    </feature>
-   <bundle id="com.google.guava" version="32.1.2.qualifier"/>
-   <bundle id="com.google.guava.source" version="32.1.2.qualifier"/>
+   <bundle id="com.google.guava" version="32.1.3.qualifier"/>
+   <bundle id="com.google.guava.source" version="32.1.3.qualifier"/>
    <bundle id="com.google.guava.failureaccess" version="1.0.1.qualifier"/>
    <bundle id="com.google.guava.failureaccess.source" version="1.0.1.qualifier"/>
    <bundle id="org.apache.commons.cli" version="1.5.0"/>

diff --git a/...we2.target/org.eclipse.emf.mwe2.target.nightly/org.eclipse.emf.mwe2.target.nightly.target b/...we2.target/org.eclipse.emf.mwe2.target.nightly/org.eclipse.emf.mwe2.target.nightly.target
@@ -25,12 +25,12 @@
 <repository location="https://download.eclipse.org/cbi/updates/license/"/>
 </location>
 <location includeAllPlatforms="false" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.apache.log4j" version="1.2.24.v20221221-2012"/>
+<unit id="org.apache.log4j" version="1.2.25"/>
 <unit id="org.junit" version="0.0.0"/>
 <unit id="org.apache.commons.cli" version="1.5.0"/>
 <unit id="org.apache.commons.cli.source" version="1.5.0"/>
-<unit id="com.google.guava" version="32.1.2.jre"/>
-<unit id="com.google.guava.source" version="32.1.2.jre"/>
+<unit id="com.google.guava" version="32.1.3.jre"/>
+<unit id="com.google.guava.source" version="32.1.3.jre"/>
 <unit id="com.google.guava.failureaccess" version="1.0.1"/>
 <unit id="com.google.guava.failureaccess.source" version="1.0.1"/>
 <repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2023-12"/>

diff --git a/...rg.eclipse.emf.mwe2.target/org.eclipse.emf.mwe2.target/org.eclipse.emf.mwe2.target.target b/...rg.eclipse.emf.mwe2.target/org.eclipse.emf.mwe2.target/org.eclipse.emf.mwe2.target.target
@@ -26,15 +26,15 @@
 <repository location="https://download.eclipse.org/cbi/updates/license/"/>
 </location>
 <location includeAllPlatforms="false" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.apache.log4j" version="1.2.24.v20221221-2012"/>
+<unit id="org.apache.log4j" version="1.2.25"/>
 <unit id="org.junit" version="0.0.0"/>
 <unit id="org.apache.commons.cli" version="1.5.0"/>
 <unit id="org.apache.commons.cli.source" version="1.5.0"/>
-<unit id="com.google.guava" version="32.1.2.jre"/>
-<unit id="com.google.guava.source" version="32.1.2.jre"/>
+<unit id="com.google.guava" version="32.1.3.jre"/>
+<unit id="com.google.guava.source" version="32.1.3.jre"/>
 <unit id="com.google.guava.failureaccess" version="1.0.1"/>
 <unit id="com.google.guava.failureaccess.source" version="1.0.1"/>
-<repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2023-09"/>
+<repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2023-12"/>
 </location>
 </locations>
 </target>