From a0175266f42e8b90258254ed200e5976d2da28d2 Mon Sep 17 00:00:00 2001 From: Michal Srb Date: Jan 20 2015 08:00:32 +0000 Subject: Regenerate BR; install everything except bundles --- diff --git a/glassfish-jaxb.spec b/glassfish-jaxb.spec index 00edc68..de00cd9 100644 --- a/glassfish-jaxb.spec +++ b/glassfish-jaxb.spec @@ -9,26 +9,27 @@ URL: http://jaxb.java.net Source0: https://jaxb.java.net/%{version}/jaxb-ri-%{version}.src.zip BuildRequires: maven-local -BuildRequires: codemodel -BuildRequires: istack-commons -BuildRequires: relaxngcc -BuildRequires: xml-commons-resolver -BuildRequires: txw2 -BuildRequires: relaxngDatatype -BuildRequires: glassfish-dtd-parser -BuildRequires: glassfish-jaxb-api -BuildRequires: glassfish-fastinfoset -BuildRequires: jing -BuildRequires: stax-ex -BuildRequires: isorelax -BuildRequires: xsom -BuildRequires: rngom -BuildRequires: javaparser -BuildRequires: args4j -BuildRequires: args4j-tools -BuildRequires: maven-site-plugin -BuildRequires: maven-dependency-plugin -BuildRequires: maven-shade-plugin +BuildRequires: mvn(args4j:args4j) +BuildRequires: mvn(com.google.code.javaparser:javaparser) +BuildRequires: mvn(com.sun.istack:istack-commons-runtime) +BuildRequires: mvn(com.sun.istack:istack-commons-tools) +BuildRequires: mvn(com.sun:tools) +BuildRequires: mvn(com.sun.xml.dtd-parser:dtd-parser) +BuildRequires: mvn(com.sun.xml.fastinfoset:FastInfoset) +BuildRequires: mvn(com.sun.xsom:xsom) +BuildRequires: mvn(junit:junit) +BuildRequires: mvn(net.java.dev.msv:msv-core) +BuildRequires: mvn(net.java:jvnet-parent:pom:) +BuildRequires: mvn(org.apache.ant:ant) +BuildRequires: mvn(org.apache.maven.plugins:maven-dependency-plugin) +BuildRequires: mvn(org.apache.maven.plugins:maven-deploy-plugin) +BuildRequires: mvn(org.apache.maven.plugins:maven-enforcer-plugin) +BuildRequires: mvn(org.apache.maven.plugins:maven-source-plugin) +BuildRequires: mvn(org.codehaus.mojo:build-helper-maven-plugin) +BuildRequires: mvn(org.codehaus.mojo:buildnumber-maven-plugin) +BuildRequires: mvn(org.jvnet.staxex:stax-ex) +BuildRequires: mvn(relaxngDatatype:relaxngDatatype) +BuildRequires: mvn(xmlunit:xmlunit) BuildArch: noarch @@ -43,9 +44,9 @@ This package contains the API documentation for %{name}. %prep %setup -q -c - # uses very old args4j %pom_disable_module compiler txw +%pom_disable_module bundles %pom_remove_dep com.sun:tools %pom_add_dep_mgmt com.sun:tools @@ -58,23 +59,13 @@ This package contains the API documentation for %{name}. %pom_remove_plugin :gfnexus-maven-plugin %pom_remove_plugin :maven-site-plugin -%pom_remove_dep org.glassfish.jaxb:jaxb-runtime bundles/runtime -%pom_remove_dep org.glassfish.jaxb:jaxb-jxc bundles/jxc - -%mvn_alias com.sun.xml.bind:jaxb-impl org.glassfish.jaxb:jaxb-runtime -%mvn_alias com.sun.xml.bind:jaxb-jxc org.glassfish.jaxb:jaxb-jxc +%mvn_alias org.glassfish.jaxb:jaxb-runtime "com.sun.xml.bind:jaxb-impl" +%mvn_alias org.glassfish.jaxb:jaxb-xjc "com.sun.xml.bind:jaxb-xjc" %build -%mvn_build -f -i -- -Ddev +%mvn_build -f -- -Ddev %install -%mvn_artifact boms/bom/pom.xml -%mvn_artifact boms/bom-ext/pom.xml -%mvn_artifact pom.xml -%mvn_artifact bundles/pom.xml -%mvn_artifact bundles/runtime/pom.xml bundles/runtime/target/jaxb-impl-%{version}.jar -%mvn_artifact bundles/jxc/pom.xml bundles/jxc/target/jaxb-jxc-%{version}.jar - %mvn_install %files -f .mfiles