pool/jdom2
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

OBS-URL: https://build.opensuse.org/package/show/Java:packages/jdom2?expand=0&rev=14

Browse Source
This commit is contained in:
Fridrich Strba 2023-08-23 15:01:01 +00:00 committed by Git OBS Bridge
parent 4e0fc51d89
commit 261d25655b
8 changed files with 122 additions and 316 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

150
0001-Adapt-build.patch
View File

@ -1,14 +1,14 @@
From 40912d0cdd69b3f327402176ce622078e6d0846d Mon Sep 17 00:00:00 2001
From: Michael Simacek <msimacek@redhat.com>
Date: Mon, 23 Jul 2018 14:30:14 +0200
From cf7e676edc7ab9d4b8b130ca4d8ecbd291995dea Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk@redhat.com>
Date: Mon, 20 Apr 2020 09:29:12 +0200
Subject: [PATCH] Adapt build
---
build.xml | 42 ++++++++++++++++++++++++++----------------
1 file changed, 26 insertions(+), 16 deletions(-)
build.xml | 61 +++----------------------------------------------------
1 file changed, 3 insertions(+), 58 deletions(-)
diff --git a/build.xml b/build.xml
index ed632c2c..78bbe934 100644
index ed632c2..d80abff 100644
--- a/build.xml
+++ b/build.xml
@@ -112,17 +112,7 @@ For instructions on how to build JDOM, please view the README.txt file.
@ -26,78 +26,94 @@ index ed632c2c..78bbe934 100644
- <!-- this is used for testing Java5 (the test sets stax.dir) -->
- <pathelement location="${stax.dir}/jsr173_1.0_api.jar" />
- <pathelement location="${stax.dir}/sjsxp.jar" />
+ <fileset dir="${lib.dir}" includes="*.jar" />
+ <fileset dir="${lib.dir}" includes="*.jar" />
</path>
<path id="core.class.path">
@@ -289,6 +279,7 @@ For instructions on how to build JDOM, please view the README.txt file.
header="&lt;b&gt;${Name}&lt;br&gt;&lt;font size='-1'&gt;${version}&lt;/font&gt;&lt;/b&gt;"
bottom="Copyright &#169; ${year} Jason Hunter, Brett McLaughlin. All Rights Reserved.">
<classpath refid="base.class.path"/>
+ <link href="${j2se.apidoc}"/>
</javadoc>
@@ -296,7 +286,7 @@ For instructions on how to build JDOM, please view the README.txt file.
<!-- =================================================================== -->
<!-- Creates the jars -->
<!-- =================================================================== -->
- <target name="jars" depends="compile, javadoc"
+ <target name="jars" depends="compile.core, javadoc"
description="Builds the Jars">
<fixcrlf srcdir="." includes="**/*.bat" excludes="build*.*" eol="crlf"/>
<fixcrlf srcdir="." includes="**/*.sh" excludes="build*.*" eol="lf"/>
@@ -316,27 +306,6 @@ For instructions on how to build JDOM, please view the README.txt file.
<fileset dir="${core.build}" includes="**/*.class" />
<fileset dir="${metainf.build}" excludes="**/MANIFEST.MF" />
</jar>
- <jar jarfile="${package}/${jarbase}-contrib.jar" >
- <fileset dir="${contrib.build}" includes="**/*" />
- <fileset dir="${metainf.build}" excludes="**/MANIFEST.MF" />
- </jar>
- <jar jarfile="${package}/${jarbase}-junit.jar" >
- <fileset dir="${junit.build}" includes="**/*" />
- <fileset dir="${metainf.build}" excludes="**/MANIFEST.MF" />
- </jar>
- <jar destfile="${package}/${jarbase}-javadoc.jar"
- basedir="${build.javadocs}" includes="**/*" />
-
- <jar jarfile="${package}/${jarbase}-sources.jar" >
- <fileset dir="${core.src}" includes="**/*" />
- </jar>
- <jar jarfile="${package}/${jarbase}-junit-sources.jar" >
- <fileset dir="${junit.src}" includes="**/*" />
- </jar>
- <jar jarfile="${package}/${jarbase}-contrib-sources.jar" >
- <fileset dir="${contrib.src}" includes="**/*" />
- </jar>
-
</target>
@@ -378,11 +369,11 @@ For instructions on how to build JDOM, please view the README.txt file.
<!-- =================================================================== -->
<target name="package" depends="coverage, jars"
description="Creates the class package">
- <zip destfile="${package}/${jarbase}.zip">
+ <!--<zip destfile="${package}/${jarbase}.zip">
<fileset dir="${package}" includes="${jarbase}*.jar" />
<fileset dir="${basedir}" includes="lib/xerces* lib/jaxen* lib/xml* lib/xalan/**" />
<fileset dir="${basedir}" includes="LICENSE.txt README.txt" />
- </zip>
+ </zip>-->
<target name="androidtests" depends="jars">
@@ -505,7 +474,7 @@ For instructions on how to build JDOM, please view the README.txt file.
<delete dir="${mavendir}" includes="**/*" failonerror="false"/>
</target>
<!-- =================================================================== -->
@@ -406,6 +397,7 @@ For instructions on how to build JDOM, please view the README.txt file.
<include name="**/*.class"/>
<!-- exclude name="**/**/jaxen/**/*.class"/ -->
</fileset>
+ <classpath refid="junit.class.path" />
</cobertura-instrument>
- <target name="maven" depends="maven.clean, package"
+ <target name="maven" depends="maven.clean, jars"
description="Prepares Maven bundle to load on to Sonatype Nexus for Maven-Central">
<mkdir dir="${mavendir}" />
<mkdir dir="${mavendir}/core" />
@@ -517,8 +486,6 @@ For instructions on how to build JDOM, please view the README.txt file.
<property name="forkjunit" value="true" />
@@ -533,7 +525,25 @@ For instructions on how to build JDOM, please view the README.txt file.
<!-- copy the build jar -->
<copy tofile="${mavendir}/core/${mavenbase}.jar" file="${package}/${jarbase}.jar"/>
- <copy tofile="${mavendir}/core/${mavenbase}-javadoc.jar" file="${package}/${jarbase}-javadoc.jar"/>
- <copy tofile="${mavendir}/core/${mavenbase}-sources.jar" file="${package}/${jarbase}-sources.jar"/>
<!-- load the license in to the ${license} property -->
<loadfile property="license" srcfile="LICENSE.txt" />
@@ -532,28 +499,6 @@ For instructions on how to build JDOM, please view the README.txt file.
<filter token="license" value="${license}" />
</filterset>
</copy>
-
- <exec dir="${mavendir}/core" executable="${gpg}">
+ <copy filtering="true" file="maven/contrib.pom" tofile="${mavendir}/core/${mavenbase}-contrib.pom">
+ <filterset>
+ <filter token="artifactID" value="${mavenartifact}"/>
+ <filter token="version" value="${version}" />
+ <filter token="jdk" value="${compile.target}" />
+ <filter token="license" value="${license}" />
+ </filterset>
+ </copy>
+
+ <copy filtering="true" file="maven/junit.pom" tofile="${mavendir}/core/${mavenbase}-junit.pom">
+ <filterset>
+ <filter token="artifactID" value="${mavenartifact}"/>
+ <filter token="version" value="${version}" />
+ <filter token="jdk" value="${compile.target}" />
+ <filter token="license" value="${license}" />
+ </filterset>
+ </copy>
+
+ <!--exec dir="${mavendir}/core" executable="${gpg}">
<arg value="-abv"/>
<arg value="${mavenbase}.pom"/>
</exec>
@@ -548,8 +558,8 @@ For instructions on how to build JDOM, please view the README.txt file.
<exec dir="${mavendir}/core" executable="${gpg}">
<arg value="-abv"/>
<arg value="${mavenbase}-javadoc.jar"/>
- <arg value="-abv"/>
- <arg value="${mavenbase}.pom"/>
- </exec>
- <exec dir="${mavendir}/core" executable="${gpg}">
- <arg value="-abv"/>
- <arg value="${mavenbase}.jar"/>
- </exec>
- <exec dir="${mavendir}/core" executable="${gpg}">
- <arg value="-abv"/>
- <arg value="${mavenbase}-sources.jar"/>
- </exec>
- <exec dir="${mavendir}/core" executable="${gpg}">
- <arg value="-abv"/>
- <arg value="${mavenbase}-javadoc.jar"/>
- </exec>
-
+ </exec-->
+
<jar destfile="${mavendir}/${mavenbase}-maven-bundle.jar"
basedir="${mavendir}/core"
includes="${mavenbase}*" excludes="*maven-bundle*" />
- <jar destfile="${mavendir}/${mavenbase}-maven-bundle.jar"
- basedir="${mavendir}/core"
- includes="${mavenbase}*" excludes="*maven-bundle*" />
-
</target>
</project>
--
2.34.1
2.37.2

