You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by pk...@apache.org on 2022/06/27 19:54:31 UTC
[logging-log4j2] branch release-2.x updated: Updates dependencies to Java EE 8
This is an automated email from the ASF dual-hosted git repository.
pkarwasz pushed a commit to branch release-2.x
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
The following commit(s) were added to refs/heads/release-2.x by this push:
new 6997f93af7 Updates dependencies to Java EE 8
6997f93af7 is described below
commit 6997f93af7809d5a6431a2323a052c5b63cc2a7b
Author: Piotr P. Karwasz <pi...@karwasz.org>
AuthorDate: Mon Jun 27 21:16:05 2022 +0200
Updates dependencies to Java EE 8
---
log4j-1.2-api/pom.xml | 7 +++--
log4j-core-its/pom.xml | 5 ++--
log4j-core/pom.xml | 6 ++---
log4j-jpa/pom.xml | 5 ++--
log4j-perf/pom.xml | 4 +--
log4j-taglib/pom.xml | 4 +--
log4j-web/pom.xml | 8 +++---
pom.xml | 69 ++++++++++++++++++++++++++++++--------------------
8 files changed, 60 insertions(+), 48 deletions(-)
diff --git a/log4j-1.2-api/pom.xml b/log4j-1.2-api/pom.xml
index d6c9341f3e..7bd888afaf 100644
--- a/log4j-1.2-api/pom.xml
+++ b/log4j-1.2-api/pom.xml
@@ -85,9 +85,8 @@
</dependency>
<!-- Used for JMS appenders (needs an implementation of course) -->
<dependency>
- <groupId>org.jboss.spec.javax.jms</groupId>
- <artifactId>jboss-jms-api_1.1_spec</artifactId>
- <scope>provided</scope>
+ <groupId>javax.jms</groupId>
+ <artifactId>javax.jms-api</artifactId>
<optional>true</optional>
</dependency>
<dependency>
@@ -145,7 +144,7 @@
<Fragment-Host>org.apache.logging.log4j.core</Fragment-Host>
<Export-Package>org.apache.log4j.*</Export-Package>
<Import-Package>
- javax.jms;version="[1.1,2)";resolution:=optional,
+ javax.jms;version="[1.1,3)";resolution:=optional,
<!-- used by org.apache.log4j.jmx.Agent -->
com.sun.jdmk.comm;resolution:=optional,
*
diff --git a/log4j-core-its/pom.xml b/log4j-core-its/pom.xml
index 57c2d619e4..552e68e850 100644
--- a/log4j-core-its/pom.xml
+++ b/log4j-core-its/pom.xml
@@ -159,9 +159,8 @@
</dependency>
<!-- Used for JMS appenders (needs an implementation of course) -->
<dependency>
- <groupId>org.jboss.spec.javax.jms</groupId>
- <artifactId>jboss-jms-api_1.1_spec</artifactId>
- <scope>provided</scope>
+ <groupId>javax.jms</groupId>
+ <artifactId>javax.jms-api</artifactId>
<optional>true</optional>
</dependency>
<!-- JPA, JNDI and JMS tests -->
diff --git a/log4j-core/pom.xml b/log4j-core/pom.xml
index ce9e8138d9..bb106c20f3 100644
--- a/log4j-core/pom.xml
+++ b/log4j-core/pom.xml
@@ -118,9 +118,8 @@
</dependency>
<!-- Used for JMS appenders (needs an implementation of course) -->
<dependency>
- <groupId>org.jboss.spec.javax.jms</groupId>
- <artifactId>jboss-jms-api_1.1_spec</artifactId>
- <scope>provided</scope>
+ <groupId>javax.jms</groupId>
+ <artifactId>javax.jms-api</artifactId>
<optional>true</optional>
</dependency>
<!-- Used for Kafka appender -->
@@ -513,6 +512,7 @@
<!-- TODO: exclude internal classes from export -->
<Export-Package>org.apache.logging.log4j.core.*</Export-Package>
<Import-Package>
+ javax.jms;version="[1.1,3)";resolution:=optional,
sun.reflect;resolution:=optional,
*
</Import-Package>
diff --git a/log4j-jpa/pom.xml b/log4j-jpa/pom.xml
index a769e57637..c8cef3ba73 100644
--- a/log4j-jpa/pom.xml
+++ b/log4j-jpa/pom.xml
@@ -35,9 +35,8 @@
</dependency>
<!-- Used for JPA appenders (needs an implementation of course) -->
<dependency>
- <groupId>org.eclipse.persistence</groupId>
- <artifactId>javax.persistence</artifactId>
- <scope>compile</scope>
+ <groupId>javax.persistence</groupId>
+ <artifactId>javax.persistence-api</artifactId>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
diff --git a/log4j-perf/pom.xml b/log4j-perf/pom.xml
index b05d2b67fd..710be9fa89 100644
--- a/log4j-perf/pom.xml
+++ b/log4j-perf/pom.xml
@@ -130,8 +130,8 @@
<version>1.0.2</version>
</dependency>
<dependency>
- <groupId>org.eclipse.persistence</groupId>
- <artifactId>javax.persistence</artifactId>
+ <groupId>javax.persistence</groupId>
+ <artifactId>javax.persistence-api</artifactId>
</dependency>
<!-- JPA Tests -->
<dependency>
diff --git a/log4j-taglib/pom.xml b/log4j-taglib/pom.xml
index a570150120..e9a7ebce0a 100644
--- a/log4j-taglib/pom.xml
+++ b/log4j-taglib/pom.xml
@@ -46,13 +46,11 @@
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
- <version>3.0.1</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>javax.servlet.jsp</groupId>
- <artifactId>jsp-api</artifactId>
- <version>2.1</version>
+ <artifactId>javax.servlet.jsp-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
diff --git a/log4j-web/pom.xml b/log4j-web/pom.xml
index d436663436..b6070339fc 100644
--- a/log4j-web/pom.xml
+++ b/log4j-web/pom.xml
@@ -49,8 +49,6 @@
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
- <version>3.0.1</version>
- <scope>provided</scope>
</dependency>
<!-- Test dependencies -->
@@ -93,7 +91,11 @@
<instructions>
<!-- we compile against 3.0, but require 2.5 minimum -->
<Fragment-Host>org.apache.logging.log4j.core</Fragment-Host>
- <Import-Package>javax.servlet;version="[2.5,4)",*</Import-Package>
+ <Import-Package>
+ javax.servlet;version="[2.5,5)",
+ javax.servlet.http;version="[2.5,5)",
+ *
+ </Import-Package>
<Export-Package>org.apache.logging.log4j.web</Export-Package>
</instructions>
</configuration>
diff --git a/pom.xml b/pom.xml
index 9c8e54dcda..bdde438703 100644
--- a/pom.xml
+++ b/pom.xml
@@ -291,7 +291,6 @@
<docLabel>Site Documentation</docLabel>
<projectDir />
<commonsLoggingVersion>1.2</commonsLoggingVersion>
- <javax.persistence>2.2.1</javax.persistence>
<!-- The OSGi API version MUST always be the MINIMUM version Log4j supports -->
<osgi.api.version>6.0.0</osgi.api.version>
<activemq.version>5.17.1</activemq.version>
@@ -301,8 +300,14 @@
<junitPioneerVersion>1.6.2</junitPioneerVersion>
<mockitoVersion>4.4.0</mockitoVersion>
<xmlunitVersion>2.9.0</xmlunitVersion>
+ <!-- Java EE 8 artifacts -->
<javax.activation.version>1.2.0</javax.activation.version>
+ <javax.jms.version>2.0.1</javax.jms.version>
+ <javax.jsp.version>2.3.3</javax.jsp.version>
<javax.mail.version>1.6.2</javax.mail.version>
+ <javax.persistence.version>2.2</javax.persistence.version>
+ <javax.servlet.version>4.0.1</javax.servlet.version>
+ <!-- Jakarta EE 9 artifacts -->
<jakarta.activation.version>2.0.1</jakarta.activation.version>
<jakarta.mail.version>2.0.1</jakarta.mail.version>
<argLine>-Xms256m -Xmx1024m</argLine>
@@ -702,15 +707,41 @@
<optional>true</optional>
</dependency>
<!-- Jackson 2 end -->
+ <dependency>
+ <groupId>javax.activation</groupId>
+ <artifactId>javax.activation-api</artifactId>
+ <version>${javax.activation.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.jms</groupId>
+ <artifactId>javax.jms-api</artifactId>
+ <version>${javax.jms.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet.jsp</groupId>
+ <artifactId>javax.servlet.jsp-api</artifactId>
+ <version>${javax.jsp.version}</version>
+ <scope>provided</scope>
+ </dependency>
<dependency>
<groupId>javax.mail</groupId>
<artifactId>javax.mail-api</artifactId>
<version>${javax.mail.version}</version>
+ <scope>provided</scope>
</dependency>
<dependency>
- <groupId>javax.activation</groupId>
- <artifactId>javax.activation-api</artifactId>
- <version>${javax.activation.version}</version>
+ <groupId>javax.persistence</groupId>
+ <artifactId>javax.persistence-api</artifactId>
+ <version>${javax.persistence.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>javax.servlet-api</artifactId>
+ <version>${javax.servlet.version}</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>com.sun.mail</groupId>
@@ -718,15 +749,17 @@
<version>${javax.mail.version}</version>
<scope>runtime</scope>
</dependency>
- <dependency>
- <groupId>jakarta.mail</groupId>
- <artifactId>jakarta.mail-api</artifactId>
- <version>${jakarta.mail.version}</version>
- </dependency>
<dependency>
<groupId>jakarta.activation</groupId>
<artifactId>jakarta.activation-api</artifactId>
<version>${jakarta.activation.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>jakarta.mail</groupId>
+ <artifactId>jakarta.mail-api</artifactId>
+ <version>${jakarta.mail.version}</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>com.sun.mail</groupId>
@@ -740,12 +773,6 @@
<version>${jakarta.activation.version}</version>
<scope>runtime</scope>
</dependency>
- <dependency>
- <groupId>org.jboss.spec.javax.jms</groupId>
- <artifactId>jboss-jms-api_1.1_spec</artifactId>
- <version>1.0.1.Final</version>
- <scope>provided</scope>
- </dependency>
<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-broker</artifactId>
@@ -761,12 +788,6 @@
<artifactId>jeromq</artifactId>
<version>0.5.2</version>
</dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>2.5</version>
- <scope>provided</scope>
- </dependency>
<dependency>
<groupId>com.lmax</groupId>
<artifactId>disruptor</artifactId>
@@ -948,12 +969,6 @@
<artifactId>org.eclipse.persistence.jpa</artifactId>
<version>2.7.10</version>
</dependency>
- <dependency>
- <groupId>org.eclipse.persistence</groupId>
- <artifactId>javax.persistence</artifactId>
- <version>${javax.persistence}</version>
- <scope>provided</scope>
- </dependency>
<dependency>
<groupId>org.lightcouch</groupId>
<artifactId>lightcouch</artifactId>