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
This commit is contained in:
Juan Hernandez 2012-03-13 10:50:21 +01:00
parent 313bef32f6
commit 4b7818c457
2 changed files with 43 additions and 30 deletions

View File

@ -66,22 +66,25 @@
<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>
+ <groupId>com.sun.codemodel</groupId>
+ <artifactId>codemodel</artifactId>
+ <version>2.6</version>
+ </dependency>
+ <dependency>
+ <groupId>msv-msv</groupId>
+ <artifactId>msv-msv</artifactId>
+ <scope>system</scope>
+ <systemPath>/usr/share/java/msv-msv.jar</systemPath>
+ <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>
@ -90,13 +93,18 @@
+ <systemPath>/usr/share/java/relaxngDatatype.jar</systemPath>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.istack</groupId>
+ <artifactId>istack-commons-runtime</artifactId>
+ <version>2.6.1</version>
+ <groupId>xml-resolver</groupId>
+ <artifactId>xml-resolver</artifactId>
+ <version>1.2</version>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.xml.txw2</groupId>
+ <artifactId>txw2</artifactId>
+ <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>

View File

@ -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@redhat.com> 2.2.5-2
- Add missing xsom and rngom dependencies to the POM files
* Sat Mar 10 2012 Juan Hernandez <juan.hernandez@redhat.com> 2.2.5-1
- Updated to upstream version 2.2.5
- Removed classpath from manifest files