Skip to content

Commit

Permalink
Merge pull request #2820 from eclipse/cd_orbit_bumps
Browse files Browse the repository at this point in the history
Fix antlr,classgraph,log4j and guava versions
  • Loading branch information
cdietrich authored Oct 14, 2023
2 parents cff18b4 + e4c9f89 commit 7abb4eb
Show file tree
Hide file tree
Showing 26 changed files with 74 additions and 74 deletions.
8 changes: 4 additions & 4 deletions NOTICE.md
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ Apache Commons Lang (2.4)
* License: Apache License, 2.0


Apache Log4j (1.2.17)
Apache Log4j / Reload4j (1.2.25)

* License: Apache License 2.0

Expand All @@ -60,7 +60,7 @@ ASM (9.4)

* License: BSD-3-Clause

classgraph (4.8.149)
classgraph (4.8.162)

* License: MIT
* Project: https://github.com/classgraph/classgraph
Expand All @@ -70,7 +70,7 @@ Google Gson (2.9.x)

* License: Apache License, 2.0

Google Guava (32.1.2)
Google Guava (32.1.3)

* License: Apache License 2.0

Expand All @@ -82,7 +82,7 @@ Gradle Wrapper (8)

* License: Apache License, 2.0

guava gwt (32.1.2)
guava gwt (32.1.3)

* License: Apache License, 2.0

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
<!-- pathref 'xtend.deps' will be modified programmmaticaly, when tests are started-->
<path id="xtend.deps">
<fileset dir="${deps.dir}">
<include name="org.apache.log4j*.jar" />
<include name="reload4j*.jar" />
<include name="org.eclipse.emf.ecore*.jar" />
<include name="org.eclipse.emf.ecore*.jar" />
<include name="org.eclipse.emf.common*.jar" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>32.1.2-jre</version>
<version>32.1.3-jre</version>
</dependency>
<dependency>
<groupId>org.eclipse.xtext</groupId>
Expand Down
4 changes: 2 additions & 2 deletions org.eclipse.xtend.sdk.feature/feature.xml
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@ SPDX-License-Identifier: EPL-2.0
<requires>
<import feature="org.eclipse.xtext.ui" version="2.33.0" match="equivalent"/>
<import feature="org.eclipse.xtext.xbase.lib" version="2.33.0" match="equivalent"/>
<import plugin="com.google.guava" version="32.1.2" match="compatible"/>
<import plugin="io.github.classgraph" version="4.8.149" match="compatible"/>
<import plugin="com.google.guava" version="32.1.3" match="compatible"/>
<import plugin="io.github.classgraph.classgraph" version="4.8.62" match="compatible"/>
<import plugin="org.apache.log4j" version="1.2.24" match="equivalent"/>
</requires>

