diff --git a/_service b/_service index a3387da..4a8320c 100644 --- a/_service +++ b/_service @@ -2,7 +2,7 @@ git https://github.com/qos-ch/reload4j.git - v_1.2.20 + v_1.2.25 v_* @PARENT_TAG@ v_(.*) diff --git a/reload4j-1.2.20.tar.xz b/reload4j-1.2.20.tar.xz deleted file mode 100644 index efe9891..0000000 --- a/reload4j-1.2.20.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:bcfdd87448ae5316488ff58b21ea3e31c92d397112334fccc78bd79d582bbc46 -size 421624 diff --git a/reload4j-1.2.25.tar.xz b/reload4j-1.2.25.tar.xz new file mode 100644 index 0000000..6bb948e --- /dev/null +++ b/reload4j-1.2.25.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d0bfceb8367939a5a69e9b63bdfb58fc27bde6bf12e27d80d580873d325cf46a +size 417736 diff --git a/reload4j-build.xml b/reload4j-build.xml index 1af8987..b97b886 100644 --- a/reload4j-build.xml +++ b/reload4j-build.xml @@ -10,9 +10,10 @@ - + - + + @@ -61,6 +62,7 @@ debug="true" optimize="false" deprecation="true" + release="${compiler.release}" target="${compiler.target}" verbose="false" fork="false" @@ -90,6 +92,7 @@ debug="true" optimize="false" deprecation="true" + release="${compiler.release}" target="${compiler.target}" verbose="false" fork="false" @@ -215,6 +218,7 @@ basedir="${build.outputDir}" excludes="**/package.html"> + @@ -227,8 +231,8 @@ - - + + diff --git a/reload4j-java1.patch b/reload4j-java1.patch index 99eb9d5..9230345 100644 --- a/reload4j-java1.patch +++ b/reload4j-java1.patch @@ -1,11 +1,13 @@ ---- reload4j-1.2.19/src/main/java/org/apache/log4j/MDC.java 2022-02-23 08:05:01.051452323 +0100 -+++ reload4j-1.2.19/src/main/java/org/apache/log4j/MDC.java 2022-02-23 08:05:39.546646231 +0100 -@@ -47,7 +47,7 @@ +diff --git a/src/main/java/org/apache/log4j/MDC.java b/src/main/java/org/apache/log4j/MDC.java +index 5805772..fdcfeed 100755 +--- a/src/main/java/org/apache/log4j/MDC.java ++++ b/src/main/java/org/apache/log4j/MDC.java +@@ -45,7 +45,7 @@ public class MDC { static final int HT_SIZE = 7; - // boolean java1; + boolean java1; - ThreadLocalMap tlm; + Object tlm; diff --git a/reload4j.spec b/reload4j.spec index a27f3fe..5bbdcc4 100644 --- a/reload4j.spec +++ b/reload4j.spec @@ -1,7 +1,7 @@ # # spec file for package reload4j # -# Copyright (c) 2022 SUSE LLC +# Copyright (c) 2023 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -18,7 +18,7 @@ %bcond_with tests Name: reload4j -Version: 1.2.20 +Version: 1.2.25 Release: 0 Summary: Revival of EOLed log4j 1.x License: Apache-2.0