java-sig-commits September 2014

java-sig-commits@lists.fedoraproject.org

17 participants
611 discussions

[google-guice] Update to upstream version 3.2.4
by Mikolaj Izdebski 29 Sep '14

29 Sep '14

commit c33210e447fb1194dd53215bd45dbb095e7d2549 Author: Mikolaj Izdebski <mizdebsk(a)redhat.com> Date: Mon Sep 29 10:44:32 2014 +0200 Update to upstream version 3.2.4 .gitignore | 1 + google-guice.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) --- diff --git a/.gitignore b/.gitignore index f3025d5..f3f23cd 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ /google-guice-3.1.10.tar.xz /google-guice-3.2.1.tar.xz /google-guice-3.2.2.tar.xz +/google-guice-3.2.4.tar.xz diff --git a/google-guice.spec b/google-guice.spec index 1563f47..f00e398 100644 --- a/google-guice.spec +++ b/google-guice.spec @@ -5,7 +5,7 @@ %global short_name guice Name: google-%{short_name} -Version: 3.2.2 +Version: 3.2.4 Release: 1%{?dist} Summary: Lightweight dependency injection framework for Java 5 and above Group: Development/Libraries @@ -236,6 +236,9 @@ servlet,spring,throwingproviders}" "com.google.inject.extensions:guice-@1" %changelog +* Mon Sep 29 2014 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 3.2.4-1 +- Update to upstream version 3.2.4 + * Fri Jun 6 2014 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 3.2.2-1 - Update to upstream version 3.2.2 diff --git a/sources b/sources index 02d0257..17cc291 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -9f8b28a3e31d9dbb4ca45b6f000653b0 google-guice-3.2.2.tar.xz +58483f9e5314700a16cc6c5628aa88a5 google-guice-3.2.4.tar.xz

1 0

File google-guice-3.2.4.tar.xz uploaded to lookaside cache by mizdebsk
by Mikolaj Izdebski 29 Sep '14

29 Sep '14

A file has been added to the lookaside cache for google-guice: 58483f9e5314700a16cc6c5628aa88a5 google-guice-3.2.4.tar.xz

1 0

[maven-javadoc-plugin] Non-bootstrap build
by Mikolaj Izdebski 29 Sep '14

29 Sep '14

commit ee761231d2a08a57b41f8494d225619e216f71c5 Author: Mikolaj Izdebski <mizdebsk(a)redhat.com> Date: Mon Sep 29 10:01:26 2014 +0200 Non-bootstrap build This reverts commit 6dab17ff33c8285513400c64afc3660c10c8f897. maven-javadoc-plugin.spec | 9 +++------ 1 files changed, 3 insertions(+), 6 deletions(-) --- diff --git a/maven-javadoc-plugin.spec b/maven-javadoc-plugin.spec index d9c53ab..fff1f13 100644 --- a/maven-javadoc-plugin.spec +++ b/maven-javadoc-plugin.spec @@ -1,6 +1,6 @@ Name: maven-javadoc-plugin Version: 2.10.1 -Release: 0.1%{?dist} +Release: 1%{?dist} Summary: Maven Javadoc Plugin License: ASL 2.0 URL: http://maven.apache.org/plugins/maven-javadoc-plugin @@ -71,7 +71,7 @@ API documentation for %{name}. sed -i -e "s|org.apache.maven.doxia.module.xhtml.decoration.render|org.apache.maven.doxia.siterenderer|g" src/main/java/org/apache/maven/plugin/javadoc/JavadocReport.java %build -%mvn_build -j -f -- -DmavenVersion=3.1.1 +%mvn_build -f -- -DmavenVersion=3.1.1 %install %mvn_install @@ -80,13 +80,10 @@ sed -i -e "s|org.apache.maven.doxia.module.xhtml.decoration.render|org.apache.ma %dir %{_javadir}/%{name} %doc LICENSE NOTICE -%files javadoc +%files javadoc -f .mfiles-javadoc %doc LICENSE NOTICE %changelog -* Mon Sep 29 2014 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 2.10.1-0.1 -- Bootstrap build - * Mon Sep 29 2014 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 2.10.1-1 - Update to upstream version 2.10.1

