diff --git a/jdom-1.1-OSGiManifest.patch b/jdom-1.1-OSGiManifest.patch
index aa95e30..1abd449 100644
--- a/jdom-1.1-OSGiManifest.patch
+++ b/jdom-1.1-OSGiManifest.patch
@@ -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
diff --git a/jdom-1.1-build.xml.patch b/jdom-1.1-build.xml.patch
index e76be3e..1dcced4 100644
--- a/jdom-1.1-build.xml.patch
+++ b/jdom-1.1-build.xml.patch
@@ -1,78 +1,57 @@
---- jdom-1.1/build.xml
-+++ jdom-1.1/build.xml
-@@ -39,8 +39,8 @@
-
-
-
--
--
-+
-+
-
-
-
-@@ -75,6 +75,7 @@
-
-
-
-+
-
-
-
---- 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">
-
-@@ -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">
-
-
-@@ -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">
-
-@@ -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/*">
-
-@@ -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">
+
+@@ -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">
+
+
+@@ -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">
+
+@@ -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/*">
+
+@@ -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/**
diff --git a/jdom-1.1.3.pom b/jdom-1.1.3.pom
new file mode 100644
index 0000000..e2d858e
--- /dev/null
+++ b/jdom-1.1.3.pom
@@ -0,0 +1,75 @@
+
+ 4.0.0
+ org.jdom
+ jdom
+ jar
+
+ JDOM
+ 1.1.3
+
+
+ A complete, Java-based solution for accessing, manipulating,
+ and outputting XML data
+
+ http://www.jdom.org
+
+
+ JDOM
+ http://www.jdom.org
+
+
+
+
+ JDOM-interest Mailing List
+ jdom-interest@jdom.org
+ http://jdom.markmail.org/
+
+
+
+
+
+ Similar to Apache License but with the acknowledgment clause removed
+ https://raw.github.com/hunterhacker/jdom/master/LICENSE.txt
+ repo
+
+
+
+
+ git@github.com:/hunterhacker/jdom
+ scm:git:git@github.com:hunterhacker/jdom
+ scm:git:git@github.com:hunterhacker/jdom
+
+
+
+
+ hunterhacker
+ Jason Hunter
+ jhunter@servlets.com
+
+
+ rolfl
+ Rolf Lear
+ jdom@tuis.net
+
+
+
+
+
+ jaxen
+ jaxen
+ 1.1.3
+ true
+
+
+ xerces
+ xercesImpl
+ 2.10.0
+ true
+
+
+
+
+
+ 1.2
+
+
\ No newline at end of file
diff --git a/jdom-1.1.3.tar.gz b/jdom-1.1.3.tar.gz
new file mode 100644
index 0000000..4833555
--- /dev/null
+++ b/jdom-1.1.3.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:d471718c4ac7a1a2f10715b93cb3fcd2ecbab60384b73ad1c089712e47bd8d1f
+size 4233403
diff --git a/jdom-1.1.pom b/jdom-1.1.pom
deleted file mode 100644
index 5247577..0000000
--- a/jdom-1.1.pom
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
- 4.0.0
-
- jdom
- jdom
- 1.1
- jar
-
-
-
- org.jdom
-
-
-
\ No newline at end of file
diff --git a/jdom-1.1.tar.bz2 b/jdom-1.1.tar.bz2
deleted file mode 100644
index 0af889a..0000000
--- a/jdom-1.1.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:e63a7ef30c644bea97fa255e64773b6e6ee4eb1d5799a9a34f3220533944ee98
-size 3336664
diff --git a/jdom.spec b/jdom.spec
index 71e10a5..5cc14f5 100644
--- a/jdom.spec
+++ b/jdom.spec
@@ -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