3
JDOM-2.0.6.1.tar.gz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:18639399104d5c57b92fd6791823a74393651e80499b67ae3067294d62df083e
size 8368301

17
_service Normal file
View File

@ -0,0 +1,17 @@
<services>
<service name="tar_scm" mode="disabled">
<param name="scm">git</param>
<param name="url">https://github.com/hunterhacker/jdom.git</param>
<param name="revision">JDOM-2.0.6.1</param>
<param name="match-tag">JDOM-*</param>
<param name="versionformat">@PARENT_TAG@</param>
<param name="versionrewrite-pattern">JDOM-(.*)</param>
<param name="exclude">lib/*</param>
<param name="exclude">*/lib</param>
</service>
<service name="recompress" mode="disabled">
<param name="file">*.tar</param>
<param name="compression">xz</param>
</service>
<service name="set_version" mode="disabled"/>
</services>

BIN
jdom-2.0.6.1.tar.xz (Stored with Git LFS) Normal file
View File

Binary file not shown.

96
jdom-contrib-template.pom
View File

@ -1,96 +0,0 @@
<project>
<modelVersion>4.0.0</modelVersion>
<groupId>org.jdom</groupId>
<artifactId>@artifactID@-contrib</artifactId>
<packaging>jar</packaging>
<name>JDOM Contrib</name>
<version>@version@</version>
<description>
A complete, Java-based solution for accessing, manipulating,
and outputting XML data
</description>
<url>http://www.jdom.org</url>
<organization>
<name>JDOM</name>
<url>http://www.jdom.org</url>
</organization>
<mailingLists>
<mailingList>
<name>JDOM-interest Mailing List</name>
<post>jdom-interest@jdom.org</post>
<archive>http://jdom.markmail.org/</archive>
</mailingList>
</mailingLists>
<licenses>
<license>
<name>Similar to Apache License but with the acknowledgment clause removed</name>
<url>https://raw.github.com/hunterhacker/jdom/master/LICENSE.txt</url>
<distribution>repo</distribution>
<comments xml:space="preserve"><![CDATA[
@license@
]]></comments>
</license>
</licenses>
<scm>
<url>git@github.com:/hunterhacker/jdom</url>
<connection>scm:git:git@github.com:hunterhacker/jdom</connection>
<developerConnection>scm:git:git@github.com:hunterhacker/jdom</developerConnection>
</scm>
<developers>
<developer>
<id>hunterhacker</id>
<name>Jason Hunter</name>
<email>jhunter@servlets.com</email>
</developer>
<developer>
<id>rolfl</id>
<name>Rolf Lear</name>
<email>jdom@tuis.net</email>
</developer>
</developers>
<dependencies>
<dependency>
<groupId>org.jdom</groupId>
<artifactId>@artifactID@</artifactId>
<version>@version@</version>
</dependency>
<dependency>
<groupId>jaxen</groupId>
<artifactId>jaxen</artifactId>
<version>1.1.4</version>
<optional>true</optional>
</dependency>
<dependency>
<groupId>xerces</groupId>
<artifactId>xercesImpl</artifactId>
<version>2.10.0</version>
<optional>true</optional>
</dependency>
<dependency>
<groupId>isorelax</groupId>
<artifactId>isorelax</artifactId>
<version>20030108</version>
<optional>true</optional>
</dependency>
<dependency>
<groupId>stax</groupId>
<artifactId>stax-api</artifactId>
<version>1.0.1</version>
<optional>true</optional>
</dependency>
</dependencies>
<properties>
<jdk.version>@jdk@</jdk.version>
</properties>
</project>