1 0

[maven-javadoc-plugin] Bootstrap build
by Mikolaj Izdebski 29 Sep '14

29 Sep '14

commit 6dab17ff33c8285513400c64afc3660c10c8f897 Author: Mikolaj Izdebski <mizdebsk(a)redhat.com> Date: Mon Sep 29 10:00:32 2014 +0200 Bootstrap build maven-javadoc-plugin.spec | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) --- diff --git a/maven-javadoc-plugin.spec b/maven-javadoc-plugin.spec index fff1f13..d9c53ab 100644 --- a/maven-javadoc-plugin.spec +++ b/maven-javadoc-plugin.spec @@ -1,6 +1,6 @@ Name: maven-javadoc-plugin Version: 2.10.1 -Release: 1%{?dist} +Release: 0.1%{?dist} Summary: Maven Javadoc Plugin License: ASL 2.0 URL: http://maven.apache.org/plugins/maven-javadoc-plugin @@ -71,7 +71,7 @@ API documentation for %{name}. sed -i -e "s|org.apache.maven.doxia.module.xhtml.decoration.render|org.apache.maven.doxia.siterenderer|g" src/main/java/org/apache/maven/plugin/javadoc/JavadocReport.java %build -%mvn_build -f -- -DmavenVersion=3.1.1 +%mvn_build -j -f -- -DmavenVersion=3.1.1 %install %mvn_install @@ -80,10 +80,13 @@ sed -i -e "s|org.apache.maven.doxia.module.xhtml.decoration.render|org.apache.ma %dir %{_javadir}/%{name} %doc LICENSE NOTICE -%files javadoc -f .mfiles-javadoc +%files javadoc %doc LICENSE NOTICE %changelog +* Mon Sep 29 2014 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 2.10.1-0.1 +- Bootstrap build + * Mon Sep 29 2014 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 2.10.1-1 - Update to upstream version 2.10.1

1 0

[maven-javadoc-plugin] Update to upstream version 2.10.1
by Mikolaj Izdebski 29 Sep '14

29 Sep '14

commit 5b524e0b01fdae749aa2413b219a8ff308fe36fc Author: Mikolaj Izdebski <mizdebsk(a)redhat.com> Date: Mon Sep 29 08:35:52 2014 +0200 Update to upstream version 2.10.1 .gitignore | 1 + maven-javadoc-plugin.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) --- diff --git a/.gitignore b/.gitignore index b389bc1..cedb0e7 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ maven-javadoc-plugin-2.8.1-source-release.zip /maven-javadoc-plugin-2.9-source-release.zip /maven-javadoc-plugin-2.9.1-source-release.zip /maven-javadoc-plugin-2.10-source-release.zip +/maven-javadoc-plugin-2.10.1-source-release.zip diff --git a/maven-javadoc-plugin.spec b/maven-javadoc-plugin.spec index 822a540..fff1f13 100644 --- a/maven-javadoc-plugin.spec +++ b/maven-javadoc-plugin.spec @@ -1,5 +1,5 @@ Name: maven-javadoc-plugin -Version: 2.10 +Version: 2.10.1 Release: 1%{?dist} Summary: Maven Javadoc Plugin License: ASL 2.0 @@ -84,6 +84,9 @@ sed -i -e "s|org.apache.maven.doxia.module.xhtml.decoration.render|org.apache.ma %doc LICENSE NOTICE %changelog +* Mon Sep 29 2014 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 2.10.1-1 +- Update to upstream version 2.10.1 + * Tue Sep 16 2014 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 2.10-1 - Update to upstream version 2.10 diff --git a/sources b/sources index b6aefb5..42e2007 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -cb4c57a93ae57e0a64ee58fdaa27a544 maven-javadoc-plugin-2.10-source-release.zip +2d57987102d4654bde909af593a42ba6 maven-javadoc-plugin-2.10.1-source-release.zip

1 0

