Attachment 590228 Details for Bug 829804 – Add Maven POMs

[patch] Add Maven POMs

0001-Add-Maven-POMs.patch (text/plain), 7.20 KB, created by gil cattaneo on 2012-06-07 15:16:42 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: gil cattaneo

Created: 2012-06-07 15:16:42 UTC

Size: 7.20 KB

patch

obsolete

>From 3be06958c451c7a56b38baa0f8d468f36f07813d Mon Sep 17 00:00:00 2001
>From: gil <puntogil@libero.it>
>Date: Thu, 7 Jun 2012 15:16:14 +0200
>Subject: [PATCH] Add Maven POMs
>
>---
> jakarta-taglibs-standard-1.1.2-jstl-pom.patch     |   26 ++++++++++++++++++
> jakarta-taglibs-standard-1.1.2-standard-pom.patch |   25 +++++++++++++++++
> jakarta-taglibs-standard.spec                     |   30 ++++++++++++++++++--
> jstl-1.1.2.pom                                    |   19 +++++++++++++
> standard-1.1.2.pom                                |    6 ++++
> 5 files changed, 103 insertions(+), 3 deletions(-)
> create mode 100644 jakarta-taglibs-standard-1.1.2-jstl-pom.patch
> create mode 100644 jakarta-taglibs-standard-1.1.2-standard-pom.patch
> create mode 100644 jstl-1.1.2.pom
> create mode 100644 standard-1.1.2.pom
>
>diff --git a/jakarta-taglibs-standard-1.1.2-jstl-pom.patch b/jakarta-taglibs-standard-1.1.2-jstl-pom.patch
>new file mode 100644
>index 0000000..5bc49cb
>--- /dev/null
>+++ b/jakarta-taglibs-standard-1.1.2-jstl-pom.patch
>@@ -0,0 +1,26 @@
>+--- jstl.pom	2005-11-08 22:53:32.000000000 +0100
>++++ jstl.pom-gil	2012-06-07 15:02:44.472592799 +0200
>+@@ -10,10 +10,17 @@
>+   <url>http://java.sun.com/products/jsp/jstl/</url>
>+   <distributionManagement>
>+     <downloadUrl>http://java.sun.com/products/jsp/jstl/downloads/</downloadUrl>
>+-    <relocation>
>+-      <groupId>javax.servlet</groupId>
>+-      <artifactId>jstl</artifactId>
>+-      <version>1.1.2</version>
>+-    </relocation>
>+   </distributionManagement>
>++  <dependencies>
>++    <dependency>
>++        <groupId>org.apache.tomcat</groupId>
>++        <artifactId>tomcat-servlet-api</artifactId>
>++        <version>7.0.27</version>
>++    </dependency>
>++    <dependency>
>++        <groupId>org.apache.tomcat</groupId>
>++        <artifactId>tomcat-jsp-api</artifactId>
>++        <version>7.0.27</version>
>++    </dependency>
>++  </dependencies>
>+ </project>
>+\ Manca newline alla fine del file
>diff --git a/jakarta-taglibs-standard-1.1.2-standard-pom.patch b/jakarta-taglibs-standard-1.1.2-standard-pom.patch
>new file mode 100644
>index 0000000..f7c205c
>--- /dev/null
>+++ b/jakarta-taglibs-standard-1.1.2-standard-pom.patch
>@@ -0,0 +1,25 @@
>+--- standard.pom	2005-11-08 22:57:12.000000000 +0100
>++++ standard.pom-gil	2012-06-07 15:03:10.880592459 +0200
>+@@ -3,4 +3,21 @@
>+   <groupId>taglibs</groupId>
>+   <artifactId>standard</artifactId>
>+   <version>1.1.2</version>
>++  <dependencies>
>++    <dependency>
>++        <groupId>jstl</groupId>
>++        <artifactId>jstl</artifactId>
>++        <version>1.1.2</version>
>++    </dependency>
>++    <dependency>
>++        <groupId>org.apache.tomcat</groupId>
>++        <artifactId>tomcat-el-api</artifactId>
>++        <version>7.0.27</version>
>++    </dependency>
>++    <dependency>
>++        <groupId>xalan</groupId>
>++        <artifactId>xalan</artifactId>
>++        <version>2.7.1</version>
>++    </dependency>
>++  </dependencies>
>+ </project>
>+\ Manca newline alla fine del file
>diff --git a/jakarta-taglibs-standard.spec b/jakarta-taglibs-standard.spec
>index bd5ef41..5a36c5e 100644
>--- a/jakarta-taglibs-standard.spec
>+++ b/jakarta-taglibs-standard.spec
>@@ -33,16 +33,23 @@
> 
> Name:           jakarta-taglibs-standard
> Version:        1.1.2
>-Release:        4%{?dist}
>+Release:        5%{?dist}
> Epoch:          0
> Summary:        An open-source implementation of the JSP Standard Tag Library
> License:        ASL 2.0
> Group:          Development/Libraries
> URL:            http://jakarta.apache.org/taglibs/
>-Source:         http://archive.apache.org/dist/jakarta/taglibs/standard/source/jakarta-taglibs-standard-%{version}-src.tar.gz
>+Source0:        http://archive.apache.org/dist/jakarta/taglibs/standard/source/jakarta-taglibs-standard-%{version}-src.tar.gz
>+Source1:        http://repo1.maven.org/maven2/jstl/jstl/%{version}/jstl-%{version}.pom
>+Source2:        http://repo1.maven.org/maven2/taglibs/standard/%{version}/standard-%{version}.pom
>+
> Patch0:         jakarta-taglibs-standard-1.1.1-build.patch
> Patch1:         fix-1.6.0-build.patch
> Patch2:         %{name}-jdbc-4.1.patch
>+# remove relocation use -a parameter with %%add_maven_depmap
>+# prevent maven/system overflow
>+Patch3:         jakarta-taglibs-standard-1.1.2-jstl-pom.patch
>+Patch4:         jakarta-taglibs-standard-1.1.2-standard-pom.patch
> 
> BuildArch:      noarch
> BuildRequires:  jpackage-utils >= 0:1.5.30
>@@ -85,14 +92,20 @@ jsp20.jar=$(build-classpath jsp)
> jaxp-api.jar=$(build-classpath xalan-j2)
> EOBP
> 
>+cp -p %{SOURCE1} jstl.pom
>+%patch3 -p0
>+cp -p %{SOURCE2} standard.pom
>+%patch4 -p0
>+
>+
> %build
>+
> ant \
>   -Dfinal.name=%{short_name} \
>   -Dj2se.javadoc=%{_javadocdir}/java \
>   -f standard/build.xml \
>   dist
> 
>-
> %install
> # jars
> mkdir -p $RPM_BUILD_ROOT%{_javadir}
>@@ -100,6 +113,12 @@ cp -p standard/dist/standard/lib/jstl.jar $RPM_BUILD_ROOT%{_javadir}/jakarta-tag
> cp -p standard/dist/standard/lib/standard.jar $RPM_BUILD_ROOT%{_javadir}/jakarta-taglibs-standard.jar
> (cd $RPM_BUILD_ROOT%{_javadir} && for jar in jakarta-*; do ln -sf ${jar} `echo $jar| sed "s|jakarta-||g"`; done)
> 
>+mkdir -p $RPM_BUILD_ROOT%{_mavenpomdir}
>+install -pm 644 jstl.pom $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-jakarta-taglibs-core.pom
>+%add_maven_depmap JPP-jakarta-taglibs-core.pom jakarta-taglibs-core.jar -a "javax.servlet:jstl"
>+install -pm 644 standard.pom $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}.pom
>+%add_maven_depmap JPP-%{name}.pom %{name}.jar
>+
> # javadoc
> mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}
> cp -pr standard/dist/standard/javadoc/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
>@@ -107,12 +126,17 @@ cp -pr standard/dist/standard/javadoc/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
> %files
> %doc standard/README_src.txt standard/README_bin.txt standard/dist/doc/doc/standard-doc/*.html
> %{_javadir}/*
>+%{_mavenpomdir}/JPP-*.pom
>+%{_mavendepmapfragdir}/%{name}
> 
> %files javadoc
> %doc %{_javadocdir}/%{name}
> 
> 
> %changelog
>+* Thu Jun 07 2012 gil cattaneo <puntogil@libero.it> 0:1.1.2-5
>+- Add maven POMs
>+
> * Wed Feb 8 2012 Alexander Kurtakov <akurtako@redhat.com> 0:1.1.2-4
> - Remove test classes that fail to build(non impl methods) with servlet 3/jsp 2.2.
> 
>diff --git a/jstl-1.1.2.pom b/jstl-1.1.2.pom
>new file mode 100644
>index 0000000..bc4c983
>--- /dev/null
>+++ b/jstl-1.1.2.pom
>@@ -0,0 +1,19 @@
>+<project>
>+  <modelVersion>4.0.0</modelVersion>
>+  <groupId>jstl</groupId>
>+  <artifactId>jstl</artifactId>
>+  <version>1.1.2</version>
>+  <name>Java Server Pages Standard Tag Library</name>
>+  <description>
>+The JavaServer Pages Standard Tag Library (JSTL) encapsulates, as simple tags, core functionality common to many JSP applications.
>+  </description>
>+  <url>http://java.sun.com/products/jsp/jstl/</url>
>+  <distributionManagement>
>+    <downloadUrl>http://java.sun.com/products/jsp/jstl/downloads/</downloadUrl>
>+    <relocation>
>+      <groupId>javax.servlet</groupId>
>+      <artifactId>jstl</artifactId>
>+      <version>1.1.2</version>
>+    </relocation>
>+  </distributionManagement>
>+</project>
>\ No newline at end of file
>diff --git a/standard-1.1.2.pom b/standard-1.1.2.pom
>new file mode 100644
>index 0000000..d43698a
>--- /dev/null
>+++ b/standard-1.1.2.pom
>@@ -0,0 +1,6 @@
>+<project>
>+  <modelVersion>4.0.0</modelVersion>
>+  <groupId>taglibs</groupId>
>+  <artifactId>standard</artifactId>
>+  <version>1.1.2</version>
>+</project>
>\ No newline at end of file
>-- 
>1.7.7.6
>

Actions: View | Diff

Attachments on bug 829804: 590228