#1 update to version 1.2.15
Merged 19 days ago by decathorpe. Opened 2 months ago by decathorpe.
Unknown source master  into  master

file modified
+4 -1

@@ -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

00-xmlstreambuffer-1.5.patch glassfish-fastinfoset-1.2.12-utilities-FastInfosetWriterSAXBufferProcessor.patch
file renamed
+10 -8

@@ -1,6 +1,8 @@

- --- 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 @@

+ 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;

           

@@ -11,7 +13,7 @@

               case STATE_DOCUMENT:

                   processDocument();

                   break;

- @@ -123,8 +123,8 @@

+ @@ -123,8 +123,8 @@ public final class FastInfosetWriterSAXBufferProcessor extends AbstractProcessor

           boolean firstElementHasOccured = false;

           int item;

           do {

@@ -22,7 +24,7 @@

                   case STATE_ELEMENT_U_LN_QN:

                       firstElementHasOccured = true;

                       processElement(readStructureString(), readStructureString(), readStructureString());

- @@ -186,8 +186,8 @@

+ @@ -186,8 +186,8 @@ public final class FastInfosetWriterSAXBufferProcessor extends AbstractProcessor

           } while(item != T_END || !firstElementHasOccured);

   

           while(item != T_END) {

@@ -33,7 +35,7 @@

                   case STATE_COMMENT_AS_CHAR_ARRAY_SMALL:

                   {

                       final int length = readStructure();

- @@ -244,7 +244,7 @@

+ @@ -244,7 +244,7 @@ public final class FastInfosetWriterSAXBufferProcessor extends AbstractProcessor

           }

   

           do {

@@ -42,7 +44,7 @@

               switch(item) {

                   case STATE_ELEMENT_U_LN_QN:

                       processElement(readStructureString(), readStructureString(), readStructureString());

- @@ -365,7 +365,7 @@

+ @@ -365,7 +365,7 @@ public final class FastInfosetWriterSAXBufferProcessor extends AbstractProcessor

       

       private int processNamespaceAttributes(int item) throws SAXException {

           do {

@@ -51,7 +53,7 @@

                   case STATE_NAMESPACE_ATTRIBUTE:

                       // Undeclaration of default namespace

                       processNamespaceAttribute("", "");

- @@ -398,7 +398,7 @@

+ @@ -398,7 +398,7 @@ public final class FastInfosetWriterSAXBufferProcessor extends AbstractProcessor

       

       private void processAttributes(int item) throws SAXException {

           do {

file modified
+29 -17

@@ -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 @@

  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 @@

  %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 <decathorpe@gmail.com> - 1.2.15-1

+ - Update to version 1.2.15.

+ 

  * Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.13-12

  - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild

  

file modified
+1 -2

@@ -1,2 +1,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

  • update to latest version with the same artifactId (1.2.13 → 1.2.15)
  • rebase patch for xmlstreambuffer 1.5 compatibility
  • include script to generate clean tarball
  • remove module-info.java files to fix builds on JDK8

Test rebuilds of recursively dependent packages were done in COPR, and were successful:

https://copr.fedorainfracloud.org/coprs/decathorpe/glassfish-fastinfoset-1.2.15-pr/monitor/

The build failures that occurred are expected:

  • bval: aready FTBFS in rawhide
  • jaxb2-maven-plugin: missing dependencies
  • openjpa: missing dependencies
  • resteasy: missing dependencies

Shipping it is fine. metro-fi vs glassfish-fastinfoset vs jaxb-fi ugh. :)

I'm not personally as happy with the whole generated tarball thing. I'd prefer to keep the tarball as-is (and modify it only in the .spec during build) unless it has bad license stuff (like jsoup did).

In this case, the repository contains a prebuilt JAR of the same project, plus a whole lot of unrelated stuff that seems to have been exported at the same time from SVN ... we are only interested in the code directory from upstream, we don't need anything else.

If you want, I can use the "upstream tarball" from git directly, instead. I don't think there's a "legal" reason not to do that (since the only prebuild JAR is for FastInfoset itself).

rebased onto abe1200

a month ago

@cipherboy fixed it to use the upstream tarball and clean things up in the .spec.

Pull-Request has been merged by decathorpe

19 days ago