pool/glassfish-jaxb
SHA256
12
0
Fork 2
Code Issues Pull Requests Activity

Compare commits

merge into: pool:factory
Branches Tags
pool:factory pool:devel java-packages:main
...
pull from: java-packages:main
Branches Tags
java-packages:main pool:factory pool:devel

11 Commits
factory ... main

Author SHA256 Message Date
Ana Guerrero
c735e743a8 Accepting request 1264657 from Java:packages 
OBS-URL: https://build.opensuse.org/request/show/1264657
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/glassfish-jaxb?expand=0&rev=12
 2025-03-27 21:34:34 +00:00
Fridrich Strba
0b7be07924 fix pom errors 
OBS-URL: https://build.opensuse.org/package/show/Java:packages/glassfish-jaxb?expand=0&rev=34
 2025-03-27 18:09:49 +00:00
Ana Guerrero
cbbc975c62 Accepting request 1221262 from Java:packages 
Fix conflict/choice of providers

OBS-URL: https://build.opensuse.org/request/show/1221262
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/glassfish-jaxb?expand=0&rev=11
 2024-11-05 14:41:15 +00:00
Fridrich Strba
52a55122db OBS-URL: https://build.opensuse.org/package/show/Java:packages/glassfish-jaxb?expand=0&rev=32 2024-11-04 21:27:10 +00:00
Fridrich Strba
a37d3e7451 OBS-URL: https://build.opensuse.org/package/show/Java:packages/glassfish-jaxb?expand=0&rev=31 2024-11-04 19:54:06 +00:00
Fridrich Strba
db76a4a1ea OBS-URL: https://build.opensuse.org/package/show/Java:packages/glassfish-jaxb?expand=0&rev=30 2024-11-04 19:13:38 +00:00
Dominique Leuenberger
bcc29ade32 Accepting request 1220318 from Java:packages 
Assure we are building against the correct apis

OBS-URL: https://build.opensuse.org/request/show/1220318
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/glassfish-jaxb?expand=0&rev=10
 2024-11-03 06:17:42 +00:00
Fridrich Strba
6a998a2e89 OBS-URL: https://build.opensuse.org/package/show/Java:packages/glassfish-jaxb?expand=0&rev=28 2024-11-02 17:35:11 +00:00
Fridrich Strba
bfad00030a OBS-URL: https://build.opensuse.org/package/show/Java:packages/glassfish-jaxb?expand=0&rev=27 2024-11-02 17:34:12 +00:00
Fridrich Strba
0f1758d7c8 OBS-URL: https://build.opensuse.org/package/show/Java:packages/glassfish-jaxb?expand=0&rev=26 2024-10-20 20:01:17 +00:00
Fridrich Strba
d40a9180bc OBS-URL: https://build.opensuse.org/package/show/Java:packages/glassfish-jaxb?expand=0&rev=25 2024-10-20 05:54:38 +00:00
3 changed files with 160 additions and 2 deletions
Expand all files Collapse all files

17
glassfish-jaxb.changes
View File

@@ -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> Mon Apr 29 15:25:33 UTC 2024 - Fridrich Strba <fstrba@suse.com>

18
glassfish-jaxb.spec
View File

@@ -1,7 +1,7 @@
# #
# spec file for package glassfish-jaxb # 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 # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@@ -29,6 +29,7 @@ URL: https://jaxb.java.net
Source0: https://github.com/javaee/jaxb-v2/archive/%{version}.tar.gz Source0: https://github.com/javaee/jaxb-v2/archive/%{version}.tar.gz
Patch0: txw2-args4j.patch Patch0: txw2-args4j.patch
Patch1: glassfish-jaxb-timestamp.patch Patch1: glassfish-jaxb-timestamp.patch
Patch2: pom-errors.patch
BuildRequires: java-devel >= 9 BuildRequires: java-devel >= 9
BuildRequires: maven-local BuildRequires: maven-local
BuildRequires: unzip BuildRequires: unzip
@@ -46,7 +47,6 @@ BuildRequires: mvn(org.apache.ant:ant)
BuildRequires: mvn(org.apache.felix:maven-bundle-plugin) BuildRequires: mvn(org.apache.felix:maven-bundle-plugin)
BuildRequires: mvn(org.apache.maven.plugins:maven-antrun-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-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-shade-plugin)
BuildRequires: mvn(org.apache.maven.plugins:maven-source-plugin) BuildRequires: mvn(org.apache.maven.plugins:maven-source-plugin)
BuildRequires: mvn(org.codehaus.mojo:build-helper-maven-plugin) BuildRequires: mvn(org.codehaus.mojo:build-helper-maven-plugin)
@@ -71,6 +71,13 @@ Requires: %{name}-txwc2 = %{version}-%{release}
Requires: %{name}-xjc = %{version}-%{release} Requires: %{name}-xjc = %{version}-%{release}
Requires: %{name}-xsom = %{version}-%{release} Requires: %{name}-xsom = %{version}-%{release}
Requires: java-headless >= 1.8 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 BuildArch: noarch
%description %description
@@ -144,7 +151,10 @@ This package contains parent POM.
%package runtime %package runtime
Summary: JAXB Runtime Summary: JAXB Runtime
Group: Development/Libraries/Java Group: Development/Libraries/Java
Requires: glassfish-fastinfoset
Requires: istack-commons-runtime
Requires: java-headless >= 1.8 Requires: java-headless >= 1.8
Requires: stax-ex
%description runtime %description runtime
JAXB (JSR 222) Reference Implementation JAXB (JSR 222) Reference Implementation
@@ -166,6 +176,8 @@ This package contains TXW parent POM.
%package xjc %package xjc
Summary: JAXB XJC Summary: JAXB XJC
Group: Development/Libraries/Java Group: Development/Libraries/Java
Requires: glassfish-dtd-parser
Requires: istack-commons-tools
Requires: java-headless >= 1.8 Requires: java-headless >= 1.8
%description xjc %description xjc
@@ -228,6 +240,7 @@ This package contains the API documentation for %{name}.
%patch -P 0 %patch -P 0
%patch -P 1 -p1 %patch -P 1 -p1
%patch -P 2 -p1
pushd jaxb-ri pushd jaxb-ri
@@ -249,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 :gfnexus-maven-plugin
%pom_remove_plugin :maven-site-plugin %pom_remove_plugin :maven-site-plugin
%pom_remove_plugin :buildnumber-maven-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} %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 sed -i -e 's#tasks\>#target\>#g' xjc/pom.xml jxc/pom.xml

127
pom-errors.patch Normal file
View 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>