forked from pool/glassfish-jaxb
Compare commits
18 Commits
d40a9180bc
...
c735e743a8
Author | SHA256 | Date | |
---|---|---|---|
c735e743a8 | |||
0b7be07924 | |||
cbbc975c62 | |||
52a55122db | |||
a37d3e7451 | |||
db76a4a1ea | |||
bcc29ade32 | |||
6a998a2e89 | |||
bfad00030a | |||
0f1758d7c8 | |||
d16eccbcc5 | |||
f5c75e13d9 | |||
346b146005 | |||
de2dddad76 | |||
a64c1221d4 | |||
f87b926e16 | |||
bb443dceb0 | |||
8aac957fe8 |
@@ -1,3 +1,20 @@
|
||||
-------------------------------------------------------------------
|
||||
Thu Mar 27 18:03:14 UTC 2025 - Fridrich Strba <fstrba@suse.com>
|
||||
|
||||
- Added patch:
|
||||
* pom-errors.patch
|
||||
+ fix errors in pom files that will be fatal with maven 4
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Nov 4 21:27:03 UTC 2024 - Fridrich Strba <fstrba@suse.com>
|
||||
|
||||
- Fix conflict/choice of providers
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sat Nov 2 17:34:46 UTC 2024 - Fridrich Strba <fstrba@suse.com>
|
||||
|
||||
- Assure that we are building against the older javax apis
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Apr 29 15:25:33 UTC 2024 - Fridrich Strba <fstrba@suse.com>
|
||||
|
||||
|
@@ -1,7 +1,7 @@
|
||||
#
|
||||
# spec file for package glassfish-jaxb
|
||||
#
|
||||
# Copyright (c) 2024 SUSE LLC
|
||||
# Copyright (c) 2025 SUSE LLC
|
||||
#
|
||||
# All modifications and additions to the file contributed by third parties
|
||||
# remain the property of their copyright owners, unless otherwise agreed
|
||||
@@ -29,12 +29,10 @@ URL: https://jaxb.java.net
|
||||
Source0: https://github.com/javaee/jaxb-v2/archive/%{version}.tar.gz
|
||||
Patch0: txw2-args4j.patch
|
||||
Patch1: glassfish-jaxb-timestamp.patch
|
||||
BuildRequires: glassfish-fastinfoset
|
||||
Patch2: pom-errors.patch
|
||||
BuildRequires: java-devel >= 9
|
||||
BuildRequires: maven-local
|
||||
BuildRequires: stax-ex
|
||||
BuildRequires: unzip
|
||||
BuildRequires: xsom
|
||||
BuildRequires: mvn(args4j:args4j)
|
||||
BuildRequires: mvn(com.sun.istack:istack-commons-runtime)
|
||||
BuildRequires: mvn(com.sun.istack:istack-commons-tools)
|
||||
@@ -49,7 +47,6 @@ BuildRequires: mvn(org.apache.ant:ant)
|
||||
BuildRequires: mvn(org.apache.felix:maven-bundle-plugin)
|
||||
BuildRequires: mvn(org.apache.maven.plugins:maven-antrun-plugin)
|
||||
BuildRequires: mvn(org.apache.maven.plugins:maven-dependency-plugin)
|
||||
BuildRequires: mvn(org.apache.maven.plugins:maven-enforcer-plugin)
|
||||
BuildRequires: mvn(org.apache.maven.plugins:maven-shade-plugin)
|
||||
BuildRequires: mvn(org.apache.maven.plugins:maven-source-plugin)
|
||||
BuildRequires: mvn(org.codehaus.mojo:build-helper-maven-plugin)
|
||||
@@ -74,6 +71,13 @@ Requires: %{name}-txwc2 = %{version}-%{release}
|
||||
Requires: %{name}-xjc = %{version}-%{release}
|
||||
Requires: %{name}-xsom = %{version}-%{release}
|
||||
Requires: java-headless >= 1.8
|
||||
#!BuildRequires: glassfish-dtd-parser
|
||||
#!BuildRequires: glassfish-fastinfoset
|
||||
#!BuildRequires: istack-commons-runtime
|
||||
#!BuildRequires: istack-commons-tools
|
||||
#!BuildRequires: stax-ex
|
||||
#!BuildRequires: xmlstreambuffer
|
||||
#!BuildRequires: xsom
|
||||
BuildArch: noarch
|
||||
|
||||
%description
|
||||
@@ -147,7 +151,10 @@ This package contains parent POM.
|
||||
%package runtime
|
||||
Summary: JAXB Runtime
|
||||
Group: Development/Libraries/Java
|
||||
Requires: glassfish-fastinfoset
|
||||
Requires: istack-commons-runtime
|
||||
Requires: java-headless >= 1.8
|
||||
Requires: stax-ex
|
||||
|
||||
%description runtime
|
||||
JAXB (JSR 222) Reference Implementation
|
||||
@@ -169,6 +176,8 @@ This package contains TXW parent POM.
|
||||
%package xjc
|
||||
Summary: JAXB XJC
|
||||
Group: Development/Libraries/Java
|
||||
Requires: glassfish-dtd-parser
|
||||
Requires: istack-commons-tools
|
||||
Requires: java-headless >= 1.8
|
||||
|
||||
%description xjc
|
||||
@@ -231,6 +240,7 @@ This package contains the API documentation for %{name}.
|
||||
|
||||
%patch -P 0
|
||||
%patch -P 1 -p1
|
||||
%patch -P 2 -p1
|
||||
|
||||
pushd jaxb-ri
|
||||
|
||||
@@ -252,6 +262,7 @@ perl -pi -e 's#com\.sun\.org\.apache\.xml\.internal\.resolver#org\.apache\.xml\.
|
||||
%pom_remove_plugin :gfnexus-maven-plugin
|
||||
%pom_remove_plugin :maven-site-plugin
|
||||
%pom_remove_plugin :buildnumber-maven-plugin
|
||||
%pom_remove_plugin :maven-enforcer-plugin
|
||||
|
||||
%if %{?pkg_vcmp:%pkg_vcmp maven-antrun-plugin >= 3}%{!?pkg_vcmp:0}
|
||||
sed -i -e 's#tasks\>#target\>#g' xjc/pom.xml jxc/pom.xml
|
||||
|
127
pom-errors.patch
Normal file
127
pom-errors.patch
Normal file
@@ -0,0 +1,127 @@
|
||||
--- jaxb-v2-2.3.1/jaxb-ri/jxc/pom.xml 2025-03-25 12:39:34.037242565 +0100
|
||||
+++ jaxb-v2-2.3.1/jaxb-ri/jxc/pom.xml 2025-03-25 12:48:18.659452762 +0100
|
||||
@@ -118,6 +118,16 @@
|
||||
<artifactId>maven-dependency-plugin</artifactId>
|
||||
<executions>
|
||||
<execution>
|
||||
+ <phase>validate</phase>
|
||||
+ <goals>
|
||||
+ <goal>copy-dependencies</goal>
|
||||
+ </goals>
|
||||
+ <configuration>
|
||||
+ <outputDirectory>${project.build.directory}/mods</outputDirectory>
|
||||
+ <excludeArtifactIds>jmockit</excludeArtifactIds>
|
||||
+ </configuration>
|
||||
+ </execution>
|
||||
+ <execution>
|
||||
<id>copy-ant</id>
|
||||
<phase>process-test-sources</phase>
|
||||
<goals>
|
||||
@@ -164,18 +174,6 @@
|
||||
</executions>
|
||||
</plugin>
|
||||
<plugin>
|
||||
- <groupId>org.apache.maven.plugins</groupId>
|
||||
- <artifactId>maven-surefire-plugin</artifactId>
|
||||
- <configuration>
|
||||
- <systemPropertyVariables>
|
||||
- <java.io.tmpdir>${project.build.directory}/test-antprojects</java.io.tmpdir>
|
||||
- <bin.folder>${project.build.directory}</bin.folder>
|
||||
- </systemPropertyVariables>
|
||||
- <forkCount>1</forkCount>
|
||||
- <reuseForks>false</reuseForks>
|
||||
- </configuration>
|
||||
- </plugin>
|
||||
- <plugin>
|
||||
<artifactId>maven-jar-plugin</artifactId>
|
||||
<executions>
|
||||
<execution>
|
||||
@@ -270,22 +268,6 @@
|
||||
</plugin>
|
||||
|
||||
<plugin>
|
||||
- <artifactId>maven-dependency-plugin</artifactId>
|
||||
- <executions>
|
||||
- <execution>
|
||||
- <phase>validate</phase>
|
||||
- <goals>
|
||||
- <goal>copy-dependencies</goal>
|
||||
- </goals>
|
||||
- <configuration>
|
||||
- <outputDirectory>${project.build.directory}/mods</outputDirectory>
|
||||
- <excludeArtifactIds>jmockit</excludeArtifactIds>
|
||||
- </configuration>
|
||||
- </execution>
|
||||
- </executions>
|
||||
- </plugin>
|
||||
-
|
||||
- <plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-antrun-plugin</artifactId>
|
||||
<version>1.8</version>
|
||||
--- jaxb-v2-2.3.1/jaxb-ri/runtime/impl/pom.xml 2025-03-25 12:39:34.040540452 +0100
|
||||
+++ jaxb-v2-2.3.1/jaxb-ri/runtime/impl/pom.xml 2025-03-25 12:40:27.439835407 +0100
|
||||
@@ -100,10 +100,6 @@
|
||||
<plugins>
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
- <artifactId>maven-dependency-plugin</artifactId>
|
||||
- </plugin>
|
||||
- <plugin>
|
||||
- <groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-surefire-plugin</artifactId>
|
||||
<configuration>
|
||||
<workingDirectory>target/test-out</workingDirectory>
|
||||
@@ -167,11 +163,6 @@
|
||||
</plugin>
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
- <artifactId>maven-surefire-plugin</artifactId>
|
||||
-
|
||||
- </plugin>
|
||||
- <plugin>
|
||||
- <groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-javadoc-plugin</artifactId>
|
||||
<configuration>
|
||||
<additionalJOptions>
|
||||
--- jaxb-v2-2.3.1/jaxb-ri/xjc/pom.xml 2025-03-25 12:39:34.080096329 +0100
|
||||
+++ jaxb-v2-2.3.1/jaxb-ri/xjc/pom.xml 2025-03-25 12:41:52.608402799 +0100
|
||||
@@ -148,6 +148,16 @@
|
||||
<artifactId>maven-dependency-plugin</artifactId>
|
||||
<executions>
|
||||
<execution>
|
||||
+ <phase>compile</phase>
|
||||
+ <goals>
|
||||
+ <goal>copy-dependencies</goal>
|
||||
+ </goals>
|
||||
+ <configuration>
|
||||
+ <outputDirectory>${project.build.directory}/mods</outputDirectory>
|
||||
+ <excludeArtifactIds>jmockit</excludeArtifactIds>
|
||||
+ </configuration>
|
||||
+ </execution>
|
||||
+ <execution>
|
||||
<id>copy-ant</id>
|
||||
<phase>validate</phase>
|
||||
<goals>
|
||||
@@ -247,21 +257,6 @@
|
||||
</configuration>
|
||||
</execution>
|
||||
</executions>
|
||||
- </plugin>
|
||||
- <plugin>
|
||||
- <artifactId>maven-dependency-plugin</artifactId>
|
||||
- <executions>
|
||||
- <execution>
|
||||
- <phase>compile</phase>
|
||||
- <goals>
|
||||
- <goal>copy-dependencies</goal>
|
||||
- </goals>
|
||||
- <configuration>
|
||||
- <outputDirectory>${project.build.directory}/mods</outputDirectory>
|
||||
- <excludeArtifactIds>jmockit</excludeArtifactIds>
|
||||
- </configuration>
|
||||
- </execution>
|
||||
- </executions>
|
||||
</plugin>
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
Reference in New Issue
Block a user