[glassfish-jaxb/f17] Add missing xsom and rngom dependencies
Juan Hernandez
jhernand at fedoraproject.org
Tue Mar 13 09:52:11 UTC 2012
commit 4b7818c45786e91b5d134334264a03f7fd779912
Author: Juan Hernandez <juan.hernandez at redhat.com>
Date: Tue Mar 13 10:50:21 2012 +0100
Add missing xsom and rngom dependencies
During the update to upstream 2.2.5 the patch that adds the
depencencies for xsom and rngom was updated incorrectly.
althought that is not strictly required as it is also a transitive
glassfish-jaxb-add-dependencies.patch | 66 ++++++++++++++++++--------------
glassfish-jaxb.spec | 7 +++-
2 files changed, 43 insertions(+), 30 deletions(-)
---
diff --git a/glassfish-jaxb-add-dependencies.patch b/glassfish-jaxb-add-dependencies.patch
index 4e07d26..bfebdac 100644
--- a/glassfish-jaxb-add-dependencies.patch
+++ b/glassfish-jaxb-add-dependencies.patch
@@ -66,39 +66,47 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-xjc</artifactId>
-@@ -91,6 +85,37 @@
+@@ -91,6 +85,45 @@
<url>http://java.net/projects/jaxb/sources/version2/show/branches/jaxb-2_2-branch/jaxb-ri</url>
</scm>
+ <dependencies>
-+ <dependency>
-+ <groupId>isorelax</groupId>
-+ <artifactId>isorelax</artifactId>
-+ <scope>system</scope>
-+ <systemPath>/usr/share/java/isorelax.jar</systemPath>
-+ </dependency>
-+ <dependency>
-+ <groupId>msv-msv</groupId>
-+ <artifactId>msv-msv</artifactId>
-+ <scope>system</scope>
-+ <systemPath>/usr/share/java/msv-msv.jar</systemPath>
-+ </dependency>
-+ <dependency>
-+ <groupId>relaxngDatatype</groupId>
-+ <artifactId>relaxngDatatype</artifactId>
-+ <scope>system</scope>
-+ <systemPath>/usr/share/java/relaxngDatatype.jar</systemPath>
-+ </dependency>
-+ <dependency>
-+ <groupId>com.sun.istack</groupId>
-+ <artifactId>istack-commons-runtime</artifactId>
-+ <version>2.6.1</version>
-+ </dependency>
-+ <dependency>
-+ <groupId>com.sun.xml.txw2</groupId>
-+ <artifactId>txw2</artifactId>
-+ <version>20110809</version>
-+ </dependency>
++ <dependency>
++ <groupId>com.sun.codemodel</groupId>
++ <artifactId>codemodel</artifactId>
++ <version>2.6</version>
++ </dependency>
++ <dependency>
++ <groupId>com.sun.xml.dtd-parser</groupId>
++ <artifactId>dtd-parser</artifactId>
++ <version>1.2-SNAPSHOT</version>
++ </dependency>
++ <dependency>
++ <groupId>com.sun.istack</groupId>
++ <artifactId>istack-commons-tools</artifactId>
++ <version>2.6.1</version>
++ </dependency>
++ <dependency>
++ <groupId>relaxngDatatype</groupId>
++ <artifactId>relaxngDatatype</artifactId>
++ <scope>system</scope>
++ <systemPath>/usr/share/java/relaxngDatatype.jar</systemPath>
++ </dependency>
++ <dependency>
++ <groupId>xml-resolver</groupId>
++ <artifactId>xml-resolver</artifactId>
++ <version>1.2</version>
++ </dependency>
++ <dependency>
++ <groupId>org.kohsuke.rngom</groupId>
++ <artifactId>rngom</artifactId>
++ <version>201103-SNAPSHOT</version>
++ </dependency>
++ <dependency>
++ <groupId>com.sun.xsom</groupId>
++ <artifactId>xsom</artifactId>
++ <version>20110809</version>
++ </dependency>
+ </dependencies>
+
<dependencyManagement>
diff --git a/glassfish-jaxb.spec b/glassfish-jaxb.spec
index 4bcfcb7..7ba7092 100644
--- a/glassfish-jaxb.spec
+++ b/glassfish-jaxb.spec
@@ -1,6 +1,6 @@
Name: glassfish-jaxb
Version: 2.2.5
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: JAXB Reference Implementation
Group: Development/Libraries
@@ -69,10 +69,12 @@ BuildRequires: jing
BuildRequires: stax-ex
BuildRequires: isorelax
BuildRequires: xsom
+BuildRequires: rngom
Requires: glassfish-dtd-parser
Requires: xml-commons-resolver
Requires: xsom
+Requires: rngom
Requires: isorelax
Requires: jing
Requires: stax-ex
@@ -202,6 +204,9 @@ cp -rp apidocs/* %{buildroot}%{_javadocdir}/%{name}/.
%changelog
+* Tue Mar 13 2012 Juan Hernandez <juan.hernandez at redhat.com> 2.2.5-2
+- Add missing xsom and rngom dependencies to the POM files
+
* Sat Mar 10 2012 Juan Hernandez <juan.hernandez at redhat.com> 2.2.5-1
- Updated to upstream version 2.2.5
- Removed classpath from manifest files
More information about the scm-commits
mailing list