[plexus-io] Patch accepted upstream
by Mikolaj Izdebski 29 Sep '14

29 Sep '14

commit 00525ec46bbf6f1b3bde204f391430e7199bd0fd Author: Mikolaj Izdebski <mizdebsk(a)redhat.com> Date: Mon Sep 29 09:28:49 2014 +0200 Patch accepted upstream plexus-io.spec | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) --- diff --git a/plexus-io.spec b/plexus-io.spec index 4aac367..51c483b 100644 --- a/plexus-io.spec +++ b/plexus-io.spec @@ -9,7 +9,7 @@ BuildArch: noarch Source0: https://github.com/sonatype/plexus-io/archive/plexus-io-%{version}.tar.gz Source1: http://www.apache.org/licenses/LICENSE-2.0.txt -# Forwarded upstream: http://jira.codehaus.org/browse/PLXCOMP-244 +# Accepted upstream: http://jira.codehaus.org/browse/PLXCOMP-244 # https://github.com/sonatype/plexus-io/pull/6 Patch0: 0001-Don-t-try-to-set-attributes-of-symbolic-links.patch

1 0

[plexus-utils] Update to current packaging guidelines
by Mikolaj Izdebski 29 Sep '14

29 Sep '14

commit 378b2dfdeda86cc675c75debefae28a59b02a2f8 Author: Mikolaj Izdebski <mizdebsk(a)redhat.com> Date: Mon Sep 29 08:40:02 2014 +0200 Update to current packaging guidelines plexus-utils.spec | 69 +++++----------------------------------------------- 1 files changed, 7 insertions(+), 62 deletions(-) --- diff --git a/plexus-utils.spec b/plexus-utils.spec index c2f68be..b95bbf3 100644 --- a/plexus-utils.spec +++ b/plexus-utils.spec @@ -1,33 +1,3 @@ -# Copyright (c) 2000-2007, JPackage Project -# All rights reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions -# are met: -# -# 1. Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# 2. Redistributions in binary form must reproduce the above copyright -# notice, this list of conditions and the following disclaimer in the -# documentation and/or other materials provided with the -# distribution. -# 3. Neither the name of the JPackage Project nor the names of its -# contributors may be used to endorse or promote products derived -# from this software without specific prior written permission. -# -# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -# - %global parent plexus %global subname utils @@ -44,26 +14,13 @@ Summary: Plexus Common Utilities # Public domain: src/main/java/org/codehaus/plexus/util/TypeFormat.java # rest is ASL 2.0 License: ASL 1.1 and ASL 2.0 and xpp and BSD and Public Domain -Group: Development/Libraries URL: http://plexus.codehaus.org/ Source0: https://github.com/sonatype/%{name}/archive/%{name}-%{version}.tar.gz Source1: http://apache.org/licenses/LICENSE-2.0.txt - BuildArch: noarch -BuildRequires: jpackage-utils >= 0:1.6 -Requires: jpackage-utils BuildRequires: maven-local -BuildRequires: maven-compiler-plugin -BuildRequires: maven-install-plugin -BuildRequires: maven-jar-plugin -BuildRequires: maven-javadoc-plugin -BuildRequires: maven-resources-plugin -BuildRequires: maven-surefire-plugin -BuildRequires: maven-doxia-sitetools -BuildRequires: maven-surefire-provider-junit BuildRequires: mvn(org.apache.maven.plugins:maven-enforcer-plugin) -Requires: java-headless >= 1:1.7.0 %description The Plexus project seeks to create end-to-end developer tools for @@ -75,8 +32,6 @@ is like a J2EE application server, without all the baggage. %package javadoc Summary: Javadoc for %{name} -Group: Documentation -Requires: jpackage-utils %description javadoc Javadoc for %{name}. @@ -85,6 +40,9 @@ Javadoc for %{name}. %setup -q -n %{name}-%{name}-%{version} cp %{SOURCE1} . +%mvn_file : plexus/utils +%mvn_alias : plexus:plexus-utils + # Generate OSGI info %pom_xpath_inject "pom:project" "<packaging>bundle</packaging>" %pom_xpath_inject "pom:build/pom:plugins" " @@ -101,34 +59,21 @@ cp %{SOURCE1} . </plugin>" %build -mvn-rpmbuild install javadoc:javadoc -Dmaven.test.failure.ignore=true +%mvn_build -f %install -# jars -install -d -m 755 $RPM_BUILD_ROOT%{_javadir}/%{parent} -install -pm 644 target/%{name}-%{version}.jar \ - $RPM_BUILD_ROOT%{_javadir}/plexus/utils.jar - -# pom -install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir} -install -pm 644 pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.%{parent}-%{subname}.pom - -%add_maven_depmap -a "plexus:plexus-utils" JPP.%{name}.pom plexus/utils.jar - -# javadoc -install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name} -cp -pr target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name} +%mvn_install %files -f .mfiles %doc NOTICE.txt LICENSE-2.0.txt -%files javadoc +%files javadoc -f .mfiles-javadoc %doc NOTICE.txt LICENSE-2.0.txt -%doc %{_javadocdir}/%{name} %changelog * Mon Sep 29 2014 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 3.0.18-1 - Update to upstream version 3.0.18 +- Update to current packaging guidelines * Sat Jun 07 2014 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 3.0.16-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild

