[junit/f19] (6 commits) ...Cleanup
by tradej@fedoraproject.org
Summary of changes:
6a7ec87... Update (*)
9ea9d9b... Fixed little things (*)
8834406... No hamcrest src (*)
5a76f8b... Fixed hamcrest patch (*)
8a44097... Added snapshot to paths (*)
92720f8... Cleanup (*)
(*) This commit already existed in another branch; no separate mail sent
10 years, 12 months
[glassfish-jaxb-api] update to 2.2.9
by gil
commit 9d7ed9f178310760269b5b5f8b90ba14b66e3086
Author: gil <puntogil(a)libero.it>
Date: Thu May 2 19:21:17 2013 +0200
update to 2.2.9
.gitignore | 1 +
glassfish-jaxb-api.spec | 16 +--
jaxb-api-2.2.9.pom | 257 +++++++++++++++++++++++++++++++++++++++++++++++
sources | 2 +-
4 files changed, 265 insertions(+), 11 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 9936400..6338c78 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
/jaxb-api-2.2.3-sources.jar
/jaxb-api-src.zip
/jaxb-api-2.2.7-sources.jar
+/jaxb-api-2.2.9-sources.jar
diff --git a/glassfish-jaxb-api.spec b/glassfish-jaxb-api.spec
index 3dfa262..ebf5574 100644
--- a/glassfish-jaxb-api.spec
+++ b/glassfish-jaxb-api.spec
@@ -1,7 +1,7 @@
%global oname jaxb-api
Name: glassfish-jaxb-api
-Version: 2.2.7
-Release: 3%{?dist}
+Version: 2.2.9
+Release: 1%{?dist}
Summary: Java Architecture for XML Binding
Group: Development/Libraries
License: CDDL or GPLv2 with exception
@@ -12,10 +12,7 @@ URL: http://jaxb.java.net/
Source0: http://repo1.maven.org/maven2/javax/xml/bind/%{oname}/%{version}/%{oname}...
Source1: http://repo1.maven.org/maven2/javax/xml/bind/%{oname}/%{version}/%{oname}...
-Patch0: %{name}-2.2.6-osgi-support.patch
-
BuildRequires: java-devel >= 1:1.6.0
-BuildRequires: jpackage-utils
BuildRequires: java-javadoc
BuildRequires: jvnet-parent
@@ -23,7 +20,6 @@ BuildRequires: jvnet-parent
BuildRequires: maven-local
BuildRequires: maven-compiler-plugin
BuildRequires: maven-enforcer-plugin
-BuildRequires: maven-install-plugin
BuildRequires: maven-jar-plugin
BuildRequires: maven-javadoc-plugin
BuildRequires: maven-plugin-bundle
@@ -32,7 +28,6 @@ BuildRequires: maven-shared-osgi
BuildRequires: maven-surefire-plugin
Requires: java >= 1:1.6.0
-Requires: jpackage-utils
BuildArch: noarch
%description
@@ -42,7 +37,6 @@ Glassfish - JAXB (JSR 222) API.
Group: Documentation
Summary: Javadoc for %{oname}
Requires: %{name} = %{version}-%{release}
-Requires: jpackage-utils
%description javadoc
Glassfish - JAXB (JSR 222) API.
@@ -62,13 +56,12 @@ mkdir -p src/main/java
)
cp -p %{SOURCE1} pom.xml
-%patch0 -p0
sed -i 's|<location>${basedir}/offline-javadoc</location>|<location>%{_javadocdir}/java</location>|' pom.xml
%build
-mvn-rpmbuild install javadoc:javadoc
+mvn-rpmbuild package javadoc:javadoc
%install
@@ -91,6 +84,9 @@ cp -pr target/site/apidocs/* %{buildroot}%{_javadocdir}/%{oname}
%{_javadocdir}/%{oname}
%changelog
+* Thu May 02 2013 gil cattaneo <puntogil(a)libero.it> 2.2.9-1
+- update to 2.2.9
+
* Wed Feb 13 2013 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 2.2.7-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
diff --git a/jaxb-api-2.2.9.pom b/jaxb-api-2.2.9.pom
new file mode 100644
index 0000000..35fcc07
--- /dev/null
+++ b/jaxb-api-2.2.9.pom
@@ -0,0 +1,257 @@
+<?xml version="1.0"?>
+<!--
+
+ DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+
+ Copyright (c) 1997-2013 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>4</version>
+ </parent>
+
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <version>2.2.9</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.9</connection>
+ <developerConnection>scm:svn:https://svn.java.net/svn/jsr222~svn/tags/jaxb-api-2.2.9</developerConnection>
+ <url>http://java.net/projects/jsr222/sources/svn/show/tags/jaxb-api-2.2.9</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.5.1</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.4</version>
+ <configuration>
+ <archive>
+ <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
+ <manifestEntries>
+ <Extension-Name>javax.xml.bind</Extension-Name>
+ </manifestEntries>
+ <manifest>
+ <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
+ </manifest>
+ </archive>
+ </configuration>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <extensions>true</extensions>
+ <version>2.3.7</version>
+ <configuration>
+ <archive>
+ <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
+ </archive>
+ <instructions>
+ <Export-Package>{local-packages};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>
+ <Bundle-SymbolicName>jaxb-api</Bundle-SymbolicName>
+ <Bundle-Name>jaxb-api</Bundle-Name>
+ <DynamicImport-Package>org.glassfish.hk2.osgiresourcelocator</DynamicImport-Package>
+ </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-javadoc-plugin</artifactId>
+ <version>2.8.1</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.4</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 670f9f3..a191b5f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-cc292b472743232ca12d698a5bd45042 jaxb-api-2.2.7-sources.jar
+5d40817b19c01fd7e8748e6fbd79c821 jaxb-api-2.2.9-sources.jar
10 years, 12 months
[jvnet-parent/f19] Update to version 4
by Stanislav Ochotnicky
Summary of changes:
fbc891d... Update to version 4 (*)
(*) This commit already existed in another branch; no separate mail sent
10 years, 12 months
[jvnet-parent] Update to version 4
by Stanislav Ochotnicky
commit fbc891d073202474be3208409d3ff47e1bc3ee3e
Author: gil <puntogil(a)libero.it>
Date: Thu May 2 17:49:53 2013 +0200
Update to version 4
Signed-off-by: Stanislav Ochotnicky <sochotnicky(a)redhat.com>
jvnet-parent-3.pom | 159 ------------------------------------
jvnet-parent-4.pom | 228 ++++++++++++++++++++++++++++++++++++++++++++++++++++
jvnet-parent.spec | 7 +-
3 files changed, 233 insertions(+), 161 deletions(-)
---
diff --git a/jvnet-parent-4.pom b/jvnet-parent-4.pom
new file mode 100644
index 0000000..adb7ed9
--- /dev/null
+++ b/jvnet-parent-4.pom
@@ -0,0 +1,228 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ ~ Copyright (c) 2007-2012 Sonatype, Inc. All rights reserved.
+ ~
+ ~ This program is licensed to you under the Apache License Version 2.0,
+ ~ and you may not use this file except in compliance with the Apache License Version 2.0.
+ ~ You may obtain a copy of the Apache License Version 2.0 at http://www.apache.org/licenses/LICENSE-2.0.
+ ~
+ ~ Unless required by applicable law or agreed to in writing,
+ ~ software distributed under the Apache License Version 2.0 is distributed on an
+ ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ ~ See the Apache License Version 2.0 for the specific language governing permissions and limitations there under.
+ -->
+<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/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <groupId>net.java</groupId>
+ <artifactId>jvnet-parent</artifactId>
+ <version>4</version>
+ <packaging>pom</packaging>
+
+ <name>Java.net Parent</name>
+ <url>http://java.net/</url>
+ <description>Java.net - The Source for Java Technology Collaboration</description>
+
+ <scm>
+ <connection>scm:git:git@github.com:sonatype/jvnet-parent.git</connection>
+ <developerConnection>scm:git:git@github.com:sonatype/jvnet-parent.git</developerConnection>
+ <url>https://github.com/sonatype/jvnet-parent</url>
+ </scm>
+
+ <distributionManagement>
+ <snapshotRepository>
+ <id>jvnet-nexus-snapshots</id>
+ <name>Java.net Nexus Snapshots Repository</name>
+ <url>${jvnetDistMgmtSnapshotsUrl}</url>
+ </snapshotRepository>
+ <repository>
+ <id>jvnet-nexus-staging</id>
+ <name>Java.net Nexus Staging Repository</name>
+ <url>https://maven.java.net/service/local/staging/deploy/maven2/</url>
+ </repository>
+ </distributionManagement>
+
+ <build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-release-plugin</artifactId>
+ <configuration>
+ <mavenExecutorId>forked-path</mavenExecutorId>
+ <useReleaseProfile>false</useReleaseProfile>
+ <arguments>-Pjvnet-release ${release.arguments}</arguments>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
+
+ <properties>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <jvnetDistMgmtSnapshotsUrl>https://maven.java.net/content/repositories/snapshots/</jvnetDistMgmtSnapshotsUrl>
+ </properties>
+
+ <profiles>
+ <profile>
+ <id>jvnet-release</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-source-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>attach-sources</id>
+ <goals>
+ <goal>jar-no-fork</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>attach-javadocs</id>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-enforcer-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>enforce-maven</id>
+ <goals>
+ <goal>enforce</goal>
+ </goals>
+ <configuration>
+ <rules>
+ <requireMavenVersion>
+ <version>(,2.1.0),(2.1.0,2.2.0),(2.2.0,)</version>
+ <message>Maven 2.1.0 and 2.2.0 produce incorrect GPG signatures
+ and checksums respectively.
+ </message>
+ </requireMavenVersion>
+ </rules>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-gpg-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>sign-artifacts</id>
+ <phase>verify</phase>
+ <goals>
+ <goal>sign</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ <profile>
+ <id>snapshots</id>
+ <repositories>
+ <repository>
+ <id>jvnet-nexus-snapshots</id>
+ <name>Java.net Nexus Snapshots Repository</name>
+ <url>https://maven.java.net/content/repositories/snapshots</url>
+ <releases>
+ <enabled>false</enabled>
+ </releases>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ </repository>
+ </repositories>
+ <pluginRepositories>
+ <pluginRepository>
+ <id>jvnet-nexus-snapshots</id>
+ <name>Java.net Nexus Snapshots Repository</name>
+ <url>https://maven.java.net/content/repositories/snapshots</url>
+ <releases>
+ <enabled>false</enabled>
+ </releases>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ </pluginRepository>
+ </pluginRepositories>
+ </profile>
+ <profile>
+ <id>staging</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ </activation>
+ <repositories>
+ <repository>
+ <id>jvnet-nexus-staging</id>
+ <name>Java.net Staging Repositoriy</name>
+ <url>https://maven.java.net/content/repositories/staging/</url>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ </repository>
+ </repositories>
+ <pluginRepositories>
+ <pluginRepository>
+ <id>jvnet-nexus-staging</id>
+ <name>Java.net Staging Repositoriy</name>
+ <url>https://maven.java.net/content/repositories/staging/</url>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ </pluginRepository>
+ </pluginRepositories>
+ </profile>
+ <profile>
+ <id>promoted</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ </activation>
+ <repositories>
+ <repository>
+ <id>jvnet-nexus-promoted</id>
+ <name>Java.net Promoted Repositories</name>
+ <url>https://maven.java.net/content/repositories/promoted/</url>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ </repository>
+ </repositories>
+ <pluginRepositories>
+ <pluginRepository>
+ <id>jvnet-nexus-promoted</id>
+ <name>Java.net Promoted Repositories</name>
+ <url>https://maven.java.net/content/repositories/promoted/</url>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ </pluginRepository>
+ </pluginRepositories>
+ </profile>
+ </profiles>
+</project>
diff --git a/jvnet-parent.spec b/jvnet-parent.spec
index ef43b62..263dbfa 100644
--- a/jvnet-parent.spec
+++ b/jvnet-parent.spec
@@ -1,6 +1,6 @@
Name: jvnet-parent
-Version: 3
-Release: 9%{?dist}
+Version: 4
+Release: 1%{?dist}
Summary: Java.net parent POM file
Group: Development/Libraries
@@ -36,6 +36,9 @@ cp -p %{SOURCE1} LICENSE
%doc LICENSE
%changelog
+* Thu May 02 2013 gil cattaneo <puntogil(a)libero.it> - 4-1
+- Update to version 4
+
* Thu Feb 14 2013 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 3-9
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
10 years, 12 months