From c7ad1c78f23d713702fbab89c28b31c72760f704 Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Oct 13 2019 08:20:19 +0000 Subject: update to version 1.4.0 --- diff --git a/.gitignore b/.gitignore index 2b350ab..0b95b5c 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,9 @@ +/results_* +/*.src.rpm + /jettison-1.3.1-sources.jar /jettison-1.3.1.tar.bz2 /jettison-1.3.3.tar.xz /jettison-1.3.4.tar.xz /jettison-1.3.7.tar.gz +/jettison-1.4.0.tar.gz diff --git a/jettison-update-woodstox-version.patch b/jettison-update-woodstox-version.patch deleted file mode 100644 index a42d64c..0000000 --- a/jettison-update-woodstox-version.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- a/pom.xml -+++ b/pom.xml -@@ -26,9 +26,9 @@ - 1.0.1 - - -- woodstox -- wstx-asl -- 3.2.2 -+ org.codehaus.woodstox -+ woodstox-core-asl -+ 4.1.2 - test - - diff --git a/jettison.spec b/jettison.spec index 2ab333a..0ec27db 100644 --- a/jettison.spec +++ b/jettison.spec @@ -1,22 +1,18 @@ Name: jettison -Version: 1.3.7 -Release: 9%{?dist} -Summary: A JSON StAX implementation +Summary: JSON StAX implementation +Version: 1.4.0 +Release: 1%{?dist} License: ASL 2.0 -URL: http://jettison.codehaus.org/ -BuildArch: noarch -Source0: https://github.com/codehaus/jettison/archive/%{name}-%{version}.tar.gz +URL: https://github.com/jettison-json/jettison +Source0: %{url}/archive/%{name}-%{version}.tar.gz -# Change the POM to use the version of woodstox that we have available: -Patch0: %{name}-update-woodstox-version.patch +BuildArch: noarch BuildRequires: maven-local +BuildRequires: mvn(com.fasterxml.woodstox:woodstox-core) BuildRequires: mvn(junit:junit) BuildRequires: mvn(org.apache.felix:maven-bundle-plugin) -BuildRequires: mvn(org.codehaus:codehaus-parent:pom:) -BuildRequires: mvn(org.codehaus.woodstox:woodstox-core-asl) -BuildRequires: mvn(stax:stax-api) %description Jettison is a collection of Java APIs (like STaX and DOM) which read @@ -32,29 +28,31 @@ This package contains the API documentation for %{name}. %prep %setup -q -n %{name}-%{name}-%{version} -%patch0 -p1 -# We don't need wagon-webdav -%pom_xpath_remove pom:build/pom:extensions %pom_remove_plugin :maven-release-plugin +%pom_remove_plugin :nexus-staging-maven-plugin # Confuses maven-bundle-plugin %pom_xpath_remove pom:Private-Package %build -# Disable the tests until BZ#796739 is fixed: -%mvn_build -f +%mvn_build %install %mvn_install %files -f .mfiles -%doc src/main/resources/META-INF/LICENSE +%license LICENSE +%doc README.md %files javadoc -f .mfiles-javadoc -%doc src/main/resources/META-INF/LICENSE +%license LICENSE +%doc README.md %changelog +* Sun Oct 13 2019 Fabio Valentini - 1.4.0-1 +- Update to version 1.4.0. + * Thu Jul 25 2019 Fedora Release Engineering - 1.3.7-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild diff --git a/sources b/sources index ec8347e..4b3143f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -3506a85acc5d6c3e6fbfa7801abe8a7a jettison-1.3.7.tar.gz +SHA512 (jettison-1.4.0.tar.gz) = ffedb65b4dccfdb74ffcaa701809fb3da54e2c2bf0d806688cf35b36a2b2bfe8290422e4f31ba2345ebd86bff66e65f05b0142f04dab31aec913ee3ac8139a49