update to 3.3.0.Final

This commit is contained in:
gil 2016-05-27 09:24:39 +02:00
parent 4cdf1241fa
commit 790ce483ab
4 changed files with 16 additions and 36 deletions

1
.gitignore vendored
View File

@ -4,3 +4,4 @@
/jboss-logging-3.1.2.GA.tar.xz
/3.1.3.GA.tar.gz
/3.1.4.GA.tar.gz
/3.3.0.Final.tar.gz

View File

@ -1,24 +0,0 @@
From 43ff272e418b7c2699d60fc930d5c97d8a4ebd82 Mon Sep 17 00:00:00 2001
From: Marek Goldmann <marek.goldmann@gmail.com>
Date: Tue, 1 Jul 2014 14:26:35 +0200
Subject: [PATCH] SLF4j 1.7 upgrade
---
src/main/java/org/jboss/logging/Slf4jLoggerProvider.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/main/java/org/jboss/logging/Slf4jLoggerProvider.java b/src/main/java/org/jboss/logging/Slf4jLoggerProvider.java
index 0eedf16..4434838 100644
--- a/src/main/java/org/jboss/logging/Slf4jLoggerProvider.java
+++ b/src/main/java/org/jboss/logging/Slf4jLoggerProvider.java
@@ -55,6 +55,6 @@ final class Slf4jLoggerProvider extends AbstractLoggerProvider implements Logger
@SuppressWarnings({ "unchecked" })
public Map<String, Object> getMdcMap() {
- return MDC.getCopyOfContextMap();
+ return (Map) MDC.getCopyOfContextMap();
}
}
--
1.9.3

View File

@ -1,31 +1,29 @@
%global namedreltag .GA
%global namedreltag .Final
%global namedversion %{version}%{?namedreltag}
Name: jboss-logging
Version: 3.1.4
Release: 6%{?dist}
Version: 3.3.0
Release: 1%{?dist}
Summary: The JBoss Logging Framework
License: ASL 2.0
URL: https://github.com/jboss-logging/jboss-logging
Source0: https://github.com/jboss-logging/jboss-logging/archive/%{namedversion}.tar.gz
Patch0: 0001-SLF4j-1.7-upgrade.patch
BuildArch: noarch
BuildRequires: git
BuildRequires: graphviz
BuildRequires: maven-local
BuildRequires: mvn(jdepend:jdepend)
BuildRequires: mvn(log4j:log4j:12)
BuildRequires: mvn(org.apache.felix:maven-bundle-plugin)
BuildRequires: mvn(org.apache.logging.log4j:log4j-api)
BuildRequires: mvn(org.apache.maven.plugins:maven-enforcer-plugin)
BuildRequires: mvn(org.codehaus.mojo:buildnumber-maven-plugin)
BuildRequires: mvn(org.jboss:jboss-parent:pom:)
BuildRequires: mvn(org.jboss.apiviz:apiviz)
BuildRequires: mvn(org.jboss.logmanager:jboss-logmanager)
BuildRequires: mvn(org.slf4j:slf4j-api)
# Missing apiviz dep ...
BuildRequires: mvn(jdepend:jdepend)
%description
This package contains the JBoss Logging Framework.
@ -39,12 +37,14 @@ This package contains the API documentation for %{name}.
%prep
%setup -q -n jboss-logging-%{namedversion}
%patch0 -p1
%pom_xpath_set pom:properties/pom:version.org.apache.log4j 12
%pom_change_dep log4j: ::12
# Unneeded task
%pom_remove_plugin :maven-source-plugin
cp -p src/main/resources/META-INF/LICENSE.txt .
sed -i 's/\r//' LICENSE.txt
%build
%mvn_build -f
@ -52,12 +52,15 @@ This package contains the API documentation for %{name}.
%mvn_install
%files -f .mfiles
%license src/main/resources/META-INF/LICENSE.txt
%license LICENSE.txt
%files javadoc -f .mfiles-javadoc
%license src/main/resources/META-INF/LICENSE.txt
%license LICENSE.txt
%changelog
* Fri May 27 2016 gil cattaneo <puntogil@libero.it> 3.3.0-1
- update to 3.3.0.Final
* Sun Feb 14 2016 gil cattaneo <puntogil@libero.it> 3.1.4-6
- fix FTBFS rhbz#1307647
- fix BR list and use BR mvn()-like

View File

@ -1 +1 @@
a1af333465218ce76fd449b02391950a 3.1.4.GA.tar.gz
c432e0076d1d5fd06a191d72f191943a 3.3.0.Final.tar.gz