Migrate to latest commons-logging (currently 1.3.3)

Adapt to the new Bundle-SymbolicName Fixes #3127 for Xtext
eclipse · Aug 9, 2024 · c5be99b · c5be99b
1 parent 2bce8b6
commit c5be99b
Show file tree

Hide file tree

Showing 42 changed files with 95 additions and 99 deletions.
diff --git a/org.eclipse.xtext.ide.tests/build.properties b/org.eclipse.xtext.ide.tests/build.properties
@@ -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
diff --git a/org.eclipse.xtext.purexbase/build.properties b/org.eclipse.xtext.purexbase/build.properties
@@ -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
 
 
diff --git a/org.eclipse.xtext.testlanguages/build.properties b/org.eclipse.xtext.testlanguages/build.properties
@@ -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
diff --git a/...pse.xtext.tests/testdata/wizard-expectations/eclipsePlugin/eclipsePlugin/build.properties b/...pse.xtext.tests/testdata/wizard-expectations/eclipsePlugin/eclipsePlugin/build.properties
@@ -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
diff --git a/...xtext.tests/testdata/wizard-expectations/eclipsePluginP2/eclipsePluginP2/build.properties b/...xtext.tests/testdata/wizard-expectations/eclipsePluginP2/eclipsePluginP2/build.properties
@@ -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
diff --git a/....xtext.tests/testdata/wizard-expectations/full/full.parent/full.target/full.target.target b/....xtext.tests/testdata/wizard-expectations/full/full.parent/full.target/full.target.target
@@ -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"/>

diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/full/full.parent/full/build.properties b/org.eclipse.xtext.tests/testdata/wizard-expectations/full/full.parent/full/build.properties
@@ -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
diff --git a/...MavenTychoApp/lsMavenTychoApp.parent/lsMavenTychoApp.target/lsMavenTychoApp.target.target b/...MavenTychoApp/lsMavenTychoApp.parent/lsMavenTychoApp.target/lsMavenTychoApp.target.target
@@ -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"/>

diff --git a/...zard-expectations/lsMavenTychoApp/lsMavenTychoApp.parent/lsMavenTychoApp/build.properties b/...zard-expectations/lsMavenTychoApp/lsMavenTychoApp.parent/lsMavenTychoApp/build.properties
@@ -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
diff --git a/...tjar/lsMavenTychoFatjar.parent/lsMavenTychoFatjar.target/lsMavenTychoFatjar.target.target b/...tjar/lsMavenTychoFatjar.parent/lsMavenTychoFatjar.target/lsMavenTychoFatjar.target.target
@@ -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"/>

diff --git a/...ctations/lsMavenTychoFatjar/lsMavenTychoFatjar.parent/lsMavenTychoFatjar/build.properties b/...ctations/lsMavenTychoFatjar/lsMavenTychoFatjar.parent/lsMavenTychoFatjar/build.properties
@@ -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
diff --git a/...zard-expectations/mavenTycho/mavenTycho.parent/mavenTycho.target/mavenTycho.target.target b/...zard-expectations/mavenTycho/mavenTycho.parent/mavenTycho.target/mavenTycho.target.target
@@ -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"/>

diff --git a/...sts/testdata/wizard-expectations/mavenTycho/mavenTycho.parent/mavenTycho/build.properties b/...sts/testdata/wizard-expectations/mavenTycho/mavenTycho.parent/mavenTycho/build.properties
@@ -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
diff --git a/...tions/mavenTychoJ17/mavenTychoJ17.parent/mavenTychoJ17.target/mavenTychoJ17.target.target b/...tions/mavenTychoJ17/mavenTychoJ17.parent/mavenTychoJ17.target/mavenTychoJ17.target.target
@@ -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"/>

diff --git a/...ata/wizard-expectations/mavenTychoJ17/mavenTychoJ17.parent/mavenTychoJ17/build.properties b/...ata/wizard-expectations/mavenTychoJ17/mavenTychoJ17.parent/mavenTychoJ17/build.properties
@@ -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
diff --git a/...ectations/mavenTychoP2/mavenTychoP2.parent/mavenTychoP2.target/mavenTychoP2.target.target b/...ectations/mavenTychoP2/mavenTychoP2.parent/mavenTychoP2.target/mavenTychoP2.target.target
@@ -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"/>

diff --git a/...stdata/wizard-expectations/mavenTychoP2/mavenTychoP2.parent/mavenTychoP2/build.properties b/...stdata/wizard-expectations/mavenTychoP2/mavenTychoP2.parent/mavenTychoP2/build.properties
@@ -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
diff --git a/...venTychoP2J17/mavenTychoP2J17.parent/mavenTychoP2J17.target/mavenTychoP2J17.target.target b/...venTychoP2J17/mavenTychoP2J17.parent/mavenTychoP2J17.target/mavenTychoP2J17.target.target
@@ -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"/>

diff --git a/...zard-expectations/mavenTychoP2J17/mavenTychoP2J17.parent/mavenTychoP2J17/build.properties b/...zard-expectations/mavenTychoP2J17/mavenTychoP2J17.parent/mavenTychoP2J17/build.properties
@@ -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
diff --git a/...venTychoP2J21/mavenTychoP2J21.parent/mavenTychoP2J21.target/mavenTychoP2J21.target.target b/...venTychoP2J21/mavenTychoP2J21.parent/mavenTychoP2J21.target/mavenTychoP2J21.target.target
@@ -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"/>

diff --git a/...zard-expectations/mavenTychoP2J21/mavenTychoP2J21.parent/mavenTychoP2J21/build.properties b/...zard-expectations/mavenTychoP2J21/mavenTychoP2J21.parent/mavenTychoP2J21/build.properties
@@ -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
diff --git a/org.eclipse.xtext.xbase.testlanguages/META-INF/MANIFEST.MF b/org.eclipse.xtext.xbase.testlanguages/META-INF/MANIFEST.MF
@@ -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)",

diff --git a/org.eclipse.xtext.xtext.bootstrap/build.properties b/org.eclipse.xtext.xtext.bootstrap/build.properties
@@ -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
diff --git a/...t.ui.examples/projects/arithmetics/org.eclipse.xtext.example.arithmetics/build.properties b/...t.ui.examples/projects/arithmetics/org.eclipse.xtext.example.arithmetics/build.properties
@@ -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
diff --git a/...t.ui.examples/projects/domainmodel/org.eclipse.xtext.example.domainmodel/build.properties b/...t.ui.examples/projects/domainmodel/org.eclipse.xtext.example.domainmodel/build.properties
@@ -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
diff --git a/...xtext.ui.examples/projects/fowlerdsl/org.eclipse.xtext.example.fowlerdsl/build.properties b/...xtext.ui.examples/projects/fowlerdsl/org.eclipse.xtext.example.fowlerdsl/build.properties
@@ -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
diff --git a/...xamples/projects/homeautomation/org.eclipse.xtext.example.homeautomation/build.properties b/...xamples/projects/homeautomation/org.eclipse.xtext.example.homeautomation/build.properties
@@ -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