Expand Down
2 changes: 1 addition & 1 deletion org.eclipse.xtext.common.types/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ Require-Bundle:
org.objectweb.asm;bundle-version="[9.5.0,9.6.0)",
org.eclipse.xtend.lib,
com.google.guava;bundle-version="[32.1.2,33.0.0)",
io.github.classgraph;bundle-version="4.8.149"
io.github.classgraph.classgraph;bundle-version="4.8.162"
Import-Package: org.apache.commons.logging;version="1.0.4";resolution:=optional,
org.apache.log4j;version="1.2.24"
Bundle-RequiredExecutionEnvironment: JavaSE-11
Expand Down
10 changes: 5 additions & 5 deletions org.eclipse.xtext.dev-bom/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -152,17 +152,17 @@
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava-gwt</artifactId>
<version>32.1.2-jre</version>
<version>32.1.3-jre</version>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava-testlib</artifactId>
<version>32.1.2-jre</version>
<version>32.1.3-jre</version>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>32.1.2-jre</version>
<version>32.1.3-jre</version>
</dependency>
<dependency>
<groupId>com.google.inject</groupId>
Expand All @@ -177,7 +177,7 @@
<dependency>
<groupId>io.github.classgraph</groupId>
<artifactId>classgraph</artifactId>
<version>4.8.149</version>
<version>4.8.162</version>
</dependency>
<dependency>
<groupId>javax.annotation</groupId>
Expand All @@ -197,7 +197,7 @@
<dependency>
<groupId>ch.qos.reload4j</groupId>
<artifactId>reload4j</artifactId>
<version>1.2.24</version>
<version>1.2.25</version>
</dependency>
<dependency>
<groupId>org.antlr</groupId>
Expand Down
12 changes: 6 additions & 6 deletions org.eclipse.xtext.p2repository/category.xml
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
<category name="Xtext"/>
</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="com.google.inject" version="7.0.0.qualifier"/>
Expand All @@ -20,8 +20,8 @@
<bundle id="jakarta.inject.jakarta.inject-api.source" version="2.0.1.qualifier"/>
<bundle id="org.antlr.runtime" version="3.2.0.qualifier"/>
<bundle id="org.antlr.runtime.source" version="3.2.0.qualifier"/>
<bundle id="org.apache.log4j" version="1.2.24.qualifier"/>
<bundle id="org.apache.log4j.source" version="1.2.24.qualifier"/>
<bundle id="org.apache.log4j" version="1.2.25.qualifier"/>
<bundle id="org.apache.log4j.source" version="1.2.25.qualifier"/>
<bundle id="org.aopalliance" version="1.0.0.qualifier"/>
<bundle id="org.aopalliance.source" version="1.0.0.qualifier"/>
<bundle id="org.junit" version="4.13.2.qualifier"/>
Expand All @@ -34,8 +34,8 @@
<bundle id="org.kohsuke.args4j.source" version="0.0.0"/>
<bundle id="org.objectweb.asm" version="9.5.0.qualifier"/>
<bundle id="org.objectweb.asm.source" version="9.5.0.qualifier"/>
<bundle id="io.github.classgraph" version="4.8.149.qualifier"/>
<bundle id="io.github.classgraph.source" version="4.8.149.qualifier"/>
<bundle id="io.github.classgraph.classgraph" version="4.8.162.qualifier"/>
<bundle id="io.github.classgraph.classgraph.source" version="4.8.162.qualifier"/>

<category-def name="Xtext" label="Xtext" />
</site>
4 changes: 2 additions & 2 deletions org.eclipse.xtext.redist.feature/feature.xml
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,11 @@ SPDX-License-Identifier: EPL-2.0
version="0.0.0"/>

<requires>
<import plugin="com.google.guava" version="32.1.2" match="compatible"/>
<import plugin="com.google.guava" version="32.1.3" match="compatible"/>
<import plugin="com.google.inject" version="7.0.0" match="compatible"/>
<import plugin="org.apache.log4j" version="1.2.24" match="equivalent"/>
<import plugin="org.objectweb.asm" version="9.5.0" match="compatible"/>
<import plugin="io.github.classgraph" version="4.8.149" match="compatible"/>
<import plugin="io.github.classgraph.classgraph" version="4.8.162" match="compatible"/>
</requires>

<plugin
Expand Down
4 changes: 2 additions & 2 deletions org.eclipse.xtext.runtime.feature/feature.xml
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,11 @@ SPDX-License-Identifier: EPL-2.0
%license
</license>
<requires>
<import plugin="com.google.guava" version="32.1.2" match="compatible"/>
<import plugin="com.google.guava" version="32.1.3" match="compatible"/>
<import plugin="com.google.inject" version="7.0.0" match="compatible"/>
<import plugin="org.apache.log4j" version="1.2.24" match="equivalent"/>
<import plugin="org.objectweb.asm" version="9.5.0" match="compatible"/>
<import plugin="io.github.classgraph" version="4.8.149" match="compatible"/>
<import plugin="io.github.classgraph.classgraph" version="4.8.162" match="compatible"/>
</requires>

