Attachment 633634 Details for Bug 845735 – Updated to 2.14

[patch] Updated to 2.14

0001-Updated-to-upstream-version-2.14.patch (text/plain), 6.04 KB, created by gil cattaneo on 2012-10-26 04:44:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: gil cattaneo

Created: 2012-10-26 04:44:01 UTC

Size: 6.04 KB

patch

obsolete

>From 6256d7e72bcf70e456ac4e5401679fd27424f579 Mon Sep 17 00:00:00 2001
>From: gil <puntogil@libero.it>
>Date: Fri, 26 Oct 2012 06:42:39 +0200
>Subject: [PATCH] Updated to upstream version 2.14
>
>---
> .gitignore          |    1 +
> istack-commons.spec |   45 +++++++++++++++++++++++++++++----------------
> sources             |    2 +-
> 3 files changed, 31 insertions(+), 17 deletions(-)
>
>diff --git a/.gitignore b/.gitignore
>index c7c6a66..ad2c3ce 100644
>--- a/.gitignore
>+++ b/.gitignore
>@@ -1 +1,2 @@
> /istack-commons-2.6.1.tar.gz
>+/istack-commons-2.14.tar.gz
>diff --git a/istack-commons.spec b/istack-commons.spec
>index dffe17f..407cb8e 100644
>--- a/istack-commons.spec
>+++ b/istack-commons.spec
>@@ -1,17 +1,18 @@
> Name:           istack-commons
>-Version:        2.6.1
>-Release:        5%{?dist}
>+Version:        2.14
>+Release:        1%{?dist}
> Summary:        Common code for some Glassfish projects
> Group:          Development/Libraries
> License:        CDDL and GPLv2
> URL:            http://istack-commons.java.net
> 
>-# svn export https://svn.java.net/svn/istack-commons~svn/tags/istack-commons-2.6.1/ istack-commons-2.6.1
>-# find istack-commons-2.6.1/ -name '*.class' -delete
>-# find istack-commons-2.6.1/ -name '*.jar' -delete
>-# tar -zcvf istack-commons-2.6.1.tar.gz istack-commons-2.6.1
>+# svn export https://svn.java.net/svn/istack-commons~svn/tags/istack-commons-2.14/ istack-commons-2.14
>+# find istack-commons-2.14/ -name '*.class' -delete
>+# find istack-commons-2.14/ -name '*.jar' -delete
>+# find istack-commons-2.14/ -name '*.zip' -delete
>+# tar -zcvf istack-commons-2.14.tar.gz istack-commons-2.14
> Source0:        %{name}-%{version}.tar.gz
>-Patch0:         %{name}-%{version}-activation.patch
>+Patch0:         %{name}-2.6.1-activation.patch
> BuildArch:      noarch
> 
> BuildRequires:  ant
>@@ -46,7 +47,7 @@ Requires:       jvnet-parent
> Code shared between JAXP, JAXB, SAAJ, and JAX-WS projects.
> 
> 
>-%package -n maven-istack-commons-plugin
>+%package maven-plugin
> Summary:        istack-commons Maven Mojo
> Group:          Development/Libraries
> Requires:       %{name} = %{version}-%{release}
>@@ -54,9 +55,10 @@ Requires:       codemodel >= 2.6-4
> Requires:       maven-shared-file-management
> Requires:       plexus-archiver
> Requires:       plexus-io
>+Obsoletes:      maven-istack-commons-plugin < %{version}-%{release}
>+Provides:       maven-istack-commons-plugin = %{version}-%{release}
> 
>-
>-%description -n maven-istack-commons-plugin
>+%description maven-plugin
> This package contains the istack-commons Maven Mojo.
> 
> 
>@@ -97,10 +99,11 @@ install -d -m 755 %{buildroot}%{_mavenpomdir}
> 
> # JAR
> cp -p runtime/target/istack-commons-runtime-%{version}.jar %{buildroot}%{_javadir}/%{name}-runtime.jar
>+cp -p soimp/target/istack-commons-soimp-%{version}.jar %{buildroot}%{_javadir}/%{name}-soimp.jar
> cp -p tools/target/istack-commons-tools-%{version}.jar %{buildroot}%{_javadir}/%{name}-tools.jar
> cp -p test/target/istack-commons-test-%{version}.jar %{buildroot}%{_javadir}/%{name}-test.jar
> cp -p buildtools/target/%{name}-buildtools-%{version}.jar %{buildroot}%{_javadir}/%{name}-buildtools.jar
>-cp -p maven-plugin/target/maven-%{name}-plugin-%{version}.jar %{buildroot}%{_javadir}/maven-%{name}-plugin.jar
>+cp -p maven-plugin/target/%{name}-maven-plugin-%{version}.jar %{buildroot}%{_javadir}/%{name}-maven-plugin.jar
> 
> # JAVADOC
> cp -rp target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}
>@@ -108,21 +111,24 @@ cp -rp target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}
> # POM
> cp -p pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
> cp -p runtime/pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}-runtime.pom
>+cp -p soimp/pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}-soimp.pom
> cp -p tools/pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}-tools.pom
> cp -p test/pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}-test.pom
> cp -p buildtools/pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}-buildtools.pom
>-cp -p maven-plugin/pom.xml %{buildroot}%{_mavenpomdir}/JPP-maven-%{name}-plugin.pom
>+cp -p maven-plugin/pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}-maven-plugin.pom
> 
> # DEPMAP
> %add_maven_depmap JPP-%{name}.pom
> %add_maven_depmap JPP-%{name}-runtime.pom %{name}-runtime.jar
>+%add_maven_depmap JPP-%{name}-soimp.pom %{name}-soimp.jar
> %add_maven_depmap JPP-%{name}-tools.pom %{name}-tools.jar
> %add_maven_depmap JPP-%{name}-test.pom %{name}-test.jar
> %add_maven_depmap JPP-%{name}-buildtools.pom %{name}-buildtools.jar
>-%add_maven_depmap JPP-maven-%{name}-plugin.pom maven-%{name}-plugin.jar -f maven-plugin
>+%add_maven_depmap JPP-%{name}-maven-plugin.pom %{name}-maven-plugin.jar -f maven-plugin -a "com.sun.istack:maven-istack-commons-plugin"
> 
> %files
> %{_mavenpomdir}/JPP-%{name}-runtime.pom
>+%{_mavenpomdir}/JPP-%{name}-soimp.pom
> %{_mavenpomdir}/JPP-%{name}-test.pom
> %{_mavenpomdir}/JPP-%{name}-tools.pom
> %{_mavenpomdir}/JPP-%{name}.pom
>@@ -130,13 +136,14 @@ cp -p maven-plugin/pom.xml %{buildroot}%{_mavenpomdir}/JPP-maven-%{name}-plugin.
> %{_mavendepmapfragdir}/%{name}
> %{_javadir}/%{name}-buildtools.jar
> %{_javadir}/%{name}-runtime.jar
>+%{_javadir}/%{name}-soimp.jar
> %{_javadir}/%{name}-test.jar
> %{_javadir}/%{name}-tools.jar
> %doc Licence.txt
> 
>-%files -n maven-istack-commons-plugin
>-%{_javadir}/maven-%{name}-plugin.jar
>-%{_mavenpomdir}/JPP-maven-%{name}-plugin.pom
>+%files maven-plugin
>+%{_javadir}/%{name}-maven-plugin.jar
>+%{_mavenpomdir}/JPP-%{name}-maven-plugin.pom
> %{_mavendepmapfragdir}/%{name}-maven-plugin
> %doc Licence.txt
> 
>@@ -146,6 +153,12 @@ cp -p maven-plugin/pom.xml %{buildroot}%{_mavenpomdir}/JPP-maven-%{name}-plugin.
> 
> 
> %changelog
>+* Fri Oct 26 2012 gil cattaneo <puntogil@libero.it> 2.14-1
>+- Updated to upstream version 2.14
>+
>+* Sat Aug 04 2012 gil cattaneo <puntogil@libero.it> 2.13-1
>+- Updated to upstream version 2.13
>+
> * Sat Jul 21 2012 Juan Hernandez <juan.hernandez@redhat.com> - 2.6.1-5
> - Add maven-enforcer-plugin as build time dependency
> 
>diff --git a/sources b/sources
>index 56f2572..e94c4be 100644
>--- a/sources
>+++ b/sources
>@@ -1 +1 @@
>-b68fa82b8c543596212eafcddff68d06  istack-commons-2.6.1.tar.gz
>+b86bc242a19aff9031fe5c75bfd7c8eb  istack-commons-2.14.tar.gz
>-- 
>1.7.7.6
>

Actions: View | Diff

Attachments on bug 845735: 602236 | 633633 | 633634 | 633638 | 633639