[jackson-module-mrbean] update to 2.4.1
gil
gil at fedoraproject.org
Fri Jul 4 09:19:41 UTC 2014
commit 46387c0269a9c8e6ed239f888fb929c419010723
Author: gil <puntogil at libero.it>
Date: Fri Jul 4 11:19:45 2014 +0200
update to 2.4.1
.gitignore | 1 +
LICENSE-2.0.txt | 202 --------------------------------------------
jackson-module-mrbean.spec | 47 +++++++---
sources | 2 +-
4 files changed, 34 insertions(+), 218 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index de2ff06..0f5f484 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
/jackson-module-mrbean-2.2.2.tar.gz
+/jackson-module-mrbean-2.4.1.tar.gz
diff --git a/jackson-module-mrbean.spec b/jackson-module-mrbean.spec
index bd71099..bcd570a 100644
--- a/jackson-module-mrbean.spec
+++ b/jackson-module-mrbean.spec
@@ -1,20 +1,19 @@
Name: jackson-module-mrbean
-Version: 2.2.2
-Release: 4%{?dist}
+Version: 2.4.1
+Release: 1%{?dist}
Summary: An extension that implements support for POJO type materialization
License: ASL 2.0
URL: http://wiki.fasterxml.com/JacksonFeatureMaterializedBeans
Source0: https://github.com/FasterXML/jackson-module-mrbean/archive/%{name}-%{version}.tar.gz
-# jackson-module-mrbean package don't include the license file
-# reported @ https://github.com/FasterXML/jackson-module-mrbean/issues/8
-Source1: http://www.apache.org/licenses/LICENSE-2.0.txt
-BuildRequires: java-devel
-
-BuildRequires: mvn(com.fasterxml:oss-parent)
+%if %{?fedora} > 20
+BuildRequires: mvn(com.fasterxml.jackson:jackson-parent:pom:)
+%else
+BuildRequires: mvn(com.fasterxml.jackson:jackson-parent)
+%endif
BuildRequires: mvn(com.fasterxml.jackson.core:jackson-core)
BuildRequires: mvn(com.fasterxml.jackson.core:jackson-databind)
-BuildRequires: mvn(org.ow2.asm:asm)
+BuildRequires: mvn(org.ow2.asm:asm) >= 5.0.2
# test deps
BuildRequires: mvn(junit:junit)
@@ -45,10 +44,25 @@ This package contains javadoc for %{name}.
%prep
%setup -q -n %{name}-%{name}-%{version}
-cp -p %{SOURCE1} .
-sed -i 's/\r//' LICENSE-2.0.txt
-# disabled asm4 embedded copy
+# disabled asm embedded copy
%pom_remove_plugin :maven-shade-plugin
+%pom_xpath_remove "pom:properties/pom:osgi.private"
+%pom_xpath_remove "pom:properties/pom:osgi.import"
+%pom_xpath_inject "pom:properties" "
+ <osgi.import>
+com.fasterxml.jackson.core
+,com.fasterxml.jackson.core.type
+,com.fasterxml.jackson.core.util
+,com.fasterxml.jackson.databind
+,com.fasterxml.jackson.databind.cfg
+,com.fasterxml.jackson.databind.module,
+,com.fasterxml.jackson.databind.type
+,org.objectweb.asm.*
+</osgi.import>"
+
+cp -p src/main/resources/META-INF/LICENSE .
+cp -p src/main/resources/META-INF/NOTICE .
+sed -i 's/\r//' LICENSE NOTICE
%build
@@ -59,12 +73,15 @@ sed -i 's/\r//' LICENSE-2.0.txt
%mvn_install
%files -f .mfiles
-%doc LICENSE-2.0.txt README.md
+%doc LICENSE NOTICE README.md
%files javadoc -f .mfiles-javadoc
-%doc LICENSE-2.0.txt
+%doc LICENSE NOTICE
%changelog
+* Thu Jul 03 2014 gil cattaneo <puntogil at libero.it> 2.4.1-1
+- update to 2.4.1
+
* Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.2.2-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
@@ -82,4 +99,4 @@ sed -i 's/\r//' LICENSE-2.0.txt
- renamed jackson2-module-mrbean
* Thu Sep 13 2012 gil cattaneo <puntogil at libero.it> 2.0.5-1
-- initial rpm
\ No newline at end of file
+- initial rpm
diff --git a/sources b/sources
index b675bf9..a7a39c0 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-b0f3f7655a39ff55015008c0a6827f32 jackson-module-mrbean-2.2.2.tar.gz
+b81b2c2c82d912a05ac5a86a029057ff jackson-module-mrbean-2.4.1.tar.gz
More information about the scm-commits
mailing list