Update to upstream 1.1.3 release.

This commit is contained in:
Alexander Kurtakov 2012-04-17 13:29:14 +03:00
parent 86259e7b56
commit b2c0c36917
5 changed files with 84 additions and 141 deletions

1
.gitignore vendored
View File

@ -1,2 +1,3 @@
jdom-1.1.1.tar.gz
jdom-1.1.2.tar.gz
jdom-1.1.3.tar.gz

View File

@ -1,75 +1,75 @@
<project>
<modelVersion>4.0.0</modelVersion>
<groupId>org.jdom</groupId>
<artifactId>jdom</artifactId>
<packaging>jar</packaging>
<name>JDOM</name>
<version>1.1.2</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>
<scope>compile</scope>
</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>
<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>

View File

@ -1,61 +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>org.jdom</groupId>
<artifactId>jdom</artifactId>
<version>1.1</version>
<packaging>jar</packaging>
<name>JDOM</name>
<description>
JDOM is, quite simply, a Java representation of an XML document. JDOM provides a way to represent that document for
easy and efficient reading, manipulation, and writing. It has a straightforward API, is a lightweight and fast, and
is optimized for the Java programmer. It's an alternative to DOM and SAX, although it integrates well with both DOM
and SAX.
</description>
<url>http://www.jdom.org/</url>
<scm>
<connection>scm:cvs:pserver:anonymous@cvs.jdom.org:/home/cvspublic:jdom</connection>
</scm>
<dependencies>
<dependency>
<groupId>xerces</groupId>
<artifactId>xercesImpl</artifactId>
<version>2.6.1</version>
<optional>true</optional>
</dependency>
<dependency>
<groupId>xerces</groupId>
<artifactId>xmlParserAPIs</artifactId>
<version>2.6.1</version>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.jdom</groupId>
<artifactId>jaxen-core</artifactId>
<version>1.0-FCS</version> <!-- patched 1.0-FCS -->
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.jdom</groupId>
<artifactId>jaxen-jdom</artifactId>
<version>1.0-FCS</version> <!-- patched 1.0-FCS -->
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.jdom</groupId>
<artifactId>saxpath</artifactId>
<version>1.0-FCS</version> <!-- patched 1.0-FCS -->
<optional>true</optional>
</dependency>
<dependency>
<groupId>xalan</groupId>
<artifactId>xalan</artifactId>
<version>2.5.D1</version>
<optional>true</optional>
</dependency>
</dependencies>
</project>

View File

@ -29,14 +29,14 @@
#
Name: jdom
Version: 1.1.2
Release: 3%{?dist}
Version: 1.1.3
Release: 1%{?dist}
Epoch: 0
Summary: Java alternative to DOM and SAX
License: ASL 1.1
URL: http://www.jdom.org/
Group: Development/Libraries
Source0: http://jdom.org/dist/binary/jdom-%{version}.tar.gz
Source0: http://jdom.org/dist/binary/archive/jdom-%{version}.tar.gz
Source1: http://repo1.maven.org/maven2/org/jdom/jdom/%{version}/jdom-%{version}.pom
Patch0: %{name}-crosslink.patch
Patch1: %{name}-1.1-OSGiManifest.patch
@ -88,7 +88,7 @@ ant -Dj2se.apidoc=%{_javadocdir}/java package javadoc-link
%install
# jars
mkdir -p $RPM_BUILD_ROOT%{_javadir}
cp -p build/%{name}-%{version}-snap.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
cp -p build/%{name}-1.1.2-snap.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
# javadoc
mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}
@ -118,6 +118,9 @@ cp %{SOURCE1} $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-jdom.pom
%doc LICENSE.txt
%changelog
* Tue Apr 17 2012 Alexander Kurtakov <akurtako@redhat.com> 0:1.1.3-1
- Update to upstream 1.1.3 release.
* Fri Apr 13 2012 Krzysztof Daniel <kdaniel@redhat.com> 0:1.1.2-3
- Update OSGI Manifest.

View File

@ -1 +1 @@
a18b39aaf6b855cc0fdea590a7cc4fa0 jdom-1.1.2.tar.gz
dc8391e84cfdb170fcd8279aa370019f jdom-1.1.3.tar.gz