| |
@@ -1,85 +1,65 @@
|
| |
- %global oname jaxb-api
|
| |
Name: glassfish-jaxb-api
|
| |
- Version: 2.2.12
|
| |
- Release: 18%{?dist}
|
| |
+ Version: 2.3.3
|
| |
+ Release: 1%{?dist}
|
| |
Summary: Java Architecture for XML Binding
|
| |
- License: CDDL-1.1 or GPLv2 with exceptions
|
| |
- URL: http://jaxb.java.net/
|
| |
- # jaxb api and impl have different version
|
| |
- # svn export https://svn.java.net/svn/jaxb~version2/tags/jaxb-2_2_6/tools/lib/redist/jaxb-api-src.zip
|
| |
+ # EDL-1.0 license is BSD-3-clause
|
| |
+ License: BSD
|
| |
+ URL: https://github.com/eclipse-ee4j/jaxb-api
|
| |
+ Source0: https://github.com/eclipse-ee4j/jaxb-api/archive/%{version}.tar.gz
|
| |
|
| |
- Source0: https://repo1.maven.org/maven2/javax/xml/bind/%{oname}/%{version}/%{oname}-%{version}-b141001.1542-sources.jar
|
| |
- Source1: https://repo1.maven.org/maven2/javax/xml/bind/%{oname}/%{version}/%{oname}-%{version}-b141001.1542.pom
|
| |
-
|
| |
-
|
| |
- BuildRequires: java-javadoc
|
| |
BuildRequires: maven-local
|
| |
BuildRequires: mvn(jakarta.activation:jakarta.activation-api)
|
| |
- BuildRequires: mvn(net.java:jvnet-parent:pom:)
|
| |
BuildRequires: mvn(org.apache.felix:maven-bundle-plugin)
|
| |
+ BuildRequires: mvn(org.codehaus.mojo:build-helper-maven-plugin)
|
| |
|
| |
- BuildArch: noarch
|
| |
+ # TODO: rename glassfish-jaxb-api -> jakarta-jaxb-api?
|
| |
+ Provides: jakarta-jaxb-api = %{version}-%{release}
|
| |
|
| |
- # The Fedora Packaging Committee granted openjdk a bundling exception to carry JAXP and
|
| |
- # JAX-WS (glassfish doesn't need one, since it is the upstream for these files).
|
| |
- # Reference: https://fedorahosted.org/fpc/ticket/292
|
| |
+ # Disable javadocs for now, due to https://github.com/fedora-java/xmvn/issues/58
|
| |
+ Obsoletes: %{name}-javadoc <= 2.3.3-1
|
| |
|
| |
- %description
|
| |
- Glassfish - JAXB (JSR 222) API.
|
| |
-
|
| |
- %package javadoc
|
| |
- Summary: Javadoc for %{oname}
|
| |
- Requires: %{name} = %{version}-%{release}
|
| |
-
|
| |
- %description javadoc
|
| |
- Glassfish - JAXB (JSR 222) API.
|
| |
+ BuildArch: noarch
|
| |
|
| |
- This package contains javadoc for %{name}.
|
| |
+ %description
|
| |
+ The Jakarta XML Binding provides an API and tools that automate the mapping
|
| |
+ between XML documents and Java objects.
|
| |
|
| |
%prep
|
| |
- %setup -T -q -c
|
| |
-
|
| |
- # fixing incomplete source directory structure
|
| |
- mkdir -p src/main/java
|
| |
-
|
| |
- (
|
| |
- cd src/main/java
|
| |
- unzip -qq %{SOURCE0}
|
| |
- rm -rf META-INF
|
| |
- )
|
| |
+ %setup -q -n jaxb-api-%{version}
|
| |
|
| |
- cp -p %{SOURCE1} pom.xml
|
| |
+ # Remove unnecessary dep on ee4j parent pom (it adds nothing to our downstream builds)
|
| |
+ %pom_remove_parent
|
| |
|
| |
- # Set source/target to 1.8 for Java 11 build
|
| |
- %pom_xpath_set "pom:plugin[pom:artifactId='maven-compiler-plugin']/pom:configuration/pom:source" "1.8"
|
| |
- %pom_xpath_set "pom:plugin[pom:artifactId='maven-compiler-plugin']/pom:configuration/pom:target" "1.8"
|
| |
+ # Don't ship test module
|
| |
+ %pom_disable_module jaxb-api-test
|
| |
|
| |
- %pom_add_dep jakarta.activation:jakarta.activation-api
|
| |
+ # Remove plugins unnecessary for RPM builds
|
| |
+ %pom_remove_plugin -r :glassfish-copyright-maven-plugin
|
| |
+ %pom_remove_plugin -r :buildnumber-maven-plugin
|
| |
+ %pom_remove_plugin -r :maven-enforcer-plugin
|
| |
|
| |
- %pom_remove_plugin org.codehaus.mojo:buildnumber-maven-plugin
|
| |
- %pom_remove_plugin org.glassfish.copyright:glassfish-copyright-maven-plugin
|
| |
- %pom_remove_plugin org.glassfish.build:gfnexus-maven-plugin
|
| |
- %pom_remove_plugin :findbugs-maven-plugin
|
| |
- %pom_remove_plugin :maven-gpg-plugin
|
| |
- %pom_remove_plugin :maven-enforcer-plugin
|
| |
- %pom_remove_plugin :cobertura-maven-plugin
|
| |
+ # Make the dep on activation optional
|
| |
+ %pom_xpath_inject "pom:dependency[pom:groupId='jakarta.activation']" "<optional>true</optional>" jaxb-api
|
| |
|
| |
- %pom_xpath_set "pom:instructions/pom:Import-Package" "javax.activation;resolution:=optional,*"
|
| |
-
|
| |
- sed -i 's|<location>${basedir}/offline-javadoc</location>|<location>%{_javadocdir}/java</location>|' pom.xml
|
| |
+ # Compatibility aliases and symlinks
|
| |
+ %mvn_alias jakarta.xml.bind:jakarta.xml.bind-api javax.xml.bind:jaxb-api
|
| |
+ %mvn_file :jakarta.xml.bind-api %{name}/jakarta.xml.bind-api jaxb-api
|
| |
|
| |
%build
|
| |
- %mvn_file :%{oname} %{oname}
|
| |
- %mvn_build -- -Dsource=1.8
|
| |
+ %mvn_build -j -- -DbuildNumber=unknown -DscmBranch=%{version}
|
| |
|
| |
%install
|
| |
%mvn_install
|
| |
|
| |
%files -f .mfiles
|
| |
-
|
| |
- %files javadoc -f .mfiles-javadoc
|
| |
+ %license LICENSE.md NOTICE.md
|
| |
|
| |
%changelog
|
| |
+ * Tue Aug 04 2020 Mat Booth <mat.booth@redhat.com> - 2.3.3-1
|
| |
+ - Update to JAXB API 2.3.3
|
| |
+ - Disable javadocs for now, due to https://github.com/fedora-java/xmvn/issues/58
|
| |
+ - Upstream moved to eclipse-ee4j and implementation license changed to BSD (EDL)
|
| |
+
|
| |
* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.2.12-18
|
| |
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
|
| |
|
| |
mbooth
commented 3 years ago
Disable javadocs for now, due to https://github.com/fedora-java/xmvn/issues/58