<plugin
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,12 @@
<unit id="com.google.gson" version="2.10.1"/>
<unit id="com.google.inject" version="7.0.0"/>
<unit id="jakarta.inject.jakarta.inject-api" version="2.0.1"/>
<unit id="org.antlr.runtime" version="3.2.0.v20220404-1927"/>
<unit id="org.antlr.runtime" version="3.2.0.v20230929-1400"/>
<unit id="org.junit" version="4.13.2.v20230809-1000"/>
<unit id="org.hamcrest" version="2.2.0"/>
<unit id="org.hamcrest.core" version="2.2.0.v20230809-1000"/>
<unit id="org.objectweb.asm" version="9.5.0"/>
<unit id="io.github.classgraph" version="4.8.149.v20220915-0556"/>
<unit id="io.github.classgraph.classgraph" version="4.8.162"/>
<repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2023-12"/>
</location>
</locations>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,12 @@
<unit id="com.google.gson" version="2.10.1"/>
<unit id="com.google.inject" version="7.0.0"/>
<unit id="jakarta.inject.jakarta.inject-api" version="2.0.1"/>
<unit id="org.antlr.runtime" version="3.2.0.v20220404-1927"/>
<unit id="org.antlr.runtime" version="3.2.0.v20230929-1400"/>
<unit id="org.junit" version="4.13.2.v20230809-1000"/>
<unit id="org.hamcrest" version="2.2.0"/>
<unit id="org.hamcrest.core" version="2.2.0.v20230809-1000"/>
<unit id="org.objectweb.asm" version="9.5.0"/>
<unit id="io.github.classgraph" version="4.8.149.v20220915-0556"/>
<unit id="io.github.classgraph.classgraph" version="4.8.162"/>
<repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2023-12"/>
</location>
</locations>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,12 @@
<unit id="com.google.gson" version="2.10.1"/>
<unit id="com.google.inject" version="7.0.0"/>
<unit id="jakarta.inject.jakarta.inject-api" version="2.0.1"/>
<unit id="org.antlr.runtime" version="3.2.0.v20220404-1927"/>
<unit id="org.antlr.runtime" version="3.2.0.v20230929-1400"/>
<unit id="org.junit" version="4.13.2.v20230809-1000"/>
<unit id="org.hamcrest" version="2.2.0"/>
<unit id="org.hamcrest.core" version="2.2.0.v20230809-1000"/>
<unit id="org.objectweb.asm" version="9.5.0"/>
<unit id="io.github.classgraph" version="4.8.149.v20220915-0556"/>
<unit id="io.github.classgraph.classgraph" version="4.8.162"/>
<repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2023-12"/>
</location>
</locations>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,12 @@
<unit id="com.google.gson" version="2.10.1"/>
<unit id="com.google.inject" version="7.0.0"/>
<unit id="jakarta.inject.jakarta.inject-api" version="2.0.1"/>
<unit id="org.antlr.runtime" version="3.2.0.v20220404-1927"/>
<unit id="org.antlr.runtime" version="3.2.0.v20230929-1400"/>
<unit id="org.junit" version="4.13.2.v20230809-1000"/>
<unit id="org.hamcrest" version="2.2.0"/>
<unit id="org.hamcrest.core" version="2.2.0.v20230809-1000"/>
<unit id="org.objectweb.asm" version="9.5.0"/>
<unit id="io.github.classgraph" version="4.8.149.v20220915-0556"/>
<unit id="io.github.classgraph.classgraph" version="4.8.162"/>
<repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2023-12"/>
</location>
</locations>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<unit id="com.google.gson" version="2.10.1"/>
<unit id="com.google.inject" version="7.0.0"/>
<unit id="jakarta.inject.jakarta.inject-api" version="2.0.1"/>
<unit id="org.antlr.runtime" version="3.2.0.v20220404-1927"/>
<unit id="org.antlr.runtime" version="3.2.0.v20230929-1400"/>
<unit id="org.junit" version="4.13.2.v20230809-1000"/>
<unit id="org.hamcrest" version="2.2.0"/>
<unit id="org.hamcrest.core" version="2.2.0.v20230809-1000"/>
Expand All @@ -39,7 +39,7 @@
<unit id="junit-vintage-engine" version="0.0.0"/>
<unit id="org.opentest4j" version="0.0.0"/>
<unit id="org.objectweb.asm" version="9.5.0"/>
<unit id="io.github.classgraph" version="4.8.149.v20220915-0556"/>
<unit id="io.github.classgraph.classgraph" version="4.8.162"/>
<repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2023-12"/>
</location>
</locations>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,12 @@
<unit id="com.google.gson" version="2.10.1"/>
<unit id="com.google.inject" version="7.0.0"/>
<unit id="jakarta.inject.jakarta.inject-api" version="2.0.1"/>
<unit id="org.antlr.runtime" version="3.2.0.v20220404-1927"/>
<unit id="org.antlr.runtime" version="3.2.0.v20230929-1400"/>
<unit id="org.junit" version="4.13.2.v20230809-1000"/>
<unit id="org.hamcrest" version="2.2.0"/>
<unit id="org.hamcrest.core" version="2.2.0.v20230809-1000"/>
<unit id="org.objectweb.asm" version="9.5.0"/>
<unit id="io.github.classgraph" version="4.8.149.v20220915-0556"/>
<unit id="io.github.classgraph.classgraph" version="4.8.162"/>
<repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2023-12"/>
</location>
</locations>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,12 @@
<unit id="com.google.gson" version="2.10.1"/>
<unit id="com.google.inject" version="7.0.0"/>
<unit id="jakarta.inject.jakarta.inject-api" version="2.0.1"/>
<unit id="org.antlr.runtime" version="3.2.0.v20220404-1927"/>
<unit id="org.antlr.runtime" version="3.2.0.v20230929-1400"/>
<unit id="org.junit" version="4.13.2.v20230809-1000"/>
<unit id="org.hamcrest" version="2.2.0"/>
<unit id="org.hamcrest.core" version="2.2.0.v20230809-1000"/>
<unit id="org.objectweb.asm" version="9.5.0"/>
<unit id="io.github.classgraph" version="4.8.149.v20220915-0556"/>
<unit id="io.github.classgraph.classgraph" version="4.8.162"/>
<repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2023-12"/>
</location>
</locations>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ class TargetPlatformProject extends ProjectDescriptor {
<unit id="com.google.gson" version="2.10.1"/>
<unit id="com.google.inject" version="7.0.0"/>
<unit id="jakarta.inject.jakarta.inject-api" version="2.0.1"/>
<unit id="org.antlr.runtime" version="3.2.0.v20220404-1927"/>
<unit id="org.antlr.runtime" version="3.2.0.v20230929-1400"/>
<unit id="org.junit" version="4.13.2.v20230809-1000"/>
<unit id="org.hamcrest" version="2.2.0"/>
<unit id="org.hamcrest.core" version="2.2.0.v20230809-1000"/>
Expand All @@ -108,7 +108,7 @@ class TargetPlatformProject extends ProjectDescriptor {
<unit id="org.opentest4j" version="0.0.0"/>
«ENDIF»
<unit id="org.objectweb.asm" version="9.5.0"/>
<unit id="io.github.classgraph" version="4.8.149.v20220915-0556"/>
<unit id="io.github.classgraph.classgraph" version="4.8.162"/>
<repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2023-12"/>
</location>
</locations>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -194,7 +194,7 @@ public CharSequence target() {
_builder.append("<unit id=\"jakarta.inject.jakarta.inject-api\" version=\"2.0.1\"/>");
_builder.newLine();
_builder.append("\t\t\t");
_builder.append("<unit id=\"org.antlr.runtime\" version=\"3.2.0.v20220404-1927\"/>");
_builder.append("<unit id=\"org.antlr.runtime\" version=\"3.2.0.v20230929-1400\"/>");
_builder.newLine();
_builder.append("\t\t\t");
_builder.append("<unit id=\"org.junit\" version=\"4.13.2.v20230809-1000\"/>");
Expand Down Expand Up @@ -251,7 +251,7 @@ public CharSequence target() {
_builder.append("<unit id=\"org.objectweb.asm\" version=\"9.5.0\"/>");
_builder.newLine();
_builder.append("\t\t\t");
_builder.append("<unit id=\"io.github.classgraph\" version=\"4.8.149.v20220915-0556\"/>");
_builder.append("<unit id=\"io.github.classgraph.classgraph\" version=\"4.8.162\"/>");
_builder.newLine();
_builder.append("\t\t\t");
_builder.append("<repository location=\"https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2023-12\"/>");
Expand Down
8 changes: 4 additions & 4 deletions xtext-latest.target
Original file line number Diff line number Diff line change
Expand Up @@ -43,19 +43,19 @@
</location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
<repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2023-12"/>
<unit id="org.apache.log4j" version="1.2.24.v20221221-2012"/>
<unit id="org.apache.log4j" version="1.2.25"/>
<unit id="org.kohsuke.args4j" version="0.0.0"/>
<unit id="com.google.gson" version="2.10.1"/>
<unit id="com.google.guava" version="32.1.2.jre"/>
<unit id="com.google.guava" version="32.1.3.jre"/>
<unit id="com.google.guava.failureaccess" version="1.0.1"/>
<unit id="com.google.inject" version="7.0.0"/>
<unit id="jakarta.inject.jakarta.inject-api" version="2.0.1"/>
<unit id="org.antlr.runtime" version="3.2.0.v20220404-1927"/>
<unit id="org.antlr.runtime" version="3.2.0.v20230929-1400"/>
<unit id="org.aopalliance" version="1.0.0.v20230720-0728"/>
<unit id="org.opentest4j" version="0.0.0"/>
<unit id="org.apiguardian.api" version="0.0.0"/>
<unit id="org.objectweb.asm" version="9.5.0"/>
<unit id="io.github.classgraph" version="4.8.149.v20220915-0556"/>
<unit id="io.github.classgraph.classgraph" version="4.8.162"/>
<unit id="slf4j.api" version="0.0.0"/>
<unit id="slf4j.simple" version="0.0.0"/>
<unit id="org.junit" version="4.13.2.v20230809-1000"/>
Expand Down
8 changes: 4 additions & 4 deletions xtext-r202203.target
Original file line number Diff line number Diff line change
Expand Up @@ -46,18 +46,18 @@
</location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
<repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2023-12"/>
<unit id="org.apache.log4j" version="1.2.24.v20221221-2012"/>
<unit id="org.apache.log4j" version="1.2.25"/>
<unit id="org.kohsuke.args4j" version="0.0.0"/>
<unit id="com.google.gson" version="2.10.1"/>
<unit id="com.google.guava" version="32.1.2.jre"/>
<unit id="com.google.guava" version="32.1.3.jre"/>
<unit id="com.google.guava.failureaccess" version="1.0.1"/>
<unit id="com.google.inject" version="7.0.0"/>
<unit id="jakarta.inject.jakarta.inject-api" version="2.0.1"/>
<unit id="org.antlr.runtime" version="3.2.0.v20220404-1927"/>
<unit id="org.antlr.runtime" version="3.2.0.v20230929-1400"/>
<unit id="org.aopalliance" version="1.0.0.v20230720-0728"/>
<unit id="org.opentest4j" version="0.0.0"/>
<unit id="org.objectweb.asm" version="9.5.0"/>
<unit id="io.github.classgraph" version="4.8.149.v20220915-0556"/>
<unit id="io.github.classgraph.classgraph" version="4.8.162"/>
<unit id="slf4j.api" version="0.0.0"/>
<unit id="slf4j.simple" version="0.0.0"/>
<unit id="org.junit" version="4.13.2.v20230809-1000"/>
Expand Down
8 changes: 4 additions & 4 deletions xtext-r202206.target
Original file line number Diff line number Diff line change
Expand Up @@ -45,18 +45,18 @@
</location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
<repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2023-12"/>
<unit id="org.apache.log4j" version="1.2.24.v20221221-2012"/>
<unit id="org.apache.log4j" version="1.2.25"/>
<unit id="org.kohsuke.args4j" version="0.0.0"/>
<unit id="com.google.gson" version="2.10.1"/>
<unit id="com.google.guava" version="32.1.2.jre"/>
<unit id="com.google.guava" version="32.1.3.jre"/>
<unit id="com.google.guava.failureaccess" version="1.0.1"/>
<unit id="com.google.inject" version="7.0.0"/>
<unit id="jakarta.inject.jakarta.inject-api" version="2.0.1"/>
<unit id="org.antlr.runtime" version="3.2.0.v20220404-1927"/>
<unit id="org.antlr.runtime" version="3.2.0.v20230929-1400"/>
<unit id="org.aopalliance" version="1.0.0.v20230720-0728"/>
<unit id="org.opentest4j" version="0.0.0"/>
<unit id="org.objectweb.asm" version="9.5.0"/>
<unit id="io.github.classgraph" version="4.8.149.v20220915-0556"/>
<unit id="io.github.classgraph.classgraph" version="4.8.162"/>
<unit id="slf4j.api" version="0.0.0"/>
<unit id="slf4j.simple" version="0.0.0"/>
<unit id="org.junit" version="4.13.2.v20230809-1000"/>
Expand Down
Loading

0 comments on commit 7abb4eb

Please sign in to comment.