Skip to content

Commit

Permalink
Merge pull request eclipse-xtext#3137 from HannesWell/migrate-to-comm…
Browse files Browse the repository at this point in the history
…ons-logging-1.3

Migrate to latest commons-logging (currently 1.3.3)
  • Loading branch information
cdietrich authored Aug 11, 2024
2 parents 2737b36 + 5eef4f7 commit 7e5bfc8
Show file tree
Hide file tree
Showing 43 changed files with 42 additions and 42 deletions.
2 changes: 1 addition & 1 deletion org.eclipse.xtext.ide.tests/build.properties
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@ source.. = src-gen,\
testlang-src-gen
src.includes = about.html
additional.bundles = org.eclipse.emf.mwe2.launch,\
org.apache.commons.logging
org.apache.commons.commons-logging
2 changes: 1 addition & 1 deletion org.eclipse.xtext.purexbase/build.properties
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ additional.bundles = org.eclipse.xtext.xbase,\
org.eclipse.emf.mwe2.launch,\
org.eclipse.emf.mwe2.lib,\
org.objectweb.asm,\
org.apache.commons.logging,\
org.apache.commons.commons-logging,\
org.apache.log4j


2 changes: 1 addition & 1 deletion org.eclipse.xtext.testlanguages/build.properties
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,4 @@ src.includes = about.html
additional.bundles = org.eclipse.emf.mwe.utils,\
org.eclipse.emf.mwe2.launch,\
org.eclipse.emf.mwe2.lib,\
org.apache.commons.logging
org.apache.commons.commons-logging
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,5 @@ additional.bundles = org.eclipse.xtext.xbase,\
org.eclipse.emf.mwe2.launch,\
org.eclipse.emf.mwe2.lib,\
org.objectweb.asm,\
org.apache.commons.logging,\
org.apache.commons.commons-logging,\
org.apache.log4j
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,5 @@ additional.bundles = org.eclipse.xtext.xbase,\
org.eclipse.emf.mwe2.launch,\
org.eclipse.emf.mwe2.lib,\
org.objectweb.asm,\
org.apache.commons.logging,\
org.apache.commons.commons-logging,\
org.apache.log4j
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
<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.apache.commons.logging" version="1.2.0"/>
<unit id="org.apache.commons.commons-logging" version="0.0.0"/>
<unit id="org.objectweb.asm" version="9.7.0"/>
<unit id="io.github.classgraph.classgraph" version="4.8.174"/>
<repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2024-09"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,5 @@ additional.bundles = org.eclipse.xtext.xbase,\
org.eclipse.emf.mwe2.launch,\
org.eclipse.emf.mwe2.lib,\
org.objectweb.asm,\
org.apache.commons.logging,\
org.apache.commons.commons-logging,\
org.apache.log4j
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
<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.apache.commons.logging" version="1.2.0"/>
<unit id="org.apache.commons.commons-logging" version="0.0.0"/>
<unit id="org.objectweb.asm" version="9.7.0"/>
<unit id="io.github.classgraph.classgraph" version="4.8.174"/>
<repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2024-09"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,5 @@ additional.bundles = org.eclipse.xtext.xbase,\
org.eclipse.emf.mwe2.launch,\
org.eclipse.emf.mwe2.lib,\
org.objectweb.asm,\
org.apache.commons.logging,\
org.apache.commons.commons-logging,\
org.apache.log4j
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
<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.apache.commons.logging" version="1.2.0"/>
<unit id="org.apache.commons.commons-logging" version="0.0.0"/>
<unit id="org.objectweb.asm" version="9.7.0"/>
<unit id="io.github.classgraph.classgraph" version="4.8.174"/>
<repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2024-09"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,5 @@ additional.bundles = org.eclipse.xtext.xbase,\
org.eclipse.emf.mwe2.launch,\
org.eclipse.emf.mwe2.lib,\
org.objectweb.asm,\
org.apache.commons.logging,\
org.apache.commons.commons-logging,\
org.apache.log4j
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
<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.apache.commons.logging" version="1.2.0"/>
<unit id="org.apache.commons.commons-logging" version="0.0.0"/>
<unit id="org.objectweb.asm" version="9.7.0"/>
<unit id="io.github.classgraph.classgraph" version="4.8.174"/>
<repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2024-09"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,5 @@ additional.bundles = org.eclipse.xtext.xbase,\
org.eclipse.emf.mwe2.launch,\
org.eclipse.emf.mwe2.lib,\
org.objectweb.asm,\
org.apache.commons.logging,\
org.apache.commons.commons-logging,\
org.apache.log4j
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
<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.apache.commons.logging" version="1.2.0"/>
<unit id="org.apache.commons.commons-logging" version="0.0.0"/>
<unit id="org.apiguardian.api" version="0.0.0"/>
<unit id="junit-jupiter-api" version="0.0.0"/>
<unit id="junit-jupiter-engine" version="0.0.0"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,5 @@ additional.bundles = org.eclipse.xtext.xbase,\
org.eclipse.emf.mwe2.launch,\
org.eclipse.emf.mwe2.lib,\
org.objectweb.asm,\
org.apache.commons.logging,\
org.apache.commons.commons-logging,\
org.apache.log4j
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
<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.apache.commons.logging" version="1.2.0"/>
<unit id="org.apache.commons.commons-logging" version="0.0.0"/>
<unit id="org.objectweb.asm" version="9.7.0"/>
<unit id="io.github.classgraph.classgraph" version="4.8.174"/>
<repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2024-09"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,5 @@ additional.bundles = org.eclipse.xtext.xbase,\
org.eclipse.emf.mwe2.launch,\
org.eclipse.emf.mwe2.lib,\
org.objectweb.asm,\
org.apache.commons.logging,\
org.apache.commons.commons-logging,\
org.apache.log4j
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
<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.apache.commons.logging" version="1.2.0"/>
<unit id="org.apache.commons.commons-logging" version="0.0.0"/>
<unit id="org.objectweb.asm" version="9.7.0"/>
<unit id="io.github.classgraph.classgraph" version="4.8.174"/>
<repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2024-09"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,5 @@ additional.bundles = org.eclipse.xtext.xbase,\
org.eclipse.emf.mwe2.launch,\
org.eclipse.emf.mwe2.lib,\
org.objectweb.asm,\
org.apache.commons.logging,\
org.apache.commons.commons-logging,\
org.apache.log4j
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
<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.apache.commons.logging" version="1.2.0"/>
<unit id="org.apache.commons.commons-logging" version="0.0.0"/>
<unit id="org.objectweb.asm" version="9.7.0"/>
<unit id="io.github.classgraph.classgraph" version="4.8.174"/>
<repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2024-09"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,5 @@ additional.bundles = org.eclipse.xtext.xbase,\
org.eclipse.emf.mwe2.launch,\
org.eclipse.emf.mwe2.lib,\
org.objectweb.asm,\
org.apache.commons.logging,\
org.apache.commons.commons-logging,\
org.apache.log4j
1 change: 0 additions & 1 deletion org.eclipse.xtext.xbase.testlanguages/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ Bundle-SymbolicName: org.eclipse.xtext.xbase.testlanguages; singleton:=true
Bundle-ActivationPolicy: lazy
Require-Bundle: org.eclipse.xtext;bundle-version="2.36.0";visibility:=reexport,
org.eclipse.xtext.xbase;bundle-version="2.36.0";resolution:=optional;visibility:=reexport,
org.apache.commons.logging;bundle-version="1.0.4";resolution:=optional,
org.eclipse.emf.ecore;bundle-version="2.26.0",
org.eclipse.emf.common;bundle-version="2.24.0",
org.antlr.runtime;bundle-version="[3.2.0,3.2.1)",
Expand Down
2 changes: 1 addition & 1 deletion org.eclipse.xtext.xtext.bootstrap/build.properties
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ source.. = src/
bin.includes = META-INF/,\
.
additional.bundles = org.eclipse.emf.mwe2.launch,\
org.apache.commons.logging
org.apache.commons.commons-logging
Original file line number Diff line number Diff line change
Expand Up @@ -12,5 +12,5 @@ additional.bundles = org.eclipse.xtext.xbase,\
org.eclipse.emf.mwe2.launch,\
org.eclipse.emf.mwe2.lib,\
org.objectweb.asm,\
org.apache.commons.logging,\
org.apache.commons.commons-logging,\
org.apache.log4j
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
<unit id="org.eclipse.pde.feature.group" version="0.0.0"/>
<unit id="org.eclipse.emf.sdk.feature.group" version="0.0.0"/>
<unit id="org.apache.commons.jxpath" version="0.0.0"/>
<unit id="org.apache.commons.commons-logging"/>
<repository location="https://download.eclipse.org/releases/2024-09"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,5 @@ additional.bundles = org.eclipse.xtext.xbase,\
org.eclipse.emf.mwe2.launch,\
org.eclipse.emf.mwe2.lib,\
org.objectweb.asm,\
org.apache.commons.logging,\
org.apache.commons.commons-logging,\
org.apache.log4j
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,5 @@ additional.bundles = org.eclipse.xtext.xbase,\
org.eclipse.emf.mwe2.launch,\
org.eclipse.emf.mwe2.lib,\
org.objectweb.asm,\
org.apache.commons.logging,\
org.apache.commons.commons-logging,\
org.apache.log4j
Original file line number Diff line number Diff line change
Expand Up @@ -13,5 +13,5 @@ additional.bundles = org.eclipse.xtext.xbase,\
org.eclipse.emf.mwe2.launch,\
org.eclipse.emf.mwe2.lib,\
org.objectweb.asm,\
org.apache.commons.logging,\
org.apache.commons.commons-logging,\
org.apache.log4j
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ class RuntimeProjectDescriptor extends TestedProjectDescriptor {
"org.eclipse.emf.mwe2.launch",
"org.eclipse.emf.mwe2.lib",
"org.objectweb.asm",
"org.apache.commons.logging",
"org.apache.commons.commons-logging",
"org.apache.log4j"
)
if (isFromExistingEcoreModels) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ class TargetPlatformProject extends ProjectDescriptor {
<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.apache.commons.logging" version="1.2.0"/>
<unit id="org.apache.commons.commons-logging" version="0.0.0"/>
«IF config.junitVersion == JUnitVersion.JUNIT_5»
<unit id="org.apiguardian.api" version="0.0.0"/>
<unit id="junit-jupiter-api" version="0.0.0"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@ public Set<String> getDevelopmentBundles() {
"org.eclipse.emf.mwe2.launch",
"org.eclipse.emf.mwe2.lib",
"org.objectweb.asm",
"org.apache.commons.logging",
"org.apache.commons.commons-logging",
"org.apache.log4j");
boolean _isFromExistingEcoreModels = this.isFromExistingEcoreModels();
if (_isFromExistingEcoreModels) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -206,7 +206,7 @@ public CharSequence target() {
_builder.append("<unit id=\"org.hamcrest.core\" version=\"2.2.0.v20230809-1000\"/>");
_builder.newLine();
_builder.append("\t\t\t");
_builder.append("<unit id=\"org.apache.commons.logging\" version=\"1.2.0\"/>");
_builder.append("<unit id=\"org.apache.commons.commons-logging\" version=\"0.0.0\"/>");
_builder.newLine();
{
JUnitVersion _junitVersion = this.getConfig().getJunitVersion();
Expand Down
2 changes: 1 addition & 1 deletion xtext-latest.target
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@
<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.apache.commons.logging" version="1.2.0"/>
<unit id="org.apache.commons.commons-logging" version="0.0.0"/>
<unit id="junit-jupiter-api" version="0.0.0"/>
<unit id="junit-jupiter-engine" version="0.0.0"/>
<unit id="junit-jupiter-migrationsupport" version="0.0.0"/>
Expand Down
2 changes: 1 addition & 1 deletion xtext-r202203.target
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@
<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.apache.commons.logging" version="1.2.0"/>
<unit id="org.apache.commons.commons-logging" version="0.0.0"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
<repository location="https://download.eclipse.org/oomph/simrel-orbit/2023-06"/>
Expand Down
2 changes: 1 addition & 1 deletion xtext-r202206.target
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@
<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.apache.commons.logging" version="1.2.0"/>
<unit id="org.apache.commons.commons-logging" version="0.0.0"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
<repository location="https://download.eclipse.org/oomph/simrel-orbit/2023-06"/>
Expand Down
2 changes: 1 addition & 1 deletion xtext-r202209.target
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@
<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.apache.commons.logging" version="1.2.0"/>
<unit id="org.apache.commons.commons-logging" version="0.0.0"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
<repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2023-09"/>
Expand Down
2 changes: 1 addition & 1 deletion xtext-r202212.target
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@
<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.apache.commons.logging" version="1.2.0"/>
<unit id="org.apache.commons.commons-logging" version="0.0.0"/>
<unit id="junit-jupiter-api" version="0.0.0"/>
<unit id="junit-jupiter-engine" version="0.0.0"/>
<unit id="junit-jupiter-migrationsupport" version="0.0.0"/>
Expand Down
2 changes: 1 addition & 1 deletion xtext-r202303.target
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@
<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.apache.commons.logging" version="1.2.0"/>
<unit id="org.apache.commons.commons-logging" version="0.0.0"/>
<unit id="junit-jupiter-api" version="0.0.0"/>
<unit id="junit-jupiter-engine" version="0.0.0"/>
<unit id="junit-jupiter-migrationsupport" version="0.0.0"/>
Expand Down
2 changes: 1 addition & 1 deletion xtext-r202306.target
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@
<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.apache.commons.logging" version="1.2.0"/>
<unit id="org.apache.commons.commons-logging" version="0.0.0"/>
<unit id="junit-jupiter-api" version="0.0.0"/>
<unit id="junit-jupiter-engine" version="0.0.0"/>
<unit id="junit-jupiter-migrationsupport" version="0.0.0"/>
Expand Down
2 changes: 1 addition & 1 deletion xtext-r202309.target
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@
<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.apache.commons.logging" version="1.2.0"/>
<unit id="org.apache.commons.commons-logging" version="0.0.0"/>
<unit id="junit-jupiter-api" version="0.0.0"/>
<unit id="junit-jupiter-engine" version="0.0.0"/>
<unit id="junit-jupiter-migrationsupport" version="0.0.0"/>
Expand Down
2 changes: 1 addition & 1 deletion xtext-r202312.target
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@
<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.apache.commons.logging" version="1.2.0"/>
<unit id="org.apache.commons.commons-logging" version="0.0.0"/>
<unit id="junit-jupiter-api" version="0.0.0"/>
<unit id="junit-jupiter-engine" version="0.0.0"/>
<unit id="junit-jupiter-migrationsupport" version="0.0.0"/>
Expand Down
2 changes: 1 addition & 1 deletion xtext-r202403.target
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
<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.apache.commons.logging" version="1.2.0"/>
<unit id="org.apache.commons.commons-logging" version="0.0.0"/>
<unit id="junit-jupiter-api" version="0.0.0"/>
<unit id="junit-jupiter-engine" version="0.0.0"/>
<unit id="junit-jupiter-migrationsupport" version="0.0.0"/>
Expand Down
2 changes: 1 addition & 1 deletion xtext-r202406.target
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
<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.apache.commons.logging" version="1.2.0"/>
<unit id="org.apache.commons.commons-logging" version="0.0.0"/>
<unit id="junit-jupiter-api" version="0.0.0"/>
<unit id="junit-jupiter-engine" version="0.0.0"/>
<unit id="junit-jupiter-migrationsupport" version="0.0.0"/>
Expand Down

0 comments on commit 7e5bfc8

Please sign in to comment.