Fridrich Strba 2019-03-26 19:48:59 +00:00 committed by Git OBS Bridge
parent a95f44d7f5
commit 2801fce1e2
7 changed files with 150 additions and 109 deletions

View File

@ -1,5 +1,5 @@
--- jdom-1.1/package/META-INF/MANIFEST.MF.osgimanifest 2008-07-21 16:00:59.000000000 -0400
+++ jdom-1.1/package/META-INF/MANIFEST.MF 2008-07-21 16:02:20.000000000 -0400
--- jdom/package/META-INF/MANIFEST.MF.osgimanifest 2008-07-21 16:00:59.000000000 -0400
+++ jdom/package/META-INF/MANIFEST.MF 2008-07-21 16:02:20.000000000 -0400
@@ -1,4 +1,19 @@
Manifest-Version: 1.0
+Bundle-RequiredExecutionEnvironment: J2SE-1.4

View File

@ -1,78 +1,57 @@
--- jdom-1.1/build.xml
+++ jdom-1.1/build.xml
@@ -39,8 +39,8 @@
<property name="compile.debug" value="true" />
<property name="compile.optimize" value="true" />
- <property name="compile.target" value="1.2" />
- <property name="compile.source" value="1.2" />
+ <property name="compile.target" value="1.6" />
+ <property name="compile.source" value="1.6" />
<property name="compile.deprecation" value="true" />
<property name="src.dir" value="./src/java"/>
@@ -75,6 +75,7 @@
<path id="compile.class.path">
<pathelement location="${xml-apis.jar}"/>
<pathelement location="${parser.jar}"/>
+ <pathelement location="${jaxen.lib.dir}"/>
<fileset dir="${jaxen.lib.dir}">
<include name="jaxen-*.jar"/>
--- XOM/build.xml
+++ XOM/build.xml
@@ -201,8 +201,8 @@
debug="${debug}"
optimize="${optimize}"
deprecation="${deprecation}"
- target="1.2"
- source="1.3"
+ target="1.6"
+ source="1.6"
encoding="UTF-8"
excludes="nu/xom/pantry/* nu/xom/tools/* nu/xom/samples/*Servlet.java">
<classpath refid="compile.class.path"/>
@@ -228,8 +228,8 @@
debug="${debug}"
optimize="${optimize}"
deprecation="${deprecation}"
- target="1.2"
- source="1.3"
+ target="1.6"
+ source="1.6"
encoding="UTF-8">
<classpath refid="compile.class.path"/>
<include name="nu/xom/samples/*Servlet.java" />
@@ -244,8 +244,8 @@
debug="${debug}"
optimize="${optimize}"
deprecation="${deprecation}"
- target="1.2"
- source="1.3"
+ target="1.6"
+ source="1.6"
encoding="UTF-8"
failonerror="false">
<classpath refid="compile.class.path"/>
@@ -462,8 +462,8 @@
debug="${debug}"
optimize="${optimize}"
deprecation="${deprecation}"
- target="1.2"
- source="1.3"
+ target="1.6"
+ source="1.6"
encoding="UTF-8"
includes="nu/xom/tools/*">
<classpath>
@@ -705,8 +705,8 @@
debug="${debug}"
optimize="${optimize}"
deprecation="${deprecation}"
- target="1.2"
- source="1.3"
+ target="1.6"
+ source="1.6"
encoding="UTF-8"
includeAntRuntime="no"
excludes="org/jaxen/dom/**
--- XOM/build.xml
+++ XOM/build.xml
@@ -201,8 +201,8 @@
debug="${debug}"
optimize="${optimize}"
deprecation="${deprecation}"
- target="1.2"
- source="1.3"
+ target="1.6"
+ source="1.6"
encoding="UTF-8"
excludes="nu/xom/pantry/* nu/xom/tools/* nu/xom/samples/*Servlet.java">
<classpath refid="compile.class.path"/>
@@ -228,8 +228,8 @@
debug="${debug}"
optimize="${optimize}"
deprecation="${deprecation}"
- target="1.2"
- source="1.3"
+ target="1.6"
+ source="1.6"
encoding="UTF-8">
<classpath refid="compile.class.path"/>
<include name="nu/xom/samples/*Servlet.java" />
@@ -244,8 +244,8 @@
debug="${debug}"
optimize="${optimize}"
deprecation="${deprecation}"
- target="1.2"
- source="1.3"
+ target="1.6"
+ source="1.6"
encoding="UTF-8"
failonerror="false">
<classpath refid="compile.class.path"/>
@@ -462,8 +462,8 @@
debug="${debug}"
optimize="${optimize}"
deprecation="${deprecation}"
- target="1.2"
- source="1.3"
+ target="1.6"
+ source="1.6"
encoding="UTF-8"
includes="nu/xom/tools/*">
<classpath>
@@ -705,8 +705,8 @@
debug="${debug}"
optimize="${optimize}"
deprecation="${deprecation}"
- target="1.2"
- source="1.3"
+ target="1.6"
+ source="1.6"
encoding="UTF-8"
includeAntRuntime="no"
excludes="org/jaxen/dom/**

