Attachment 635464 Details for Bug 871356 – Updated to upstream version 2.2.6

[patch] Updated to upstream version 2.2.6

0001-Updated-to-upstream-version-2.2.6.patch (text/plain), 19.79 KB, created by gil cattaneo on 2012-10-30 10:15:16 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: gil cattaneo

Created: 2012-10-30 10:15:16 UTC

Size: 19.79 KB

patch

obsolete

>From ae559107e954228784b5e1210db1adc8399a4ef6 Mon Sep 17 00:00:00 2001
>From: gil <puntogil@libero.it>
>Date: Tue, 30 Oct 2012 11:11:19 +0100
>Subject: [PATCH] Updated to upstream version 2.2.6
>
>---
> .gitignore                                         |    1 +
> glassfish-jaxb-2.2.6-dont-build-examples.patch     |   25 ++++
> ...axb-2.2.6-remove-classpath-from-manifests.patch |   20 +++
> glassfish-jaxb.spec                                |   50 +++++----
> jaxb-impl-2.2.6.pom                                |  127 ++++++++++++++++++++
> jaxb-xjc-2.2.6.pom                                 |  117 ++++++++++++++++++
> sources                                            |    2 +-
> 7 files changed, 319 insertions(+), 23 deletions(-)
> create mode 100644 glassfish-jaxb-2.2.6-dont-build-examples.patch
> create mode 100644 glassfish-jaxb-2.2.6-remove-classpath-from-manifests.patch
> create mode 100644 jaxb-impl-2.2.6.pom
> create mode 100644 jaxb-xjc-2.2.6.pom
>
>diff --git a/.gitignore b/.gitignore
>index e6f2579..34d71d9 100644
>--- a/.gitignore
>+++ b/.gitignore
>@@ -1 +1,2 @@
> /glassfish-jaxb-2.2.5.tar.gz
>+/glassfish-jaxb-2.2.6.tar.gz
>diff --git a/glassfish-jaxb-2.2.6-dont-build-examples.patch b/glassfish-jaxb-2.2.6-dont-build-examples.patch
>new file mode 100644
>index 0000000..2c9cba3
>--- /dev/null
>+++ b/glassfish-jaxb-2.2.6-dont-build-examples.patch
>@@ -0,0 +1,25 @@
>+--- build.xml	2012-08-04 12:36:59.633066216 +0200
>++++ build.xml-gil	2012-08-04 12:37:08.273645180 +0200
>+@@ -721,22 +721,6 @@
>+ 
>+         </parallel>
>+ 
>+-        <antcall target="process-sample.notinwspack"/>
>+-        
>+-        <mkdir dir="${jaxb.dist}/samples"/>
>+-        <copy todir="${jaxb.dist}/samples">
>+-          <fileset dir="${jaxb.root}/samples/work" defaultexcludes="yes">
>+-            <exclude name="CHANGELOG.txt"/>
>+-            <exclude name="**/build.golden.regexp"/>
>+-            <exclude name="**/.cvsignore"/>
>+-            <exclude name="**/sample.meta"/>
>+-            <exclude name="**/gen-src/**/*"/>
>+-            <exclude name="**/classes/**/*"/>
>+-          </fileset>
>+-        </copy>
>+-
>+-        <ant dir="osgi" target="bundle"/>
>+-
>+     </target>
>+ 
>+     <target name="push-snapshot-to-maven">
>diff --git a/glassfish-jaxb-2.2.6-remove-classpath-from-manifests.patch b/glassfish-jaxb-2.2.6-remove-classpath-from-manifests.patch
>new file mode 100644
>index 0000000..fa30e89
>--- /dev/null
>+++ b/glassfish-jaxb-2.2.6-remove-classpath-from-manifests.patch
>@@ -0,0 +1,20 @@
>+--- build.xml	2012-08-04 12:02:36.609949319 +0200
>++++ build.xml-gil	2012-08-04 12:07:44.316639340 +0200
>+@@ -661,9 +661,6 @@
>+               
>+               <sequential>
>+                   <createManifest file="${runtime.root}/build/manifest.rt" extensionName="com.sun.xml.bind" />
>+-                  <manifest mode="update" file="${runtime.root}/build/manifest.rt">
>+-                    <attribute name="Class-Path" value="jaxb-api.jar" /> 
>+-                  </manifest>
>+                   <jar jarfile="${jaxb.dist}/lib/jaxb-impl.jar"
>+                        manifest="${runtime.root}/build/manifest.rt"
>+                        duplicate="fail">
>+@@ -686,7 +683,6 @@
>+                   <property name="manifest.classpath" value="jaxb-api.jar jaxb-impl.jar" />
>+                   <echo file="${xjc.root}/manifest.xjc" append="true"
>+ >Main-Class: com.sun.tools.xjc.XJCFacade
>+-Class-Path: ${manifest.classpath}
>+ 
>+ </echo>
>+                   <copy todir="${xjc.classes}">
>diff --git a/glassfish-jaxb.spec b/glassfish-jaxb.spec
>index 79fff0c..a72eefb 100644
>--- a/glassfish-jaxb.spec
>+++ b/glassfish-jaxb.spec
>@@ -1,25 +1,25 @@
> Name: glassfish-jaxb
>-Version: 2.2.5
>-Release: 3%{?dist}
>+Version: 2.2.6
>+Release: 1%{?dist}
> Summary: JAXB Reference Implementation
> 
> Group: Development/Libraries
> License: CDDL and GPLv2 with exceptions
> URL: http://jaxb.java.net
> 
>-# svn export https://svn.java.net/svn/jaxb~version2/tags/jaxb-2_2_5/ glassfish-jaxb-2.2.5
>-# find glassfish-jaxb-2.2.5/ -name '*.class' -delete
>-# find glassfish-jaxb-2.2.5/ -name '*.jar' -delete
>-# find glassfish-jaxb-2.2.5/ -name '*.zip' -delete
>-# find glassfish-jaxb-2.2.5/ -name '*.dll' -delete
>-# tar czf glassfish-jaxb-2.2.5.tar.gz glassfish-jaxb-2.2.5
>+# svn export https://svn.java.net/svn/jaxb~version2/tags/jaxb-2_2_6/jaxb-ri glassfish-jaxb-2.2.6
>+# find glassfish-jaxb-2.2.6/ -name '*.class' -delete
>+# find glassfish-jaxb-2.2.6/ -name '*.jar' -delete
>+# find glassfish-jaxb-2.2.6/ -name '*.zip' -delete
>+# find glassfish-jaxb-2.2.6/ -name '*.dll' -delete
>+# tar czf glassfish-jaxb-2.2.6.tar.gz glassfish-jaxb-2.2.6
> Source0: %{name}-%{version}.tar.gz
> 
> # JAXB implementation POM:
>-Source1: http://repo1.maven.org/maven2/com/sun/xml/bind/jaxb-impl/2.2.5/jaxb-impl-2.2.5.pom
>+Source1: http://repo1.maven.org/maven2/com/sun/xml/bind/jaxb-impl/2.2.6/jaxb-impl-2.2.6.pom
> 
> # JAXB XJC POM:
>-Source2: http://repo1.maven.org/maven2/com/sun/xml/bind/jaxb-xjc/2.2.5/jaxb-xjc-2.2.5.pom
>+Source2: http://repo1.maven.org/maven2/com/sun/xml/bind/jaxb-xjc/2.2.6/jaxb-xjc-2.2.6.pom
> 
> # Ant build file used to generate the Javadoc (this is not part of the original
> # source but written on purpose for the packaging):
>@@ -38,7 +38,7 @@ Patch2: %{name}-dont-generate-jing-rnc-driver.patch
> Patch3: %{name}-dont-bundle-other-jars.patch
> 
> # Remove the class-path entry from the generated manifest files:
>-Patch4: %{name}-remove-classpath-from-manifests.patch
>+Patch4: %{name}-%{version}-remove-classpath-from-manifests.patch
> 
> # Patch the POM files to include the dependencies corresponding to the jar
> # files that we aren't bundling within the jat files of this package:
>@@ -48,7 +48,7 @@ Patch5: %{name}-add-dependencies.patch
> Patch6: %{name}-dont-use-prebuilt-javadocs.patch
> 
> # Don't build the examples as they need additional dependencies:
>-Patch7: %{name}-dont-build-examples.patch
>+Patch7: %{name}-%{version}-dont-build-examples.patch
> 
> BuildArch: noarch
> 
>@@ -57,7 +57,7 @@ BuildRequires: java-devel
> 
> BuildRequires: ant
> BuildRequires: codemodel
>-BuildRequires: istack-commons
>+BuildRequires: istack-commons >= 1.14
> BuildRequires: relaxngcc
> BuildRequires: xml-commons-resolver
> BuildRequires: txw2
>@@ -68,6 +68,7 @@ BuildRequires: glassfish-fastinfoset
> BuildRequires: jing
> BuildRequires: stax-ex
> BuildRequires: isorelax
>+# BuildRequires: msv-xsdlib
> BuildRequires: xsom
> BuildRequires: rngom
> 
>@@ -83,7 +84,7 @@ Requires: glassfish-jaxb-api
> Requires: relaxngDatatype
> Requires: txw2
> Requires: relaxngcc
>-Requires: istack-commons
>+Requires: istack-commons >= 1.14
> Requires: codemodel
> Requires: jpackage-utils
> Requires: java
>@@ -116,13 +117,12 @@ cp %{SOURCE2} jaxb-xjc.pom
> 
> # Apply the patches:
> %patch0 -p1
>-%patch1 -p1
> %patch2 -p1
> %patch3 -p1
>-%patch4 -p1
>+%patch4 -p0
> %patch5 -p1
> %patch6 -p1
>-%patch7 -p1
>+%patch7 -p0
> 
> # Link the libraries where the build script expects them:
> ln -s $(build-classpath codemodel) tools/lib/rebundle/compiler/codemodel.jar
>@@ -132,20 +132,23 @@ ln -s $(build-classpath relaxngDatatype) tools/lib/rebundle/compiler/relaxngData
> ln -s $(build-classpath xml-resolver) tools/lib/rebundle/compiler/resolver.jar
> ln -s $(build-classpath rngom) tools/lib/rebundle/compiler/rngom.jar
> ln -s $(build-classpath xsom) tools/lib/rebundle/compiler/xsom.jar
>-ln -s $(build-classpath isorelax) tools/lib/rebundle/runtime/isorelax.jar
>-ln -s $(build-classpath msv-msv) tools/lib/rebundle/runtime/msv.jar
>-ln -s $(build-classpath relaxngDatatype) tools/lib/rebundle/runtime/relaxngDatatype.jar
> ln -s $(build-classpath istack-commons-runtime) tools/lib/rebundle/runtime2/istack-commons-runtime.jar
> ln -s $(build-classpath txw2) tools/lib/rebundle/runtime2/txw2.jar
> ln -s $(build-classpath jaxb-api) tools/lib/redist/jaxb-api.jar
> ln -s $(build-classpath FastInfoset) tools/lib/util/FastInfoset.jar
>+ln -s $(build-classpath isorelax) tools/lib/util/isorelax.jarr
> ln -s $(build-classpath args4j) tools/lib/util/args4j.jar
> ln -s $(build-classpath codemodel-annotation-compiler) tools/lib/util/codemodel-annotation-compiler.jar
> ln -s $(build-classpath dom4j) tools/lib/util/dom4j.jar
> ln -s $(build-classpath jing) tools/lib/util/jing.jar
> ln -s $(build-classpath relaxngcc) tools/lib/util/relaxngcc.jar
>+#ln -s $(build-classpath istack-commons-soimp) tools/lib/util/istack-commons-soimp.jar
>+#ln -s $(build-classpath istack-commons-test) tools/lib/util/istack-commons-test.jar
> ln -s $(build-classpath stax-ex) tools/lib/util/stax-ex.jar
> ln -s $(build-classpath txwc2) tools/lib/util/txwc2.jar
>+ln -s $(build-classpath msv-msv) tools/lib/util/msv.jar
>+ln -s $(build-classpath msv-xsdlib) tools/lib/util/xsdlib.jar
>+ln -s $(build-classpath relaxngDatatype) tools/lib/util/relaxngDatatype.jar
> 
> # Put the Javadoc build file in place (no patching needed here, as this is not
> # part of the original source):
>@@ -177,8 +180,8 @@ install -m 644 tools/xmllint/build/xmllint.jar %{buildroot}%{_javadir}/%{name}/x
> 
> # POM files:
> install -d -m 755 %{buildroot}%{_mavenpomdir}
>-install -m 644 jaxb-impl.pom %{buildroot}%{_mavenpomdir}/JPP.%{name}-jaxb-impl.pom
>-install -m 644 jaxb-xjc.pom  %{buildroot}%{_mavenpomdir}/JPP.%{name}-jaxb-xjc.pom
>+install -pm 644 jaxb-impl.pom %{buildroot}%{_mavenpomdir}/JPP.%{name}-jaxb-impl.pom
>+install -pm 644 jaxb-xjc.pom  %{buildroot}%{_mavenpomdir}/JPP.%{name}-jaxb-xjc.pom
> 
> # Javadoc files:
> install -d -m 755 %{buildroot}%{_javadocdir}/%{name}
>@@ -204,6 +207,9 @@ cp -rp apidocs/* %{buildroot}%{_javadocdir}/%{name}/.
> 
> 
> %changelog
>+* Sat Aug 04 2012 gil cattaneo <puntogil@libero.it> 2.2.6-1
>+- Updated to upstream version 2.2.6
>+
> * Thu Jul 19 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.2.5-3
> - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
> 
>diff --git a/jaxb-impl-2.2.6.pom b/jaxb-impl-2.2.6.pom
>new file mode 100644
>index 0000000..c46d8fa
>--- /dev/null
>+++ b/jaxb-impl-2.2.6.pom
>@@ -0,0 +1,127 @@
>+<?xml version="1.0" encoding="UTF-8"?>
>+
>+
>+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
>+
>+    <parent>
>+        <groupId>net.java</groupId>
>+        <artifactId>jvnet-parent</artifactId>
>+        <version>1</version>
>+    </parent>
>+    
>+    <modelVersion>4.0.0</modelVersion>
>+    <groupId>com.sun.xml.bind</groupId>
>+    <artifactId>jaxb-impl</artifactId>
>+    <version>2.2.6</version>
>+    <packaging>jar</packaging>
>+
>+    <name>JAXB Reference Implementation</name>
>+    <description>JAXB (JSR 222) Reference Implementation</description>
>+    <url>http://jaxb.java.net/</url>
>+
>+    <organization>
>+        <name>Oracle Corporation</name>
>+        <url>http://www.oracle.com/</url>
>+    </organization>
>+
>+    <developers>
>+        <developer>
>+            <name>Martin Grebac</name>
>+            <email>martin.grebac@oracle.com</email>
>+            <organization>Oracle Corporation</organization>
>+        </developer>
>+    </developers>
>+    
>+    <licenses>
>+        <license>
>+            <name>CDDL 1.1</name>
>+            <url>https://glassfish.java.net/public/CDDL+GPL_1_1.html</url>
>+            <distribution>repo</distribution>
>+        </license>
>+        <license>
>+            <name>GPL2 w/ CPE</name>
>+            <url>https://glassfish.java.net/public/CDDL+GPL_1_1.html</url>
>+            <distribution>repo</distribution>
>+        </license>
>+    </licenses>
>+
>+    <scm>
>+        <connection>scm:svn:http://svn.java.net/svn/jaxb~version2/branches/jaxb-2_2-branch/jaxb-ri</connection>
>+        <developerConnection>scm:svn:https://svn.java.net/svn/jaxb~version2/branches/jaxb-2_2-branch/jaxb-ri</developerConnection>
>+        <url>http://java.net/projects/jaxb/sources/version2/show/branches/jaxb-2_2-branch/jaxb-ri</url>
>+    </scm>
>+
>+    <dependencyManagement>        
>+        <dependencies>
>+            <dependency>
>+                <groupId>javax.xml.bind</groupId>
>+                <artifactId>jaxb-api</artifactId>
>+                <version>2.2.7</version>
>+            </dependency>
>+            <dependency>
>+                <groupId>com.sun.istack</groupId>
>+                <artifactId>istack-commons-runtime</artifactId>
>+                <version>2.13</version>
>+            </dependency>
>+            <dependency>
>+                <groupId>com.sun.xml.fastinfoset</groupId>
>+                <artifactId>FastInfoset</artifactId>
>+                <version>1.2.12</version>
>+            </dependency>
>+        </dependencies>
>+    </dependencyManagement>
>+
>+    <repositories>
>+        <repository>
>+            <id>releases.java.net</id>
>+            <url>https://maven.java.net/content/repositories/releases/</url>
>+            <layout>default</layout>
>+        </repository>
>+        <repository>
>+            <id>staging.java.net</id>
>+            <url>https://maven.java.net/content/groups/staging/</url>
>+            <layout>default</layout>
>+        </repository>
>+    </repositories>    
>+
>+</project>
>diff --git a/jaxb-xjc-2.2.6.pom b/jaxb-xjc-2.2.6.pom
>new file mode 100644
>index 0000000..dd3d307
>--- /dev/null
>+++ b/jaxb-xjc-2.2.6.pom
>@@ -0,0 +1,117 @@
>+<?xml version="1.0" encoding="UTF-8"?>
>+
>+
>+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
>+
>+    <parent>
>+        <groupId>net.java</groupId>
>+        <artifactId>jvnet-parent</artifactId>
>+        <version>1</version>
>+    </parent>
>+    
>+    <modelVersion>4.0.0</modelVersion>
>+    <groupId>com.sun.xml.bind</groupId>
>+    <artifactId>jaxb-xjc</artifactId>
>+    <version>2.2.6</version>
>+    <packaging>jar</packaging>
>+
>+    <name>JAXB XJC</name>
>+    <description>JAXB (JSR 222) reference implementation - Schema compiler</description>
>+    <url>http://jaxb.java.net/</url>
>+
>+    <organization>
>+        <name>Oracle Corporation</name>
>+        <url>http://www.oracle.com/</url>
>+    </organization>
>+
>+    <developers>
>+        <developer>
>+            <name>Martin Grebac</name>
>+            <email>martin.grebac@oracle.com</email>
>+            <organization>Oracle Corporation</organization>
>+        </developer>
>+    </developers>
>+    
>+    <licenses>
>+        <license>
>+            <name>CDDL 1.1</name>
>+            <url>https://glassfish.java.net/public/CDDL+GPL_1_1.html</url>
>+            <distribution>repo</distribution>
>+        </license>
>+        <license>
>+            <name>GPL2 w/ CPE</name>
>+            <url>https://glassfish.java.net/public/CDDL+GPL_1_1.html</url>
>+            <distribution>repo</distribution>
>+        </license>
>+    </licenses>
>+
>+    <scm>
>+        <connection>scm:svn:http://svn.java.net/svn/jaxb~version2/branches/jaxb-2_2-branch/jaxb-ri</connection>
>+        <developerConnection>scm:svn:https://svn.java.net/svn/jaxb~version2/branches/jaxb-2_2-branch/jaxb-ri</developerConnection>
>+        <url>http://java.net/projects/jaxb/sources/version2/show/branches/jaxb-2_2-branch/jaxb-ri</url>
>+    </scm>
>+
>+    <dependencyManagement>
>+        <dependencies>
>+            <dependency>
>+                <groupId>com.sun.xml.bind</groupId>
>+                <artifactId>jaxb-impl</artifactId>
>+                <version>2.2.6</version>
>+            </dependency>
>+        </dependencies>
>+    </dependencyManagement>
>+
>+    <repositories>
>+        <repository>
>+            <id>releases.java.net</id>
>+            <url>https://maven.java.net/content/repositories/releases/</url>
>+            <layout>default</layout>
>+        </repository>
>+        <repository>
>+            <id>staging.java.net</id>
>+            <url>https://maven.java.net/content/groups/staging/</url>
>+            <layout>default</layout>
>+        </repository>
>+    </repositories>    
>+
>+</project>
>diff --git a/sources b/sources
>index 499c3b9..7bd1a4a 100644
>--- a/sources
>+++ b/sources
>@@ -1 +1 @@
>-141e9f0e9c8fc76b263898627e627131  glassfish-jaxb-2.2.5.tar.gz
>+00b5c3fe07156efe2d1267e7cc943814  glassfish-jaxb-2.2.6.tar.gz
>-- 
>1.7.7.6
>

Actions: View | Diff

Attachments on bug 871356: 635464 | 751296