From be16c18366a3e2053d0c4959f5ec4073671156a1 Mon Sep 17 00:00:00 2001 From: Mat Booth Date: Jan 22 2018 14:17:24 +0000 Subject: Update to latest upstream release --- diff --git a/.gitignore b/.gitignore index baa770d..8be1ee8 100644 --- a/.gitignore +++ b/.gitignore @@ -1,10 +1,2 @@ -/jackson-core-2.2.2.tar.gz -/jackson-core-2.4.1.tar.gz -/jackson-core-2.4.1.1.tar.gz -/jackson-core-2.4.2.tar.gz -/jackson-core-2.5.0.tar.gz -/jackson-core-2.6.2.tar.gz -/jackson-core-2.6.3.tar.gz -/jackson-core-2.6.6.tar.gz -/jackson-core-2.6.7.tar.gz -/jackson-core-2.7.6.tar.gz +/jackson-core-*.tar.gz +/*.src.rpm diff --git a/jackson-core.spec b/jackson-core.spec index 026bbfe..50508b3 100644 --- a/jackson-core.spec +++ b/jackson-core.spec @@ -1,17 +1,17 @@ Name: jackson-core -Version: 2.7.6 -Release: 3%{?dist} +Version: 2.9.3 +Release: 1%{?dist} Summary: Core part of Jackson License: ASL 2.0 URL: http://wiki.fasterxml.com/JacksonHome Source0: https://github.com/FasterXML/jackson-core/archive/%{name}-%{version}.tar.gz -BuildRequires: maven-local -BuildRequires: mvn(com.fasterxml.jackson:jackson-parent:pom:) -BuildRequires: mvn(com.google.code.maven-replacer-plugin:replacer) -BuildRequires: mvn(junit:junit) +BuildRequires: maven-local +BuildRequires: mvn(com.fasterxml.jackson:jackson-base:pom:) +BuildRequires: mvn(com.google.code.maven-replacer-plugin:replacer) +BuildRequires: mvn(org.apache.felix:maven-bundle-plugin) -BuildArch: noarch +BuildArch: noarch %description Core part of Jackson that defines Streaming API as well @@ -26,16 +26,8 @@ This package contains javadoc for %{name}. %prep %setup -q -n %{name}-%{name}-%{version} -# remove unavailable com.google.doclava doclava 1.0.3 -%pom_xpath_remove "pom:reporting/pom:plugins/pom:plugin[pom:artifactId='maven-javadoc-plugin']/pom:configuration" -%pom_xpath_inject "pom:reporting/pom:plugins/pom:plugin[pom:artifactId='maven-javadoc-plugin']" ' - - ${project.reporting.outputEncoding} - true - ${javac.src.version} -' - -%pom_xpath_remove "pom:build/pom:plugins/pom:plugin[pom:artifactId='maven-javadoc-plugin']/pom:executions" +# Remove plugins unnecessary for RPM builds +%pom_remove_plugin ":maven-enforcer-plugin" cp -p src/main/resources/META-INF/LICENSE . cp -p src/main/resources/META-INF/NOTICE . @@ -44,7 +36,6 @@ sed -i 's/\r//' LICENSE NOTICE %mvn_file : %{name} %build - %mvn_build -- -Dmaven.test.failure.ignore=true %install @@ -58,6 +49,9 @@ sed -i 's/\r//' LICENSE NOTICE %license LICENSE NOTICE %changelog +* Thu Jan 11 2018 Mat Booth - 2.9.3-1 +- Update to latest upstream release + * Wed Jul 26 2017 Fedora Release Engineering - 2.7.6-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild diff --git a/sources b/sources index 832174e..c48484d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -8439e0b53e89f293d12a2f0f4dc05222 jackson-core-2.7.6.tar.gz +SHA512 (jackson-core-2.9.3.tar.gz) = 09bcd9f6e300c3824b3f1b41d58c192b975413507392084ab5cbfec235a0d1b0eb8e3067df38162602fe8b33348cf64dc7aa3bc0514f7cb94bc5fd02e3caba45