120
jdom-junit-template.pom
View File

@ -1,120 +0,0 @@
<project>
<modelVersion>4.0.0</modelVersion>
<groupId>org.jdom</groupId>
<artifactId>@artifactID@-junit</artifactId>
<packaging>jar</packaging>
<name>JDOM Junit</name>
<version>@version@</version>
<description>
A complete, Java-based solution for accessing, manipulating,
and outputting XML data
</description>
<url>http://www.jdom.org</url>
<organization>
<name>JDOM</name>
<url>http://www.jdom.org</url>
</organization>
<mailingLists>
<mailingList>
<name>JDOM-interest Mailing List</name>
<post>jdom-interest@jdom.org</post>
<archive>http://jdom.markmail.org/</archive>
</mailingList>
</mailingLists>
<licenses>
<license>
<name>Similar to Apache License but with the acknowledgment clause removed</name>
<url>https://raw.github.com/hunterhacker/jdom/master/LICENSE.txt</url>
<distribution>repo</distribution>
<comments xml:space="preserve"><![CDATA[
@license@
]]></comments>
</license>
</licenses>
<scm>
<url>git@github.com:/hunterhacker/jdom</url>
<connection>scm:git:git@github.com:hunterhacker/jdom</connection>
<developerConnection>scm:git:git@github.com:hunterhacker/jdom</developerConnection>
</scm>
<developers>
<developer>
<id>hunterhacker</id>
<name>Jason Hunter</name>
<email>jhunter@servlets.com</email>
</developer>
<developer>
<id>rolfl</id>
<name>Rolf Lear</name>
<email>jdom@tuis.net</email>
</developer>
</developers>
<dependencies>
<dependency>
<groupId>org.jdom</groupId>
<artifactId>@artifactID@</artifactId>
<version>@version@</version>
</dependency>
<dependency>
<groupId>jaxen</groupId>
<artifactId>jaxen</artifactId>
<version>1.1.4</version>
<optional>true</optional>
</dependency>
<dependency>
<groupId>xerces</groupId>
<artifactId>xercesImpl</artifactId>
<version>2.10.0</version>
<optional>true</optional>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.11</version>
<optional>true</optional>
</dependency>
<dependency>
<groupId>asm</groupId>
<artifactId>asm</artifactId>
<version>3.3.1</version>
<optional>true</optional>
</dependency>
<dependency>
<groupId>asm</groupId>
<artifactId>asm-tree</artifactId>
<version>3.3.1</version>
<optional>true</optional>
</dependency>
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<version>1.2.17</version>
<optional>true</optional>
</dependency>
<dependency>
<groupId>net.sourceforge.cobertura</groupId>
<artifactId>cobertura</artifactId>
<version>1.9.4.1</version>
<optional>true</optional>
</dependency>
<dependency>
<groupId>net.sourceforge.cobertura</groupId>
<artifactId>cobertura-runtime</artifactId>
<version>1.9.4.1</version>
<optional>true</optional>
</dependency>
</dependencies>
<properties>
<jdk.version>@jdk@</jdk.version>
</properties>
</project>