75
jdom-1.1.3.pom Normal file
View File

@ -0,0 +1,75 @@
<project>
<modelVersion>4.0.0</modelVersion>
<groupId>org.jdom</groupId>
<artifactId>jdom</artifactId>
<packaging>jar</packaging>
<name>JDOM</name>
<version>1.1.3</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>
</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>jaxen</groupId>
<artifactId>jaxen</artifactId>
<version>1.1.3</version>
<optional>true</optional>
</dependency>
<dependency>
<groupId>xerces</groupId>
<artifactId>xercesImpl</artifactId>
<version>2.10.0</version>
<optional>true</optional>
</dependency>
</dependencies>
<properties>
<jdk.version>1.2</jdk.version>
</properties>
</project>

BIN
jdom-1.1.3.tar.gz (Stored with Git LFS) Normal file

Binary file not shown.

View File

@ -1,15 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>jdom</groupId>
<artifactId>jdom</artifactId>
<version>1.1</version>
<packaging>jar</packaging>
<distributionManagement>
<relocation>
<groupId>org.jdom</groupId>
</relocation>
</distributionManagement>
</project>

View File

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

View File

@ -20,7 +20,7 @@
%define xom_suffix %{nil}
%define xom_dir %{_builddir}/%{name}-%{jdom_version}/XOM
%define xom_included_jaxen_archive jaxen-1.1-src.zip
%define jdom_version 1.1
%define jdom_version 1.1.3
%define jdom_suffix %{nil}
%define dom4j_version 1.6.1
%define dom4j_suffix %{nil}
@ -31,16 +31,16 @@
%define jaxen_version 1.1.1
%define jaxen_suffix %{nil}
%define jaxen_dir %{_builddir}/%{name}-%{jdom_version}/jaxen-%{jaxen_version}
%define jdom_dir %{_builddir}/%{name}-%{jdom_version}/%{name}-%{jdom_version}
%define jdom_dir %{_builddir}/%{name}-%{jdom_version}/%{name}
%define stage1_build_dir %{_builddir}/build
Name: jdom
Version: 1.1
Version: 1.1.3
Release: 0
Summary: JDOM is a Java Representation of an XML Document
License: Apache-2.0
Group: Development/Libraries/Java
URL: http://www.jdom.org
Source0: %{name}-%{version}.tar.bz2
Source0: http://jdom.org/dist/binary/archive/%{name}-%{version}.tar.gz
Source1: saxpath-%{saxpath_version}.tar.bz2
Source2: xom-%{xom_version}-src.tar.bz2
# svn co svn://svn.debian.org/svn/pkg-java/trunk/dom4j
@ -51,7 +51,7 @@ Source2: xom-%{xom_version}-src.tar.bz2
# tar --exclude-vcs -cjf dom4j-1.6.1-debian.tar.bz2 dom4j/
Source3: dom4j-%{dom4j_version}-debian.tar.bz2
Source4: jaxen-%{jaxen_version}-src.tar.bz2
Source10: http://repo.maven.apache.org/maven2/%{name}/%{name}/%{jdom_version}%{jdom_suffix}/%{name}-%{jdom_version}%{jdom_suffix}.pom
Source10: http://repo.maven.apache.org/maven2/org/%{name}/%{name}/%{jdom_version}%{jdom_suffix}/%{name}-%{jdom_version}%{jdom_suffix}.pom
Source11: http://repo.maven.apache.org/maven2/saxpath/saxpath/%{saxpath_version}%{saxpath_suffix}/saxpath-%{saxpath_version}%{saxpath_suffix}.pom
Source12: http://repo.maven.apache.org/maven2/xom/xom/1.2.5/xom-1.2.5.pom
Source13: http://repo.maven.apache.org/maven2/jaxen/jaxen/%{jaxen_version}%{jaxen_suffix}/jaxen-%{jaxen_version}%{jaxen_suffix}.pom
@ -187,22 +187,24 @@ rm -f \
dom4j/src/java/org/jaxen/dom4j/Dom4jXPath.java
${JAVAC} -classpath ${CLASSPATH} -sourcepath ${SOURCE_PATH} -d %{stage1_build_dir} $(find ${SOURCE_DIRS} -name "*.java" | xargs)
unset CLASSPATH SOURCE_DIRS SOURCE_PATH
jar cf %{jdom_dir}/jaxen.jar -C %{stage1_build_dir} .
pushd %{jdom_dir}
ant -Dparser.jar=$(build-classpath xerces-j2) \
-Dxml-apis.jar=$(build-classpath xml-commons-apis) \
-Djaxen.lib.dir=%{stage1_build_dir} \
-Dant.build.javac.source=1.6 -Dant.build.javac.target=1.6 \
-Djaxen.lib.dir=%{jdom_dir} \
-Dcompile.source=1.6 -Dcompile.target=1.6 \
-Dversion=%jdom_version \
package
mv build/jdom.jar %{_builddir}/jdom-%{jdom_version}.jar
mv build/jdom-%{jdom_version}.jar %{_builddir}/jdom-%{jdom_version}.jar
rm jaxen.jar
popd
pushd %{jaxen_dir}/src/java/main
mkdir build
#mkdir %{_builddir}/jaxen-excluded
#mv org/jaxen/dom4j %{_builddir}/jaxen-excluded
${JAVAC} -classpath %{_builddir}/jdom-%{jdom_version}.jar:%{stage1_build_dir} -d build/ $(find . -name "*.java" | xargs)
cd build
jar -cf %{_builddir}/jaxen-%{jaxen_version}.jar *
jar -cf %{_builddir}/jaxen-%{jaxen_version}.jar -C build .
popd
pushd %{saxpath_dir}
mkdir src/conf
@ -236,7 +238,7 @@ ln -sf %{_javadir}/xom-%{xom_version}.jar %{buildroot}/%{_javadir}/xom.jar
mkdir -p %{buildroot}/%{_mavenpomdir}
cp *.pom %{buildroot}/%{_mavenpomdir}/
%add_maven_depmap jdom-%{jdom_version}.pom jdom-%{jdom_version}.jar
%add_maven_depmap jdom-%{jdom_version}.pom jdom-%{jdom_version}.jar -a jdom:jdom
%add_maven_depmap xom-%{xom_version}.pom xom-%{xom_version}.jar -f xom
%add_maven_depmap saxpath-%{saxpath_version}.pom saxpath-%{saxpath_version}.jar -f saxpath
%add_maven_depmap jaxen-%{jaxen_version}.pom jaxen-%{jaxen_version}.jar -f jaxen