From abe12008038503db94ff6bd23d043065a76508ed Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Nov 11 2019 20:47:16 +0000 Subject: update to version 1.2.15 --- diff --git a/.gitignore b/.gitignore index fc27e10..3a5e0d7 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,6 @@ +/results_* +/*.src.rpm + /glassfish-fastinfoset-1.2.12-src-svn.tar.gz /glassfish-fastinfoset-1.2.13-src-svn.tar.gz -/LICENSE-2.0.txt +/metro-fi-1.2.15.tar.gz diff --git a/00-xmlstreambuffer-1.5.patch b/00-xmlstreambuffer-1.5.patch new file mode 100644 index 0000000..392a81e --- /dev/null +++ b/00-xmlstreambuffer-1.5.patch @@ -0,0 +1,64 @@ +diff --git a/utilities/src/main/java/com/sun/xml/fastinfoset/streambuffer/FastInfosetWriterSAXBufferProcessor.java b/utilities/src/main/java/com/sun/xml/fastinfoset/streambuffer/FastInfosetWriterSAXBufferProcessor.java +index d039cdb..aa95623 100644 +--- a/utilities/src/main/java/com/sun/xml/fastinfoset/streambuffer/FastInfosetWriterSAXBufferProcessor.java ++++ b/utilities/src/main/java/com/sun/xml/fastinfoset/streambuffer/FastInfosetWriterSAXBufferProcessor.java +@@ -71,8 +71,8 @@ public final class FastInfosetWriterSAXBufferProcessor extends AbstractProcessor + public final void process(FastInfosetWriter writer) throws SAXException { + _writer = writer; + +- final int item = readStructure(); +- switch(_eiiStateTable[item]) { ++ final int item = getEIIState(readStructure()); ++ switch(item) { + case STATE_DOCUMENT: + processDocument(); + break; +@@ -123,8 +123,8 @@ public final class FastInfosetWriterSAXBufferProcessor extends AbstractProcessor + boolean firstElementHasOccured = false; + int item; + do { +- item = readStructure(); +- switch(_eiiStateTable[item]) { ++ item = getEIIState(readStructure()); ++ switch(item) { + case STATE_ELEMENT_U_LN_QN: + firstElementHasOccured = true; + processElement(readStructureString(), readStructureString(), readStructureString()); +@@ -186,8 +186,8 @@ public final class FastInfosetWriterSAXBufferProcessor extends AbstractProcessor + } while(item != T_END || !firstElementHasOccured); + + while(item != T_END) { +- item = readStructure(); +- switch(_eiiStateTable[item]) { ++ item = getEIIState(readStructure()); ++ switch(item) { + case STATE_COMMENT_AS_CHAR_ARRAY_SMALL: + { + final int length = readStructure(); +@@ -244,7 +244,7 @@ public final class FastInfosetWriterSAXBufferProcessor extends AbstractProcessor + } + + do { +- item = _eiiStateTable[readStructure()]; ++ item = getEIIState(readStructure()); + switch(item) { + case STATE_ELEMENT_U_LN_QN: + processElement(readStructureString(), readStructureString(), readStructureString()); +@@ -365,7 +365,7 @@ public final class FastInfosetWriterSAXBufferProcessor extends AbstractProcessor + + private int processNamespaceAttributes(int item) throws SAXException { + do { +- switch(_niiStateTable[item]) { ++ switch(getNIIState(item)) { + case STATE_NAMESPACE_ATTRIBUTE: + // Undeclaration of default namespace + processNamespaceAttribute("", ""); +@@ -398,7 +398,7 @@ public final class FastInfosetWriterSAXBufferProcessor extends AbstractProcessor + + private void processAttributes(int item) throws SAXException { + do { +- switch(_aiiStateTable[item]) { ++ switch(getAIIState(item)) { + case STATE_ATTRIBUTE_U_LN_QN: + _attributes.addAttribute(readStructureString(), readStructureString(), readStructureString(), readStructureString(), readContentString()); + break; diff --git a/glassfish-fastinfoset-1.2.12-utilities-FastInfosetWriterSAXBufferProcessor.patch b/glassfish-fastinfoset-1.2.12-utilities-FastInfosetWriterSAXBufferProcessor.patch deleted file mode 100644 index b56231f..0000000 --- a/glassfish-fastinfoset-1.2.12-utilities-FastInfosetWriterSAXBufferProcessor.patch +++ /dev/null @@ -1,62 +0,0 @@ ---- utilities/src/main/java/com/sun/xml/fastinfoset/streambuffer/FastInfosetWriterSAXBufferProcessor.java 2011-03-30 23:52:37.000000000 +0200 -+++ utilities/src/main/java/com/sun/xml/fastinfoset/streambuffer/FastInfosetWriterSAXBufferProcessor.java-gil 2012-03-31 14:44:06.180707216 +0200 -@@ -71,8 +71,8 @@ - public final void process(FastInfosetWriter writer) throws SAXException { - _writer = writer; - -- final int item = readStructure(); -- switch(_eiiStateTable[item]) { -+ final int item = getEIIState(readStructure()); -+ switch(item) { - case STATE_DOCUMENT: - processDocument(); - break; -@@ -123,8 +123,8 @@ - boolean firstElementHasOccured = false; - int item; - do { -- item = readStructure(); -- switch(_eiiStateTable[item]) { -+ item = getEIIState(readStructure()); -+ switch(item) { - case STATE_ELEMENT_U_LN_QN: - firstElementHasOccured = true; - processElement(readStructureString(), readStructureString(), readStructureString()); -@@ -186,8 +186,8 @@ - } while(item != T_END || !firstElementHasOccured); - - while(item != T_END) { -- item = readStructure(); -- switch(_eiiStateTable[item]) { -+ item = getEIIState(readStructure()); -+ switch(item) { - case STATE_COMMENT_AS_CHAR_ARRAY_SMALL: - { - final int length = readStructure(); -@@ -244,7 +244,7 @@ - } - - do { -- item = _eiiStateTable[readStructure()]; -+ item = getEIIState(readStructure()); - switch(item) { - case STATE_ELEMENT_U_LN_QN: - processElement(readStructureString(), readStructureString(), readStructureString()); -@@ -365,7 +365,7 @@ - - private int processNamespaceAttributes(int item) throws SAXException { - do { -- switch(_niiStateTable[item]) { -+ switch(getNIIState(item)) { - case STATE_NAMESPACE_ATTRIBUTE: - // Undeclaration of default namespace - processNamespaceAttribute("", ""); -@@ -398,7 +398,7 @@ - - private void processAttributes(int item) throws SAXException { - do { -- switch(_aiiStateTable[item]) { -+ switch(getAIIState(item)) { - case STATE_ATTRIBUTE_U_LN_QN: - _attributes.addAttribute(readStructureString(), readStructureString(), readStructureString(), readStructureString(), readContentString()); - break; diff --git a/glassfish-fastinfoset.spec b/glassfish-fastinfoset.spec index 23082e3..ae00d5e 100644 --- a/glassfish-fastinfoset.spec +++ b/glassfish-fastinfoset.spec @@ -1,18 +1,18 @@ +%global srcname metro-fi + Name: glassfish-fastinfoset -Version: 1.2.13 -Release: 12%{?dist} +Version: 1.2.15 +Release: 1%{?dist} Summary: Fast Infoset License: ASL 2.0 -URL: https://fi.java.net -# svn export https://svn.java.net/svn/fi~svn/tags/fastinfoset-project-1.2.13/ glassfish-fastinfoset-1.2.13 -# find glassfish-fastinfoset-1.2.13/ -name '*.class' -delete -# find glassfish-fastinfoset-1.2.13/ -name '*.jar' -delete -# rm -rf glassfish-fastinfoset-1.2.13/roundtrip-tests -# tar czf glassfish-fastinfoset-1.2.13-src-svn.tar.gz glassfish-fastinfoset-1.2.13 -Source0: %{name}-%{version}-src-svn.tar.gz -Source1: http://www.apache.org/licenses/LICENSE-2.0.txt + +# NOTE: The new upstream repository under the Eclipse EE4J umbrella is here: +# https://github.com/eclipse-ee4j/jaxb-fi +URL: https://github.com/javaee/%{srcname} +Source0: %{url}/archive/%{version}-RELEASE/%{srcname}-%{version}.tar.gz + # add xmlstreambuffer 1.5.x support -Patch0: %{name}-1.2.12-utilities-FastInfosetWriterSAXBufferProcessor.patch +Patch0: 00-xmlstreambuffer-1.5.patch BuildRequires: maven-local BuildRequires: mvn(com.sun.xml.stream.buffer:streambuffer) @@ -38,17 +38,24 @@ Summary: Javadoc for %{name} This package contains javadoc for %{name}. %prep -%setup -q -%patch0 -p0 +%setup -q -n %{srcname}-%{version}-RELEASE -cp %{SOURCE1} . +# clean up gunk from the upstream tarball +rm -r FIME Japex JapexXMLDriverLibrary tools xml-data.zip.REMOVED.git-id +find -name "*.jar" -print -delete +mv code/* . +rmdir code + +%patch0 -p1 + +# presence of these files breaks the build +find -name "module-info.java" -print -delete # Remove wagon-webdav %pom_xpath_remove "pom:build/pom:extensions" %pom_remove_plugin :findbugs-maven-plugin %pom_remove_plugin :maven-antrun-extended-plugin -%pom_remove_plugin org.sonatype.plugins:nexus-staging-maven-plugin %pom_remove_plugin org.codehaus.mojo:buildnumber-maven-plugin %pom_disable_module roundtrip-tests @@ -72,12 +79,17 @@ cp %{SOURCE1} . %mvn_install %files -f .mfiles -%license copyright.txt LICENSE-2.0.txt +%license copyright.txt LICENSE +%doc README.md %files javadoc -f .mfiles-javadoc -%license copyright.txt LICENSE-2.0.txt +%license copyright.txt LICENSE +%doc README.md %changelog +* Fri Oct 18 2019 Fabio Valentini - 1.2.15-1 +- Update to version 1.2.15. + * Thu Jul 25 2019 Fedora Release Engineering - 1.2.13-12 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild diff --git a/sources b/sources index 50ee6be..8ca77c9 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -a7ff634a346a599c146ddd820c0979be glassfish-fastinfoset-1.2.13-src-svn.tar.gz -3b83ef96387f14655fc854ddc3c6bd57 LICENSE-2.0.txt +SHA512 (metro-fi-1.2.15.tar.gz) = c805994f1c0e2105a6a38ad98eb460edad4f97d6cac47e5c7a4f24ae8f15ff34b09b654acba60759055486e40544f655e99a63c569346a54d49a881518ceaf97