This is an automated email from the ASF dual-hosted git repository.
pkarwasz pushed a commit to branch 2.x
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
The following commit(s) were added to refs/heads/2.x by this push:
new 71c870525b Upgrade Equinox version
71c870525b is described below
commit 71c870525b59273f69d7e680490d95cc3db3d7e0
Author: Piotr P. Karwasz <[email protected]>
AuthorDate: Tue Jun 18 14:46:48 2024 +0200
Upgrade Equinox version
---
log4j-1.2-api/pom.xml | 11 ----------
log4j-core-test/pom.xml | 11 ----------
log4j-osgi-test/pom.xml | 53 +++++++++++++++++++++++++++++++++++++------------
log4j-parent/pom.xml | 4 ++--
4 files changed, 42 insertions(+), 37 deletions(-)
diff --git a/log4j-1.2-api/pom.xml b/log4j-1.2-api/pom.xml
index b9f286d49a..097921ad56 100644
--- a/log4j-1.2-api/pom.xml
+++ b/log4j-1.2-api/pom.xml
@@ -119,17 +119,6 @@
<artifactId>mockito-core</artifactId>
<scope>test</scope>
</dependency>
- <!-- Place Felix before Equinox because Felix is signed. -->
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.framework</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.eclipse.tycho</groupId>
- <artifactId>org.eclipse.osgi</artifactId>
- <scope>test</scope>
- </dependency>
<!-- 1.2 tests -->
<dependency>
<groupId>oro</groupId>
diff --git a/log4j-core-test/pom.xml b/log4j-core-test/pom.xml
index 7c99ce2d50..e23fc2c476 100644
--- a/log4j-core-test/pom.xml
+++ b/log4j-core-test/pom.xml
@@ -302,17 +302,6 @@
<artifactId>mockito-junit-jupiter</artifactId>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.framework</artifactId>
- <scope>test</scope>
- </dependency>
- <!-- OSGi tests -->
- <dependency>
- <groupId>org.eclipse.tycho</groupId>
- <artifactId>org.eclipse.osgi</artifactId>
- <scope>test</scope>
- </dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-utils</artifactId>
diff --git a/log4j-osgi-test/pom.xml b/log4j-osgi-test/pom.xml
index 5d592e8d8d..4bb4d2b179 100644
--- a/log4j-osgi-test/pom.xml
+++ b/log4j-osgi-test/pom.xml
@@ -111,7 +111,7 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.eclipse.tycho</groupId>
+ <groupId>org.eclipse.platform</groupId>
<artifactId>org.eclipse.osgi</artifactId>
<scope>test</scope>
</dependency>
@@ -202,7 +202,9 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
-
<classpathDependencyExcludes>org.osgi:org.osgi.core</classpathDependencyExcludes>
+ <classpathDependencyExcludes>
+
<classpathDependencyExclude>org.osgi:org.osgi.framework</classpathDependencyExclude>
+ </classpathDependencyExcludes>
<systemPropertyVariables>
<!-- PAX logging has a copy of Log4j2 API-->
<pax.exam.logging>false</pax.exam.logging>
@@ -211,17 +213,42 @@
<felix.cache.rootdir>${project.build.directory}</felix.cache.rootdir>
</systemPropertyVariables>
</configuration>
- </plugin>
-
- <!-- Exclude `felix-cache` from `apache-rat-plugin` checks -->
- <plugin>
- <groupId>org.apache.rat</groupId>
- <artifactId>apache-rat-plugin</artifactId>
- <configuration>
- <excludes combine.children="append">
- <exclude>felix-cache/**/*</exclude>
- </excludes>
- </configuration>
+ <executions>
+ <!-- Split the Felix and Equinox tests to prevent classpath
conflicts.
+ Both frameworks contain e.g. the `org.apache.felix.resolver`
package. -->
+ <execution>
+ <id>default-test</id>
+ <phase>none</phase>
+ </execution>
+ <execution>
+ <id>equinox-test</id>
+ <goals>
+ <goal>test</goal>
+ </goals>
+ <configuration>
+ <classpathDependencyExcludes combine.children="append">
+
<classpathDependencyExclude>org.apache.felix:org.apache.felix.framework</classpathDependencyExclude>
+ </classpathDependencyExcludes>
+ <excludes>
+
<exclude>org.apache.logging.log4j.osgi.tests.FelixLoadApiBundleTest</exclude>
+ </excludes>
+ </configuration>
+ </execution>
+ <execution>
+ <id>felix-test</id>
+ <goals>
+ <goal>test</goal>
+ </goals>
+ <configuration>
+ <classpathDependencyExcludes combine.children="append">
+
<classpathDependencyExclude>org.eclipse.platform:org.eclipse.osgi</classpathDependencyExclude>
+ </classpathDependencyExcludes>
+ <excludes>
+
<exclude>org.apache.logging.log4j.osgi.tests.EquinoxLoadApiBundleTest</exclude>
+ </excludes>
+ </configuration>
+ </execution>
+ </executions>
</plugin>
</plugins>
diff --git a/log4j-parent/pom.xml b/log4j-parent/pom.xml
index 144965d76e..1cbff98f9f 100644
--- a/log4j-parent/pom.xml
+++ b/log4j-parent/pom.xml
@@ -128,7 +128,7 @@
<mockito.version>4.11.0</mockito.version>
<nashorn.version>15.4</nashorn.version>
<netty.version>4.1.111.Final</netty.version>
- <org.eclipse.osgi.version>3.13.0.v20180226-1711</org.eclipse.osgi.version>
+ <org.eclipse.osgi.version>3.20.0</org.eclipse.osgi.version>
<org.eclipse.persistence.version>2.7.15</org.eclipse.persistence.version>
<oro.version>2.0.8</oro.version>
<!-- The OSGi API version MUST always be the MINIMUM version Log4j
supports: -->
@@ -842,7 +842,7 @@
</dependency>
<dependency>
- <groupId>org.eclipse.tycho</groupId>
+ <groupId>org.eclipse.platform</groupId>
<artifactId>org.eclipse.osgi</artifactId>
<version>${org.eclipse.osgi.version}</version>
</dependency>
