Compare commits
No commits in common. 'f38' and 'i8c-stream-201801' have entirely different histories.
f38
...
i8c-stream
@ -1 +0,0 @@
|
||||
1
|
||||
@ -1,4 +1 @@
|
||||
/JDOM-2.0.5.tar.gz
|
||||
/JDOM-2.0.6.tar.gz
|
||||
/jdom2-2.0.6.tar.gz
|
||||
/jdom2-2.0.6.1.tar.gz
|
||||
SOURCES/jdom2-2.0.6.tar.gz
|
||||
|
||||
@ -0,0 +1 @@
|
||||
d47a717b9ea4e9917652d4b80a669b5f55fe7639 SOURCES/jdom2-2.0.6.tar.gz
|
||||
@ -1,119 +0,0 @@
|
||||
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 | 61 +++----------------------------------------------------
|
||||
1 file changed, 3 insertions(+), 58 deletions(-)
|
||||
|
||||
diff --git a/build.xml b/build.xml
|
||||
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.
|
||||
|
||||
<!-- Compilation class path -->
|
||||
<path id="base.class.path">
|
||||
- <pathelement location="${jaxen.jar}" />
|
||||
- <pathelement location="${parser.jar}" />
|
||||
- <pathelement location="${xmlapi.jar}" />
|
||||
- <pathelement location="${junit.jar}" />
|
||||
- <pathelement location="${isorelax.jar}" />
|
||||
- <pathelement location="${xalan.jar}" />
|
||||
- <pathelement location="${xalanser.jar}" />
|
||||
- <!-- normally these stax jars will not be found -->
|
||||
- <!-- 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" />
|
||||
</path>
|
||||
|
||||
<path id="core.class.path">
|
||||
@@ -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>
|
||||
|
||||
<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>
|
||||
|
||||
- <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.
|
||||
|
||||
<!-- 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}">
|
||||
- <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>
|
||||
-
|
||||
- <jar destfile="${mavendir}/${mavenbase}-maven-bundle.jar"
|
||||
- basedir="${mavendir}/core"
|
||||
- includes="${mavenbase}*" excludes="*maven-bundle*" />
|
||||
-
|
||||
</target>
|
||||
|
||||
</project>
|
||||
--
|
||||
2.37.2
|
||||
|
||||
@ -0,0 +1,101 @@
|
||||
From 05a8a2fa49e92ad36a86d5d73588a2e46bf9ff95 Mon Sep 17 00:00:00 2001
|
||||
From: Michael Simacek <msimacek@redhat.com>
|
||||
Date: Mon, 23 Jul 2018 14:30:14 +0200
|
||||
Subject: [PATCH] Adapt build
|
||||
|
||||
---
|
||||
build.xml | 40 +++++++++++++++++++++++++---------------
|
||||
1 file changed, 25 insertions(+), 15 deletions(-)
|
||||
|
||||
diff --git a/build.xml b/build.xml
|
||||
index cd7c2ed..10d8df6 100644
|
||||
--- a/build.xml
|
||||
+++ b/build.xml
|
||||
@@ -112,17 +112,7 @@ For instructions on how to build JDOM, please view the README.txt file.
|
||||
|
||||
<!-- Compilation class path -->
|
||||
<path id="base.class.path">
|
||||
- <pathelement location="${jaxen.jar}" />
|
||||
- <pathelement location="${parser.jar}" />
|
||||
- <pathelement location="${xmlapi.jar}" />
|
||||
- <pathelement location="${junit.jar}" />
|
||||
- <pathelement location="${isorelax.jar}" />
|
||||
- <pathelement location="${xalan.jar}" />
|
||||
- <pathelement location="${xalanser.jar}" />
|
||||
- <!-- normally these stax jars will not be found -->
|
||||
- <!-- 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" />
|
||||
</path>
|
||||
|
||||
<path id="core.class.path">
|
||||
@@ -289,6 +279,7 @@ For instructions on how to build JDOM, please view the README.txt file.
|
||||
header="<b>${Name}<br><font size='-1'>${version}</font></b>"
|
||||
bottom="Copyright © ${year} Jason Hunter, Brett McLaughlin. All Rights Reserved.">
|
||||
<classpath refid="base.class.path"/>
|
||||
+ <link href="${j2se.apidoc}"/>
|
||||
</javadoc>
|
||||
</target>
|
||||
|
||||
@@ -373,11 +364,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>
|
||||
|
||||
<!-- =================================================================== -->
|
||||
@@ -401,6 +392,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>
|
||||
|
||||
<property name="forkjunit" value="true" />
|
||||
@@ -528,7 +520,25 @@ For instructions on how to build JDOM, please view the README.txt file.
|
||||
</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>
|
||||
@@ -543,7 +553,7 @@ 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"/>
|
||||
- </exec>
|
||||
+ </exec-->
|
||||
|
||||
<jar destfile="${mavendir}/${mavenbase}-maven-bundle.jar"
|
||||
basedir="${mavendir}/core"
|
||||
--
|
||||
2.17.1
|
||||
|
||||
@ -0,0 +1,96 @@
|
||||
<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>
|
||||
@ -0,0 +1,120 @@
|
||||
<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>
|
||||
@ -1,8 +0,0 @@
|
||||
--- !Policy
|
||||
product_versions:
|
||||
- fedora-*
|
||||
decision_contexts:
|
||||
- bodhi_update_push_testing
|
||||
- bodhi_update_push_stable
|
||||
rules:
|
||||
- !PassingTestCaseRule {test_case_name: fedora-ci.koji-build./plans/javapackages.functional}
|
||||
@ -1,7 +0,0 @@
|
||||
summary: Run javapackages-specific tests
|
||||
discover:
|
||||
how: fmf
|
||||
url: https://src.fedoraproject.org/tests/javapackages
|
||||
ref: f37
|
||||
execute:
|
||||
how: tmt
|
||||
Loading…
Reference in new issue