Skip to content

Commit 9694b75

Browse files
committed
Sync 2.x and 3.x version of log4j-to-jul
1 parent 5fcfb80 commit 9694b75

File tree

3 files changed

+2
-7
lines changed

3 files changed

+2
-7
lines changed

log4j-to-jul/pom.xml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,6 @@
2929
<name>Apache Log4j to JUL Bridge</name>
3030
<description>The Apache Log4j binding between Log4j 2 API and java.util.logging (JUL).</description>
3131
<inceptionYear>2022</inceptionYear>
32-
<properties>
33-
<log4jParentDir>${basedir}/..</log4jParentDir>
34-
</properties>
3532
<dependencies>
3633
<dependency>
3734
<groupId>org.apache.logging.log4j</groupId>

log4j-to-jul/src/main/java/org/apache/logging/log4j/tojul/JULProvider.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
*/
1717
package org.apache.logging.log4j.tojul;
1818

19-
import aQute.bnd.annotation.Resolution;
2019
import aQute.bnd.annotation.spi.ServiceProvider;
2120
import org.apache.logging.log4j.spi.Provider;
2221

@@ -25,7 +24,7 @@
2524
*
2625
* @author <a href="http://www.vorburger.ch">Michael Vorburger.ch</a> for Google
2726
*/
28-
@ServiceProvider(value = Provider.class, resolution = Resolution.OPTIONAL)
27+
@ServiceProvider(value = Provider.class)
2928
public class JULProvider extends Provider {
3029
public JULProvider() {
3130
super(20, "3.0.0", JULLoggerContextFactory.class, null);

log4j-to-jul/src/test/java/org/apache/logging/log4j/tojul/test/LoggerTest.java renamed to log4j-to-jul/src/test/java/org/apache/logging/log4j/tojul/LoggerTest.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* See the License for the specific language governing permissions and
1515
* limitations under the License.
1616
*/
17-
package org.apache.logging.log4j.tojul.test;
17+
package org.apache.logging.log4j.tojul;
1818

1919
import static org.assertj.core.api.Assertions.assertThat;
2020

@@ -24,7 +24,6 @@
2424
import java.util.logging.Level;
2525
import java.util.logging.LogRecord;
2626
import org.apache.logging.log4j.LogManager;
27-
import org.apache.logging.log4j.tojul.JULLogger;
2827
import org.junit.jupiter.api.AfterEach;
2928
import org.junit.jupiter.api.BeforeEach;
3029
import org.junit.jupiter.api.Test;

0 commit comments

Comments
 (0)