[glassfish-jaxb-api] update to 2.2.6
by gil
commit 7ed05bd03fc9adad30074d1f30626cc69a675435
Author: gil <puntogil(a)libero.it>
Date: Fri Apr 27 10:57:20 2012 +0200
update to 2.2.6
.gitignore | 1 +
glassfish-jaxb-api-2.2.3-fixbuild.patch | 136 ------------------
glassfish-jaxb-api-2.2.6-osgi-support.patch | 70 +++++++++
glassfish-jaxb-api.spec | 44 +++---
jaxb-api-2.2.3.pom | 149 -------------------
jaxb-api-2.2.6.pom | 207 +++++++++++++++++++++++++++
sources | 2 +-
7 files changed, 299 insertions(+), 310 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 52189c0..67a4f5f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
/jaxb-api-2.2.3-sources.jar
+/jaxb-api-src.zip
diff --git a/glassfish-jaxb-api-2.2.6-osgi-support.patch b/glassfish-jaxb-api-2.2.6-osgi-support.patch
new file mode 100644
index 0000000..4f90940
--- /dev/null
+++ b/glassfish-jaxb-api-2.2.6-osgi-support.patch
@@ -0,0 +1,70 @@
+--- pom.xml 2011-12-01 09:20:20.000000000 +0100
++++ pom.xml-gil 2012-04-27 10:24:01.741796876 +0200
+@@ -119,17 +119,61 @@
+ </plugin>
+
+ <plugin>
++ <groupId>org.apache.felix</groupId>
++ <artifactId>maven-bundle-plugin</artifactId>
++ <version>2.0.0</version>
++ <configuration>
++ <instructions>
++ <Bundle-Description>${project.description} bundled for OSGi distribution</Bundle-Description>
++ <Bundle-Name>${project.artifactId}</Bundle-Name>
++ <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
++ <DynamicImport-Package>org.glassfish.hk2.osgiresourcelocator</DynamicImport-Package>
++ <Export-Package>javax.xml.bind.*;version="${project.version}"</Export-Package>
++ <Import-Package>javax.activation,
++ javax.xml.bind;version="${project.version}",
++ javax.xml.bind.annotation;version="${project.version}",
++ javax.xml.bind.annotation.adapters;version="${project.version}",
++ javax.xml.bind.attachment;version="${project.version}",
++ javax.xml.bind.helpers;version="${project.version}",
++ javax.xml.bind.util;version="${project.version}",
++ javax.xml.datatype,
++ javax.xml.namespace,
++ javax.xml.parsers,
++ javax.xml.stream,
++ javax.xml.transform,
++ javax.xml.transform.dom,
++ javax.xml.transform.sax,
++ javax.xml.transform.stream,
++ javax.xml.validation,
++ org.w3c.dom,
++ org.xml.sax,
++ org.xml.sax.ext,
++ org.xml.sax.helpers</Import-Package>
++ <Extension-Name>javax.xml.bind</Extension-Name>
++ <Specification-Title>${project.name}</Specification-Title>
++ <Specification-Vendor>${project.organization.name}</Specification-Vendor>
++ <Specification-Version>${project.version}</Specification-Version>
++ </instructions>
++ </configuration>
++ <executions>
++ <execution>
++ <id>bundle-manifest</id>
++ <phase>process-classes</phase>
++ <goals>
++ <goal>manifest</goal>
++ </goals>
++ </execution>
++ </executions>
++ </plugin>
++
++ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <version>2.3.1</version>
+ <configuration>
+ <archive>
+- <manifestEntries>
+- <Extension-Name>javax.xml.bind</Extension-Name>
+- </manifestEntries>
+- <manifest>
+- <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
+- </manifest>
++ <!-- add the generated manifest to the archive -->
++ <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
+ </archive>
+ </configuration>
+ </plugin>
diff --git a/glassfish-jaxb-api.spec b/glassfish-jaxb-api.spec
index c5029c7..7266105 100644
--- a/glassfish-jaxb-api.spec
+++ b/glassfish-jaxb-api.spec
@@ -1,31 +1,37 @@
%global oname jaxb-api
Name: glassfish-jaxb-api
-Version: 2.2.3
-Release: 2%{?dist}
+Version: 2.2.6
+Release: 1%{?dist}
Summary: Java Architecture for XML Binding
Group: Development/Libraries
License: CDDL or GPLv2 with exception
URL: http://jaxb.java.net/
-Source0: http://download.java.net/maven/2/javax/xml/bind/jaxb-api/%{version}/jaxb-...
-Source1: http://download.java.net/maven/2/javax/xml/bind/jaxb-api/%{version}/jaxb-...
-Patch0: %{name}-2.2.3-fixbuild.patch
+# jaxb api and impl have different version
+# svn export https://svn.java.net/svn/jaxb~version2/tags/jaxb-2_2_5/tools/lib/redist/j...
+
+Source0: jaxb-api-src.zip
+#Source1: http://download.java.net/maven/2/javax/xml/bind/jaxb-api/%{version}/jaxb-...
+Source1: http://repo1.maven.org/maven2/javax/xml/bind/jaxb-api/%{version}/jaxb-api...
+
+Patch0: %{name}-2.2.6-osgi-support.patch
BuildRequires: java-devel >= 1:1.6.0
BuildRequires: jpackage-utils
BuildRequires: java-javadoc
-BuildRequires: bea-stax-api
-BuildRequires: forge-parent
+BuildRequires: jvnet-parent
+
BuildRequires: maven
BuildRequires: maven-compiler-plugin
+BuildRequires: maven-enforcer-plugin
BuildRequires: maven-install-plugin
BuildRequires: maven-jar-plugin
BuildRequires: maven-javadoc-plugin
BuildRequires: maven-plugin-bundle
BuildRequires: maven-resources-plugin
BuildRequires: maven-shared-osgi
+BuildRequires: maven-surefire-plugin
-Requires: bea-stax-api
Requires: java >= 1:1.6.0
Requires: jpackage-utils
BuildArch: noarch
@@ -48,33 +54,19 @@ This package contains javadoc for %{name}.
%setup -T -q -c
# fixing incomplete source directory structure
-mkdir -p src/main/java src/main/resources
+mkdir -p src/main/java
(
cd src/main/java
- jar -xf %{SOURCE0}
- find . -iname 'package.html' -delete
+ unzip -qq %{SOURCE0}
rm -rf META-INF
)
cp -p %{SOURCE1} pom.xml
-
%patch0 -p0
sed -i 's|<location>${basedir}/offline-javadoc</location>|<location>%{_javadocdir}/java</location>|' pom.xml
-# clone source directory structure
-find src/ -type d | while read dirname ; do
- newdirname=`echo $dirname | sed "s:src/main/java:src/main/resources:g"`
- mkdir -p $newdirname
-done
-
-# copy Messages.properties files except *.java sources
-find src/ -type f | grep -v "\.java" | while read cpfrom ; do
- cpto=`echo $cpfrom | sed "s:src/main/java:src/main/resources:g"`
- cp $cpfrom $cpto
-done
-
%build
mvn-rpmbuild install javadoc:javadoc
@@ -100,6 +92,10 @@ cp -pr target/site/apidocs/* %{buildroot}%{_javadocdir}/%{oname}
%{_javadocdir}/%{oname}
%changelog
+* Fri Apr 27 2012 gil cattaneo <puntogil(a)libero.it> 2.2.6-1
+- update to 2.2.6
+- remove Build/Requires: bea-stax-api
+
* Tue Jan 24 2012 gil cattaneo <puntogil(a)libero.it> 2.2.3-2
- revert to 2.2.3 (stable release)
- fix License field
diff --git a/jaxb-api-2.2.6.pom b/jaxb-api-2.2.6.pom
new file mode 100644
index 0000000..7275da5
--- /dev/null
+++ b/jaxb-api-2.2.6.pom
@@ -0,0 +1,207 @@
+<?xml version="1.0"?>
+<!--
+
+ DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+
+ Copyright (c) 1997-2011 Oracle and/or its affiliates. All rights reserved.
+
+ The contents of this file are subject to the terms of either the GNU
+ General Public License Version 2 only ("GPL") or the Common Development
+ and Distribution License("CDDL") (collectively, the "License"). You
+ may not use this file except in compliance with the License. You can
+ obtain a copy of the License at
+ https://glassfish.dev.java.net/public/CDDL+GPL_1_1.html
+ or packager/legal/LICENSE.txt. See the License for the specific
+ language governing permissions and limitations under the License.
+
+ When distributing the software, include this License Header Notice in each
+ file and include the License file at packager/legal/LICENSE.txt.
+
+ GPL Classpath Exception:
+ Oracle designates this particular file as subject to the "Classpath"
+ exception as provided by Oracle in the GPL Version 2 section of the License
+ file that accompanied this code.
+
+ Modifications:
+ If applicable, add the following below the License Header, with the fields
+ enclosed by brackets [] replaced by your own identifying information:
+ "Portions Copyright [year] [name of copyright owner]"
+
+ Contributor(s):
+ If you wish your version of this file to be governed by only the CDDL or
+ only the GPL Version 2, indicate your decision by adding "[Contributor]
+ elects to include this software in this distribution under the [CDDL or GPL
+ Version 2] license." If you don't indicate a single choice of license, a
+ recipient has the option to distribute your version of this file under
+ either the CDDL, the GPL Version 2 or to extend the choice of license to
+ its licensees as provided above. However, if you add GPL Version 2 code
+ and therefore, elected the GPL Version 2 license, then the option applies
+ only if the new code is made subject to such option by the copyright
+ holder.
+
+-->
+
+<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">
+
+ <parent>
+ <groupId>net.java</groupId>
+ <artifactId>jvnet-parent</artifactId>
+ <version>1</version>
+ </parent>
+
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <version>2.2.6</version>
+ <packaging>jar</packaging>
+
+ <name>Java Architecture for XML Binding</name>
+ <description>JAXB (JSR 222) API</description>
+ <url>http://jaxb.java.net/</url>
+
+ <organization>
+ <name>Oracle Corporation</name>
+ <url>http://www.oracle.com/</url>
+ </organization>
+
+ <developers>
+ <developer>
+ <name>Martin Grebac</name>
+ <email>martin.grebac(a)oracle.com</email>
+ <organization>Oracle Corporation</organization>
+ </developer>
+ </developers>
+
+ <licenses>
+ <license>
+ <name>CDDL 1.1</name>
+ <url>https://glassfish.java.net/public/CDDL+GPL_1_1.html</url>
+ <distribution>repo</distribution>
+ </license>
+ <license>
+ <name>GPL2 w/ CPE</name>
+ <url>https://glassfish.java.net/public/CDDL+GPL_1_1.html</url>
+ <distribution>repo</distribution>
+ </license>
+ </licenses>
+
+ <scm>
+ <connection>scm:svn:http://svn.java.net/svn/jsr222~svn/tags/jaxb-api-2.2.6</connection>
+ <developerConnection>scm:svn:https://svn.java.net/svn/jsr222~svn/tags/jaxb-api-2.2.6</developerConnection>
+ <url>http://java.net/projects/jsr222/sources/svn/show/tags/jaxb-api-2.2.6</url>
+ </scm>
+
+ <properties>
+ <release.spec.feedback>spec-comments(a)jsr222.java.net</release.spec.feedback>
+ <release.spec.date>Dec 2009</release.spec.date>
+ </properties>
+
+ <build>
+
+ <resources>
+ <resource>
+ <directory>src/main/java</directory>
+ <excludes>
+ <exclude>**/*.java</exclude>
+ </excludes>
+ </resource>
+ </resources>
+
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>2.0.2</version>
+ <configuration>
+ <source>1.5</source>
+ <target>1.5</target>
+ </configuration>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <version>2.3.1</version>
+ <configuration>
+ <archive>
+ <manifestEntries>
+ <Extension-Name>javax.xml.bind</Extension-Name>
+ </manifestEntries>
+ <manifest>
+ <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
+ </manifest>
+ </archive>
+ </configuration>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <version>2.8</version>
+ <configuration>
+ <nodeprecated>false</nodeprecated>
+ <use>false</use>
+ <author>true</author>
+ <version>true</version>
+ <doctitle><![CDATA[<br>
+JAXB ${project.version} Runtime Library</h2>
+${project.name} specification, ${release.spec.date}<br>
+Comments to: <i><a href='mailto:${release.spec.feedback}'>${release.spec.feedback}</a></i><br>
+More information at: <i><a target='_top'
+href='http://jaxb.java.net'>http://jaxb.java.net</a></i><br>
+ <br> <br><hr width='65%'><h1>${project.name}</h1><hr width='75%'>
+<br> <br>]]>
+ </doctitle>
+ <header><![CDATA[JAXB<br>v${project.version}]]>
+ </header>
+ <bottom><![CDATA[<font size=-1>
+<br>Comments to: <a href='mailto:${release.spec.feedback}'><i>${release.spec.feedback}</i></a>
+<br>More information at: <a target='_top'
+href='http://jaxb.java.net'><i>http://jaxb.java.net</i></a>
+<p>Copyright © 2004-2011 Oracle </font>]]>
+ </bottom>
+ <detectJavaApiLink>false</detectJavaApiLink>
+ <offlineLinks>
+ <offlineLink>
+ <url>http://download.oracle.com/javase/6/docs/api/</url>
+ <location>${basedir}/offline-javadoc</location>
+ </offlineLink>
+ </offlineLinks>
+ </configuration>
+ </plugin>
+
+ </plugins>
+
+ </build>
+
+ <profiles>
+ <profile>
+ <id>release-sign-artifacts</id>
+ <activation>
+ <property>
+ <name>performRelease</name>
+ <value>true</value>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-gpg-plugin</artifactId>
+ <version>1.1</version>
+ <executions>
+ <execution>
+ <id>sign-artifacts</id>
+ <phase>verify</phase>
+ <goals>
+ <goal>sign</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+
+</project>
diff --git a/sources b/sources
index b6846b3..f73eb03 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-87c95083c6d18d66ec7a68268468d6a4 jaxb-api-2.2.3-sources.jar
+3382264d4f64465c189aef74ea7a6a3f jaxb-api-src.zip
12 years, 1 month
[apache-commons-compress] Added missing dependency (BR/R) for xz-java
by Sandro "red" Mathys
commit e86c8416646d4734723db76986c9c2e9b627cf41
Author: Sandro Mathys <red(a)fedoraproject.org>
Date: Fri Apr 27 12:37:33 2012 +0200
Added missing dependency (BR/R) for xz-java
apache-commons-compress.spec | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
---
diff --git a/apache-commons-compress.spec b/apache-commons-compress.spec
index c5ed3fb..c337e1f 100644
--- a/apache-commons-compress.spec
+++ b/apache-commons-compress.spec
@@ -16,8 +16,10 @@ BuildRequires: jpackage-utils
BuildRequires: apache-commons-parent
BuildRequires: junit4
BuildRequires: maven-surefire-provider-junit4
+BuildRequires: xz-java
Requires: java >= 1:1.6.0
Requires: jpackage-utils
+Requires: xz-java
Requires(post): jpackage-utils
Requires(postun): jpackage-utils
12 years, 1 month
[apache-commons-compress] Updated to 1.4
by Sandro "red" Mathys
commit 5ec5f72670dbce6e1f663534987f6ea6cfd21304
Author: Sandro Mathys <red(a)fedoraproject.org>
Date: Fri Apr 27 12:23:57 2012 +0200
Updated to 1.4
apache-commons-compress.spec | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
---
diff --git a/apache-commons-compress.spec b/apache-commons-compress.spec
index 3dbeee2..c5ed3fb 100644
--- a/apache-commons-compress.spec
+++ b/apache-commons-compress.spec
@@ -2,8 +2,8 @@
%global short_name commons-%{base_name}
Name: apache-%{short_name}
-Version: 1.3
-Release: 2%{?dist}
+Version: 1.4
+Release: 1%{?dist}
Summary: Java API for working with tar, zip and bzip2 files
Group: Development/Libraries
License: ASL 2.0
@@ -89,6 +89,9 @@ cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}
%changelog
+* Fri Apr 27 2012 Sandro Mathys <red at fedoraproject.org> - 1.4-1
+- Updated to 1.4
+
* Thu Jan 12 2012 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1.3-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
12 years, 1 month
[apache-commons-compress] Updated to 1.4
by Sandro "red" Mathys
commit 86d4aecc950f8acb0d04ea4d1e9a8516dd5451bc
Author: Sandro Mathys <red(a)fedoraproject.org>
Date: Fri Apr 27 12:22:17 2012 +0200
Updated to 1.4
.gitignore | 1 +
sources | 2 +-
2 files changed, 2 insertions(+), 1 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 19344a3..edbabe0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@ commons-compress-1.0-src.tar.gz
/commons-compress-1.1-src.tar.gz
/commons-compress-1.2-src.tar.gz
/commons-compress-1.3-src.tar.gz
+/commons-compress-1.4-src.tar.gz
diff --git a/sources b/sources
index 439e78f..26145fb 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-48a61d99daa255e4cc86f54542e3de44 commons-compress-1.3-src.tar.gz
+866cc45afa89ba0df6374d705d816e85 commons-compress-1.4-src.tar.gz
12 years, 1 month