9
jdom2.changes
View File

@ -1,3 +1,12 @@
-------------------------------------------------------------------
Wed Aug 23 14:59:34 UTC 2023 - Fridrich Strba <fstrba@suse.com>
- Drop unused *-junit and *-contrib artifacts
- Reduce drastically dependencies
- Modified patch:
* 0001-Adapt-build.patch
+ drop junit and contrib jars
-------------------------------------------------------------------
Tue Jan 18 07:47:46 UTC 2022 - Fridrich Strba <fstrba@suse.com>

40
jdom2.spec
View File

@ -1,7 +1,7 @@
#
# spec file for package jdom2
#
# Copyright (c) 2022 SUSE LLC
# Copyright (c) 2023 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -23,24 +23,13 @@ Summary: Java manipulation of XML
License: Saxpath
Group: Development/Libraries/Java
URL: http://www.jdom.org/
Source0: https://github.com/hunterhacker/jdom/archive/JDOM-%{version}.tar.gz
# originally taken from http://repo1.maven.org/maven2/org/jdom/jdom-contrib/1.1.3/jdom-contrib-1.1.3.pom
Source1: jdom-contrib-template.pom
Source2: jdom-junit-template.pom
# Use system libraries
# Disable gpg signatures
# Process contrib and junit pom files
Source0: jdom-%{version}.tar.xz
Patch0: 0001-Adapt-build.patch
BuildRequires: ant
BuildRequires: ant-junit
BuildRequires: fdupes
BuildRequires: isorelax
BuildRequires: java-devel >= 1.7
BuildRequires: java-devel >= 1.8
BuildRequires: javapackages-local
BuildRequires: jaxen
BuildRequires: xalan-j2
BuildRequires: xerces-j2
BuildRequires: xml-apis
BuildArch: noarch
%description
@ -60,40 +49,31 @@ Group: Documentation/HTML
This package contains javadoc for %{name}.
%prep
%setup -q -n jdom-JDOM-%{version}
rm -r lib */lib
find -name '*.jar' -delete
find -name '*.class' -delete
%setup -q -n jdom-%{version}
%patch0 -p1
cp -p %{SOURCE1} maven/contrib.pom
cp -p %{SOURCE2} maven/junit.pom
sed -i 's/\r//' LICENSE.txt
# Unable to run coverage: use log4j12 but switch to log4j 2.x
sed -i.coverage "s|coverage, jars|jars|" build.xml
# XPath functionality is not needed
rm -rf core/src/java/org/jdom2/xpath/
sed -i '/import org.jdom2.xpath.XPathFactory/d' core/src/java/org/jdom2/JDOMConstants.java
%build
mkdir lib
build-jar-repository lib xerces-j2 xml-commons-apis jaxen junit isorelax xalan-j2 xalan-j2-serializer
%{ant} -Dversion=%{version} -Dcompile.target=7 -Dcompile.source=7 -Dj2se.apidoc=%{_javadocdir}/java maven
mkdir -p lib
%{ant} -Dversion=%{version} -Dcompile.target=8 -Dcompile.source=8 -Dj2se.apidoc=%{_javadocdir}/java maven
%install
# jar
install -dm 0755 %{buildroot}%{_javadir}/%{name}
install -pm 0644 build/package/jdom-%{version}.jar %{buildroot}%{_javadir}/%{name}/%{name}.jar
install -pm 0644 build/package/jdom-%{version}-contrib.jar %{buildroot}%{_javadir}/%{name}/%{name}-contrib.jar
install -pm 0644 build/package/jdom-%{version}-junit.jar %{buildroot}%{_javadir}/%{name}/%{name}-junit.jar
# pom
install -dm 0755 %{buildroot}%{_mavenpomdir}/%{name}
install -pm 0644 build/maven/core/%{name}-%{version}.pom %{buildroot}%{_mavenpomdir}/%{name}/%{name}.pom
%add_maven_depmap %{name}/%{name}.pom %{name}/%{name}.jar
install -pm 0644 build/maven/core/%{name}-%{version}-contrib.pom %{buildroot}%{_mavenpomdir}/%{name}/%{name}-contrib.pom
%add_maven_depmap %{name}/%{name}-contrib.pom %{name}/%{name}-contrib.jar
install -pm 0644 build/maven/core/%{name}-%{version}-junit.pom %{buildroot}%{_mavenpomdir}/%{name}/%{name}-junit.pom
%add_maven_depmap %{name}/%{name}-junit.pom %{name}/%{name}-junit.jar
# javadoc
install -dm 0755 %{buildroot}%{_javadocdir}/%{name}
cp -pr build/apidocs/* %{buildroot}%{_javadocdir}/%{name}/