Skip to content

Delete Java EE and Jakarta EE modules #1981

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 16 commits into from
Nov 21, 2023
Merged

Delete Java EE and Jakarta EE modules #1981

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
18f11f7
Delete JMS appender (#1966)
vy Nov 20, 2023
e048823
Delete SMTP appender (#1966)
vy Nov 20, 2023
c1bf017
Delete Jakarta SMTP appender (#1966)
vy Nov 20, 2023
eff464e
Minor fixes (#1966)
vy Nov 20, 2023
ea28bd6
Delete `*-web`, `-jpa`, `-taglib`, and other leftovers (#1966)
vy Nov 20, 2023
85e0911
Add changelog entries (#1966)
vy Nov 20, 2023
d39a3d7
Merge remote-tracking branch 'origin/main' into jee-deletion
vy Nov 20, 2023
fe971e8
Fix code formatting
vy Nov 20, 2023
5fb8be0
Fix `PatternParserTest`
vy Nov 20, 2023
5f9ca8a
Merge remote-tracking branch 'origin/main' into jee-deletion
vy Nov 21, 2023
577723f
Rewrite `HttpThreadContextMapFilterTest`
vy Nov 21, 2023
dd9727c
Restore `UrlConnectionFactoryTest`
vy Nov 21, 2023
767bc8e
Apply `spotless:apply`
vy Nov 21, 2023
80655ed
Restore `log4j2-mutableFilter.xml`
vy Nov 21, 2023
4838ceb
Use dynamic WireMock port
vy Nov 21, 2023
6b3329f
Merge remote-tracking branch 'origin/main' into jee-deletion
vy Nov 21, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,4 @@ jobs:
with:
java-version: 11
project-id: log4j
distribution-attachment-filepath-pattern: |-
'^.*/target/log4j-(1\\.2-api|api(-test)?|appserver|cassandra|core(-test)?|couchdb|docker|flume-ng|iostreams|jakarta-(smtp|web)|jcl|jdbc-dbcp2|jpa|jpl|jul|kubernetes|layout-template-json|mongodb[34]|slf4j2?-impl|spring-(boot|cloud-config-client)|taglib|to-(jul|slf4j)|web)-'${PROJECT_VERSION}'\\.jar$'
distribution-attachment-count: 30
site-enabled: true
3 changes: 0 additions & 3 deletions NOTICE.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,6 @@ The Apache Software Foundation (http://www.apache.org/).
ResolverUtil.java
Copyright 2005-2006 Tim Fennell

Dumbster SMTP test server
Copyright 2004 Jason Paul Kitchen

TypeUtil.java
Copyright 2002-2012 Ramnivas Laddad, Juergen Hoeller, Chris Beams

Expand Down
3 changes: 1 addition & 2 deletions log4j-1.2-api/bnd.bnd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,5 +23,4 @@
org.osgi.core;static=true;transitive=false,\
org.osgi.framework;static=true;transitive=false,\
org.apache.logging.log4j;substitute="log4j-api",\
org.apache.logging.log4j.core;substitute="log4j-core";transitive=false;static=true,\
javax.jms.api;substitute="javax.jms-api"
org.apache.logging.log4j.core;substitute="log4j-core";transitive=false;static=true
12 changes: 0 additions & 12 deletions log4j-1.2-api/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,18 +99,6 @@
<artifactId>jackson-dataformat-xml</artifactId>
<scope>test</scope>
</dependency>
<!-- Replacement for `jakarta.xml.bind` Jackson dependency -->
<dependency>
<groupId>javax.activation</groupId>
<artifactId>javax.activation-api</artifactId>
<scope>test</scope>
</dependency>
<!-- Replacement for `jakarta.xml.bind` Jackson dependency -->
<dependency>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-engine</artifactId>
Expand Down
6 changes: 0 additions & 6 deletions log4j-1.2-api/src/main/java/org/apache/log4j/spi/TriggeringEventEvaluator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,6 @@
/**
* Implementors decide when to perform an appender specific action.
*
* <p>
* For example, the {@code org.apache.log4j.net.SMTPAppender} sends an email when the
* {@link #isTriggeringEvent(LoggingEvent)} method returns {@code true} and adds the event to an internal buffer when
* the returned result is {@code false}.
* </p>
*
* @since version 1.0
*/
public interface TriggeringEventEvaluator {
Expand Down
38 changes: 0 additions & 38 deletions log4j-1.2-api/src/test/resources/log4j1-1.2.17/input/xml/smtpAppender1.xml
View file
Open in desktop

This file was deleted.

5 changes: 0 additions & 5 deletions log4j-api-test/src/test/java/org/apache/logging/log4j/util/PropertiesUtilOrderTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,6 @@ public void testOrderOfProperties(final EnvironmentVariables env, final SystemPr
env.set("log4j2.*.Configuration.statusLoggerLevel", "ERROR");
env.set("log4j2.*.StatusLogger.entries", "200");
env.set("log4j2.my-app.StatusLogger.entries", "500");
sysProps.set("log4j2.*.JNDI.enableJMS", "false");
sysProps.set("log4j2.my-app.Configuration.mergeStrategy", "org.apache.CustomMergeStrategy");
sysProps.set("log4j2.*.Web.isWebApp", "true");
PropertiesUtil.getProperties().reload();
Expand All @@ -99,16 +98,12 @@ public void testOrderOfProperties(final EnvironmentVariables env, final SystemPr
assertTrue(contextProperties.hasProperty(TestProperty.CONFIG_TEST1));
// Context environment properties should override system-wide environment definition.
assertEquals("500", contextProperties.getStringProperty(LoggingSystemProperty.STATUS_MAX_ENTRIES));
// System property value should be recognized.
assertEquals("false", util.getStringProperty(TestProperty.JNDI_JMS, "true"));
// Context system property should override Context property from file.
assertEquals(
"org.apache.CustomMergeStrategy",
contextProperties.getStringProperty(TestProperty.CONFIG_MERGE_STRATEGY));
// Recognize system-wide environment variable.
assertEquals("200", util.getStringProperty(LoggingSystemProperty.STATUS_MAX_ENTRIES));
// Context properties in file should override system-wide system property.
assertEquals("true", contextProperties.getStringProperty(TestProperty.JNDI_JMS, "false"));
// System-wide system property should be used when no other value is available.
assertEquals("true", contextProperties.getStringProperty(LoggingSystemProperty.IS_WEBAPP));
// Context property in file should override system-wide property in file.
Expand Down
39 changes: 1 addition & 38 deletions log4j-core-its/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,13 +38,6 @@
<maven.test.skip>true</maven.test.skip>
</properties>
<dependencies>
<!-- Used for JMS appenders (needs an implementation of course) -->
<dependency>
<groupId>javax.jms</groupId>
<artifactId>javax.jms-api</artifactId>
<scope>provided</scope>
<optional>true</optional>
</dependency>
<!-- Alternative implementation of BlockingQueue using Conversant Disruptor for AsyncAppender -->
<dependency>
<groupId>com.conversantmedia</groupId>
Expand Down Expand Up @@ -81,18 +74,6 @@
<artifactId>jackson-dataformat-yaml</artifactId>
<optional>true</optional>
</dependency>
<!-- Replacement for `jakarta.xml.bind` Jackson dependency -->
<dependency>
<groupId>javax.activation</groupId>
<artifactId>javax.activation-api</artifactId>
<optional>true</optional>
</dependency>
<!-- Replacement for `jakarta.xml.bind` Jackson dependency -->
<dependency>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
<optional>true</optional>
</dependency>
<!-- Alternative implementation of BlockingQueue using JCTools for AsyncAppender -->
<dependency>
<groupId>org.jctools</groupId>
Expand Down Expand Up @@ -144,23 +125,6 @@
<artifactId>log4j-layout-jackson-xml</artifactId>
<scope>test</scope>
</dependency>
<!-- JPA, JNDI and JMS tests -->
<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-broker</artifactId>
<scope>test</scope>
<exclusions>
<exclusion>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jms_1.1_spec</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest</artifactId>
Expand Down Expand Up @@ -223,8 +187,7 @@
<excludes>
<exclude>**/ForceNoDefClassFoundError.*</exclude>
</excludes>
<groups>org.apache.logging.log4j.core.test.categories.PerformanceTests,
org.apache.logging.log4j.core.test.categories.Appenders$Jms</groups>
<groups>org.apache.logging.log4j.core.test.categories.PerformanceTests</groups>
</configuration>
</plugin>
<plugin>
Expand Down
17 changes: 0 additions & 17 deletions log4j-core-test/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,11 +106,6 @@
<artifactId>commons-compress</artifactId>
<optional>true</optional>
</dependency>
<!-- JNDI and JMS tests -->
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
</dependency>
<!-- Alternative implementation of BlockingQueue using Conversant Disruptor for AsyncAppender -->
<dependency>
<groupId>com.conversantmedia</groupId>
Expand Down Expand Up @@ -157,18 +152,6 @@
<artifactId>jansi</artifactId>
<optional>true</optional>
</dependency>
<!-- Replacement for `jakarta.xml.bind` Jackson dependency -->
<dependency>
<groupId>javax.activation</groupId>
<artifactId>javax.activation-api</artifactId>
<optional>true</optional>
</dependency>
<!-- Replacement for `jakarta.xml.bind` Jackson dependency -->
<dependency>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
<optional>true</optional>
</dependency>
<!-- Alternative implementation of BlockingQueue using JCTools for AsyncAppender -->
<dependency>
<groupId>org.jctools</groupId>
Expand Down
6 changes: 0 additions & 6 deletions log4j-core-test/src/main/java/org/apache/logging/log4j/core/test/categories/Appenders.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,15 +28,9 @@ interface Cassandra {}

interface CouchDb {}

interface Jms {}

interface Jpa {}

interface Kafka {}

interface MongoDb {}

interface Smtp {}

interface ZeroMq {}
}
22 changes: 0 additions & 22 deletions log4j-core-test/src/main/java/org/apache/logging/log4j/core/test/smtp/package-info.java
View file
Open in desktop

This file was deleted.

20 changes: 0 additions & 20 deletions log4j-core-test/src/main/resources/Log4j-config.xsd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -647,13 +647,9 @@
<element name="Console" type="tns:ConsoleAppenderType" minOccurs="0" />
<element name="Flume" type="tns:FlumeAppenderType" minOccurs="0" />
<element name="JeroMQ" type="tns:JeroMQAppenderType" minOccurs="0" />
<element name="JMS" type="tns:JMSAppenderType" minOccurs="0" />
<element name="JMSQueue" type="tns:JMSAppenderType" minOccurs="0" />
<element name="JMSTopic" type="tns:JMSAppenderType" minOccurs="0" />
<element name="Kafka" type="tns:KafkaAppenderType" minOccurs="0" />
<element name="Rewrite" type="tns:RewriteAppenderType" minOccurs="0" />
<element name="Routing" type="tns:RoutingAppenderType" minOccurs="0" />
<element name="SMTP" type="tns:SMTPAppenderType" minOccurs="0" />
<element name="File" type="tns:FileAppenderType" minOccurs="0" />
<element name="MemoryMappedFile" type="tns:MemoryMappedFileAppenderType" minOccurs="0" />
<element name="RandomAccessFile" type="tns:RandomAccessFileAppenderType" minOccurs="0" />
Expand Down Expand Up @@ -839,14 +835,6 @@
</complexContent>
</complexType>

<complexType name="JMSAppenderType">
<complexContent>
<extension base="tns:AbstractAppenderType">
<anyAttribute processContents="lax" />
</extension>
</complexContent>
</complexType>

<complexType name="KafkaAppenderType">
<complexContent>
<extension base="tns:AbstractAppenderType">
Expand Down Expand Up @@ -929,14 +917,6 @@
</complexContent>
</complexType>

<complexType name="SMTPAppenderType">
<complexContent>
<extension base="tns:AbstractAppenderType">
<anyAttribute processContents="lax" />
</extension>
</complexContent>
</complexType>

<complexType name="AbstractFileAppenderType" abstract="true">
<complexContent>
<extension base="tns:AbstractAppenderType">
Expand Down
Loading