1 0

[plexus-utils] Update to upstream version 3.0.18
by Mikolaj Izdebski 29 Sep '14

29 Sep '14

commit d44af4ba836248991f0a3693ab4e49f17458c1c8 Author: Mikolaj Izdebski <mizdebsk(a)redhat.com> Date: Mon Sep 29 08:37:21 2014 +0200 Update to upstream version 3.0.18 .gitignore | 1 + plexus-utils.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) --- diff --git a/.gitignore b/.gitignore index e0f6290..b8e09bd 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ plexus-utils-3.0.tar.xz /plexus-utils-3.0.9.tar.gz /plexus-utils-3.0.14.tar.gz /plexus-utils-3.0.16.tar.gz +/plexus-utils-3.0.18.tar.gz diff --git a/plexus-utils.spec b/plexus-utils.spec index fc42a28..c2f68be 100644 --- a/plexus-utils.spec +++ b/plexus-utils.spec @@ -32,8 +32,8 @@ %global subname utils Name: plexus-utils -Version: 3.0.16 -Release: 3%{?dist} +Version: 3.0.18 +Release: 1%{?dist} Summary: Plexus Common Utilities # ASL 1.1: several files in src/main/java/org/codehaus/plexus/util/ # xpp: src/main/java/org/codehaus/plexus/util/xml/pull directory @@ -127,6 +127,9 @@ cp -pr target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name} %doc %{_javadocdir}/%{name} %changelog +* Mon Sep 29 2014 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 3.0.18-1 +- Update to upstream version 3.0.18 + * Sat Jun 07 2014 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 3.0.16-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild diff --git a/sources b/sources index 56597cc..de111d0 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -53ed6c81cd751e6793a1fe18e1adb139 plexus-utils-3.0.16.tar.gz +6cae9dd940f8351ed7f5d9dddc07ae3e plexus-utils-3.0.18.tar.gz 3b83ef96387f14655fc854ddc3c6bd57 LICENSE-2.0.txt

1 0

File plexus-utils-3.0.18.tar.gz uploaded to lookaside cache by mizdebsk
by Mikolaj Izdebski 29 Sep '14

29 Sep '14

A file has been added to the lookaside cache for plexus-utils: 6cae9dd940f8351ed7f5d9dddc07ae3e plexus-utils-3.0.18.tar.gz

1 0

File maven-javadoc-plugin-2.10.1-source-release.zip uploaded to lookaside cache by mizdebsk
by Mikolaj Izdebski 29 Sep '14

29 Sep '14

A file has been added to the lookaside cache for maven-javadoc-plugin: 2d57987102d4654bde909af593a42ba6 maven-javadoc-plugin-2.10.1-source-release.zip

1 0

← Newer
1
...
14
15
16
17
18
19
20
...
62
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

java-sig-commits September 2014