Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
LOG4J2-2191 Made log4j-core a multi-release jar; added log4j-core-jav…
…a9 module
- Loading branch information
Showing
8 changed files
with
342 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,153 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <!-- | ||
| ~ Licensed to the Apache Software Foundation (ASF) under one or more | ||
| ~ contributor license agreements. See the NOTICE file distributed with | ||
| ~ this work for additional information regarding copyright ownership. | ||
| ~ The ASF licenses this file to You under the Apache license, Version 2.0 | ||
| ~ (the "License"); you may not use this file except in compliance with | ||
| ~ the License. You may obtain a copy of the License at | ||
| ~ | ||
| ~ http://www.apache.org/licenses/LICENSE-2.0 | ||
| ~ | ||
| ~ Unless required by applicable law or agreed to in writing, software | ||
| ~ distributed under the License is distributed on an "AS IS" BASIS, | ||
| ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| ~ See the license for the specific language governing permissions and | ||
| ~ limitations under the license. | ||
| --> | ||
| <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> | ||
| <modelVersion>4.0.0</modelVersion> | ||
| <parent> | ||
| <groupId>org.apache.logging.log4j</groupId> | ||
| <artifactId>log4j</artifactId> | ||
| <version>2.10.1-SNAPSHOT</version> | ||
| <relativePath>../</relativePath> | ||
| </parent> | ||
| <artifactId>log4j-core-java9</artifactId> | ||
| <packaging>pom</packaging> | ||
| <name>Apache Log4j Implementation Java 9 support</name> | ||
| <description>The Apache Log4j Implementation (Java 9)</description> | ||
| <properties> | ||
| <log4jParentDir>${basedir}/..</log4jParentDir> | ||
| <docLabel>Log4j Implementation Documentation</docLabel> | ||
| <projectDir>/core</projectDir> | ||
| </properties> | ||
| <dependencies> | ||
| <dependency> | ||
| <groupId>junit</groupId> | ||
| <artifactId>junit</artifactId> | ||
| <scope>test</scope> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>org.apache.maven</groupId> | ||
| <artifactId>maven-core</artifactId> | ||
| <scope>test</scope> | ||
| </dependency> | ||
| </dependencies> | ||
| <build> | ||
| <plugins> | ||
| <plugin> | ||
| <groupId>org.apache.maven.plugins</groupId> | ||
| <artifactId>maven-toolchains-plugin</artifactId> | ||
| <version>1.1</version> | ||
| <executions> | ||
| <execution> | ||
| <goals> | ||
| <goal>toolchain</goal> | ||
| </goals> | ||
| </execution> | ||
| </executions> | ||
| <configuration> | ||
| <toolchains> | ||
| <jdk> | ||
| <version>9</version> | ||
| </jdk> | ||
| </toolchains> | ||
| </configuration> | ||
| </plugin> | ||
| <plugin> | ||
| <groupId>org.apache.maven.plugins</groupId> | ||
| <artifactId>maven-compiler-plugin</artifactId> | ||
| <executions> | ||
| <execution> | ||
| <id>default-compile</id> | ||
| <phase>compile</phase> | ||
| <goals> | ||
| <goal>compile</goal> | ||
| </goals> | ||
| </execution> | ||
| <execution> | ||
| <id>default-test-compile</id> | ||
| <phase>test-compile</phase> | ||
| <goals> | ||
| <goal>testCompile</goal> | ||
| </goals> | ||
| </execution> | ||
| </executions> | ||
| <configuration> | ||
| <source>9</source> | ||
| <target>9</target> | ||
| <release>9</release> | ||
| <proc>none</proc> | ||
| </configuration> | ||
| </plugin> | ||
| <plugin> | ||
| <groupId>org.apache.maven.plugins</groupId> | ||
| <artifactId>maven-surefire-plugin</artifactId> | ||
| <!-- Do not upgrade until https://issues.apache.org/jira/browse/SUREFIRE-720 is fixed --> | ||
| <version>2.13</version> | ||
| <executions> | ||
| <execution> | ||
| <id>test</id> | ||
| <phase>test</phase> | ||
| <goals> | ||
| <goal>test</goal> | ||
| </goals> | ||
| </execution> | ||
| </executions> | ||
| <configuration> | ||
| <systemPropertyVariables> | ||
| <java.awt.headless>true</java.awt.headless> | ||
| </systemPropertyVariables> | ||
| <forkCount>2C</forkCount> | ||
| <reuseForks>true</reuseForks> | ||
| <includes> | ||
| <include>**/Test*.java</include> | ||
| <include>**/*Test.java</include> | ||
| </includes> | ||
| <excludes> | ||
| <exclude>**/*FuncTest.java</exclude> | ||
| </excludes> | ||
| </configuration> | ||
| </plugin> | ||
| <plugin> | ||
| <artifactId>maven-assembly-plugin</artifactId> | ||
| <executions> | ||
| <execution> | ||
| <id>zip</id> | ||
| <phase>package</phase> | ||
| <goals> | ||
| <goal>single</goal> | ||
| </goals> | ||
| <configuration> | ||
| <finalName>log4j-core-java9-${project.version}</finalName> | ||
| <appendAssemblyId>false</appendAssemblyId> | ||
| <descriptors> | ||
| <descriptor>src/assembly/java9.xml</descriptor> | ||
| </descriptors> | ||
| </configuration> | ||
| </execution> | ||
| </executions> | ||
| </plugin> | ||
| <plugin> | ||
| <groupId>org.apache.maven.plugins</groupId> | ||
| <artifactId>maven-deploy-plugin</artifactId> | ||
| <version>${deploy.plugin.version}</version> | ||
| <configuration> | ||
| <skip>true</skip> | ||
| </configuration> | ||
| </plugin> | ||
| </plugins> | ||
| </build> | ||
| </project> | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,51 @@ | ||
| <?xml version='1.0' encoding='UTF-8'?> | ||
| <!-- | ||
| Licensed to the Apache Software Foundation (ASF) under one | ||
| or more contributor license agreements. See the NOTICE file | ||
| distributed with this work for additional information | ||
| regarding copyright ownership. The ASF licenses this file | ||
| to you under the Apache License, Version 2.0 (the | ||
| "License"); you may not use this file except in compliance | ||
| with the License. You may obtain a copy of the License at | ||
| http://www.apache.org/licenses/LICENSE-2.0 | ||
| Unless required by applicable law or agreed to in writing, | ||
| software distributed under the License is distributed on an | ||
| "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
| KIND, either express or implied. See the License for the | ||
| specific language governing permissions and limitations | ||
| under the License. | ||
| --> | ||
|
|
||
| <assembly> | ||
| <id>src</id> | ||
| <formats> | ||
| <format>zip</format> | ||
| </formats> | ||
| <baseDirectory>/</baseDirectory> | ||
| <fileSets> | ||
| <fileSet> | ||
| <directory>${project.build.outputDirectory}</directory> | ||
| <outputDirectory>/classes/META-INF/versions/9</outputDirectory> | ||
| <includes> | ||
| <include>**/*.class</include> | ||
| </includes> | ||
| <excludes> | ||
| <exclude>module-info.class</exclude> | ||
| <exclude>**/Dummy.class</exclude> | ||
| <exclude>**/spi/Provider.class</exclude> | ||
| <exclude>**/util/PropertySource.class</exclude> | ||
| <exclude>**/message/ThreadDumpMessage.class</exclude> | ||
| <exclude>**/message/ThreadDumpMessage$ThreadInfoFactory.class</exclude> | ||
| </excludes> | ||
| </fileSet> | ||
| <fileSet> | ||
| <directory>${project.build.outputDirectory}</directory> | ||
| <outputDirectory>/classes</outputDirectory> | ||
| <includes> | ||
| <include>module-info.class</include> | ||
| </includes> | ||
| </fileSet> | ||
| </fileSets> | ||
| </assembly> |
24 changes: 24 additions & 0 deletions
24
log4j-core-java9/src/main/java/org/apache/logging/log4j/core/util/Dummy.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,24 @@ | ||
| /* | ||
| * Licensed to the Apache Software Foundation (ASF) under one or more | ||
| * contributor license agreements. See the NOTICE file distributed with | ||
| * this work for additional information regarding copyright ownership. | ||
| * The ASF licenses this file to You under the Apache license, Version 2.0 | ||
| * (the "License"); you may not use this file except in compliance with | ||
| * the License. You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the license for the specific language governing permissions and | ||
| * limitations under the license. | ||
| */ | ||
| package org.apache.logging.log4j.core.util; | ||
|
|
||
| /** | ||
| * This is a dummy class and is only here to allow module-info.java to compile. It will not | ||
| * be copied into the log4j-api module. | ||
| */ | ||
| public class Dummy { | ||
| } |
24 changes: 24 additions & 0 deletions
24
log4j-core-java9/src/main/java/org/apache/logging/log4j/core/util/Temp.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,24 @@ | ||
| /* | ||
| * Licensed to the Apache Software Foundation (ASF) under one or more | ||
| * contributor license agreements. See the NOTICE file distributed with | ||
| * this work for additional information regarding copyright ownership. | ||
| * The ASF licenses this file to You under the Apache license, Version 2.0 | ||
| * (the "License"); you may not use this file except in compliance with | ||
| * the License. You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the license for the specific language governing permissions and | ||
| * limitations under the license. | ||
| */ | ||
| package org.apache.logging.log4j.core.util; | ||
|
|
||
| /** | ||
| * Temporary class to ensure the log4j-core-java9 jar has at least one class (or Maven will refuse to proceed). | ||
| * To be removed as soon as real classes are added to the log4j-core-java9 module. | ||
| */ | ||
| public class Temp { | ||
| } |
24 changes: 24 additions & 0 deletions
24
log4j-core-java9/src/test/java/org/apache/logging/log4j/core/util/Dummy.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,24 @@ | ||
| /* | ||
| * Licensed to the Apache Software Foundation (ASF) under one or more | ||
| * contributor license agreements. See the NOTICE file distributed with | ||
| * this work for additional information regarding copyright ownership. | ||
| * The ASF licenses this file to You under the Apache license, Version 2.0 | ||
| * (the "License"); you may not use this file except in compliance with | ||
| * the License. You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the license for the specific language governing permissions and | ||
| * limitations under the license. | ||
| */ | ||
| package org.apache.logging.log4j.core.util; | ||
|
|
||
| /** | ||
| * This is a dummy class and is only here to allow module-info.java to compile. It will not | ||
| * be copied into the log4j-api module. | ||
| */ | ||
| public class Dummy { | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters