From dae9cfa6d95c7d3e1cb6468a56df884e0b35f2f2 Mon Sep 17 00:00:00 2001 From: gil Date: Sep 28 2015 15:36:58 +0000 Subject: update to 2.6.2 --- diff --git a/.gitignore b/.gitignore index aeb64b5..3293118 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ /jackson-databind-2.4.1.3.tar.gz /jackson-databind-2.4.2.tar.gz /jackson-databind-2.5.0.tar.gz +/jackson-databind-2.6.2.tar.gz diff --git a/jackson-databind.spec b/jackson-databind.spec index 0938282..df0530b 100644 --- a/jackson-databind.spec +++ b/jackson-databind.spec @@ -1,29 +1,18 @@ Name: jackson-databind -Version: 2.5.0 -Release: 2%{?dist} +Version: 2.6.2 +Release: 1%{?dist} Summary: General data-binding package for Jackson (2.x) License: ASL 2.0 and LGPLv2+ URL: http://wiki.fasterxml.com/JacksonHome Source0: https://github.com/FasterXML/jackson-databind/archive/%{name}-%{version}.tar.gz -%if %{?fedora} > 20 + +BuildRequires: maven-local BuildRequires: mvn(com.fasterxml.jackson:jackson-parent:pom:) -%else -BuildRequires: mvn(com.fasterxml.jackson:jackson-parent) -%endif BuildRequires: mvn(com.fasterxml.jackson.core:jackson-annotations) >= 2.4.1 BuildRequires: mvn(com.fasterxml.jackson.core:jackson-core) >= 2.4.1 -# test deps -BuildRequires: mvn(cglib:cglib) -BuildRequires: mvn(junit:junit) -BuildRequires: mvn(org.codehaus.groovy:groovy) - -BuildRequires: maven-local -BuildRequires: replacer -# bundle-plugin Requires -#BuildRequires: mvn(org.sonatype.aether:aether) - -Provides: jackson2-databind = %{version}-%{release} -Obsoletes: jackson2-databind < %{version}-%{release} +BuildRequires: mvn(com.google.code.maven-replacer-plugin:replacer) +BuildRequires: mvn(org.powermock:powermock-api-mockito) +BuildRequires: mvn(org.powermock:powermock-module-junit4) BuildArch: noarch @@ -45,10 +34,15 @@ cp -p src/main/resources/META-INF/NOTICE . sed -i 's/\r//' LICENSE NOTICE # unavailable test deps -%pom_remove_dep org.hibernate:hibernate-cglib-repack -rm src/test/java/com/fasterxml/jackson/databind/interop/TestHibernate.java %pom_remove_dep javax.measure:jsr-275 -rm src/test/java/com/fasterxml/jackson/databind/deser/TestNoClassDefFoundDeserializer.java +rm src/test/java/com/fasterxml/jackson/databind/introspect/NoClassDefFoundWorkaroundTest.java +%pom_xpath_remove pom:classpathDependencyExcludes + +%pom_xpath_inject "pom:plugin[pom:artifactId='maven-javadoc-plugin']/pom:configuration" "-Xdoclint:none" +%pom_xpath_remove pom:failOnError + +# org.powermock.reflect.exceptions.FieldNotFoundException: Field 'fTestClass' was not found in class org.junit.internal.runners.MethodValidator. +rm src/test/java/com/fasterxml/jackson/databind/type/TestTypeFactoryWithClassLoader.java # Off test that require connection with the web rm src/test/java/com/fasterxml/jackson/databind/ser/TestJdkTypes.java \ @@ -72,6 +66,9 @@ rm src/test/java/com/fasterxml/jackson/databind/ser/TestJdkTypes.java \ %license LICENSE NOTICE %changelog +* Mon Sep 28 2015 gil cattaneo 2.6.2-1 +- update to 2.6.2 + * Wed Jun 17 2015 Fedora Release Engineering - 2.5.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild diff --git a/sources b/sources index 8eb96c2..0c74e47 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -db922b6ffdd06a076a0c12ecf2ed5ff1 jackson-databind-2.5.0.tar.gz +033f928c32c66b4147fb7634df519365 jackson-databind-2.6.2.tar.gz