Fridrich Strba 2023-10-17 20:38:51 +00:00 committed by Git OBS Bridge
parent 28a60cec28
commit c5b950c4fe
6 changed files with 20 additions and 14 deletions

View File

@ -2,7 +2,7 @@
<service name="tar_scm" mode="disabled">
<param name="scm">git</param>
<param name="url">https://github.com/qos-ch/reload4j.git</param>
<param name="revision">v_1.2.20</param>
<param name="revision">v_1.2.25</param>
<param name="match-tag">v_*</param>
<param name="versionformat">@PARENT_TAG@</param>
<param name="versionrewrite-pattern">v_(.*)</param>

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:bcfdd87448ae5316488ff58b21ea3e31c92d397112334fccc78bd79d582bbc46
size 421624

BIN
reload4j-1.2.25.tar.xz (Stored with Git LFS) Normal file

Binary file not shown.

View File

@ -10,9 +10,10 @@
<property name="project.groupId" value="ch.qos.reload4j"/>
<property name="project.artifactId" value="reload4j"/>
<property name="project.version" value="1.2.20"/>
<property name="project.version" value="1.2.25"/>
<property name="compiler.source" value="1.8"/>
<property name="compiler.release" value="8"/>
<property name="compiler.source" value="1.${compiler.release}"/>
<property name="compiler.target" value="${compiler.source}"/>
<property name="build.finalName" value="${project.artifactId}-${project.version}"/>
@ -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">
<manifest>
<attribute name="Automatic-Module-Name" value="${project.groupId}"/>
<attribute name="Bundle-Description" value="Reload4j revives EOLed log4j 1.x"/>
<attribute name="Bundle-DocURL" value="https://reload4j.qos.ch/"/>
<attribute name="Bundle-License" value="http://www.apache.org/licenses/LICENSE-2.0.txt"/>
@ -227,8 +231,8 @@
<attribute name="Implementation-Title" value="${project.artifactId}"/>
<attribute name="Implementation-Vendor" value="QOS.CH Sarl (Switzerland)"/>
<attribute name="Implementation-Version" value="${project.version}"/>
<attribute name="Import-Package" value="javax.jmdns;resolution:=optional,javax.jms;resolution:=optional,javax.mail.internet;version=&quot;[1.4,2)&quot;;resolution:=optional,javax.mail;version=&quot;[1.4,2)&quot;;resolution:=optional,javax.naming,javax.xml.parsers,org.w3c.dom,org.xml.sax,org.xml.sax.helpers"/>
<attribute name="Require-Capability" value="osgi.ee;filter:=&quot;(&amp;(osgi.ee=JavaSE)(version=1.6))&quot;"/>
<attribute name="Import-Package" value="javax.jmdns;resolution:=optional,javax.jms;resolution:=optional,javax.mail.internet;resolution:=optional,javax.mail;resolution:=optional,javax.naming,javax.xml.parsers,org.w3c.dom,org.xml.sax,org.xml.sax.helpers"/>
<attribute name="Require-Capability" value="osgi.ee;filter:=&quot;(&amp;(osgi.ee=JavaSE)(version=${compiler.target}))&quot;"/>
<attribute name="X-Compile-Source-JDK" value="${compiler.source}"/>
<attribute name="X-Compile-Target-JDK" value="${compiler.target}"/>
</manifest>

View File

@ -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;

View File

@ -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