Attachment 608161 Details for Bug 853046 – Patch

[patch] Patch

0001-Build-Eclipse-compiler-adapters.patch (text/plain), 3.98 KB, created by Krzysztof Daniel on 2012-08-30 11:31:21 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Krzysztof Daniel

Created: 2012-08-30 11:31:21 UTC

Size: 3.98 KB

patch

obsolete

>From f17c2b448b1e598d5a772000e4a5d31c1c4f3c0f Mon Sep 17 00:00:00 2001
>From: Krzysztof Daniel <kdaniel@redhat.com>
>Date: Thu, 30 Aug 2012 13:25:46 +0200
>Subject: [PATCH] Build Eclipse compiler adapters.
>
>---
> .gitignore                                  |  4 +++
> glassfish-jsp-build-eclipse-compilers.patch | 46 +++++++++++++++++++++++++++++
> glassfish-jsp.spec                          | 10 +++++--
> 3 files changed, 58 insertions(+), 2 deletions(-)
> create mode 100644 glassfish-jsp-build-eclipse-compilers.patch
>
>diff --git a/.gitignore b/.gitignore
>index 84f0aef..cfdcd7d 100644
>--- a/.gitignore
>+++ b/.gitignore
>@@ -1 +1,5 @@
> /javax.servlet.jsp-2.2.3.tar.xz
>+/noarch
>+/*.src.rpm
>+/javax.servlet.jsp-*
>+/.project
>diff --git a/glassfish-jsp-build-eclipse-compilers.patch b/glassfish-jsp-build-eclipse-compilers.patch
>new file mode 100644
>index 0000000..850d349
>--- /dev/null
>+++ b/glassfish-jsp-build-eclipse-compilers.patch
>@@ -0,0 +1,46 @@
>+--- pom.xml.bak	2012-08-29 08:25:47.000000000 +0200
>++++ pom.xml	2012-08-30 10:08:53.758735211 +0200
>+@@ -134,12 +134,9 @@
>+                 <configuration>
>+                     <source>1.6</source>
>+                     <target>1.6</target>
>+-                    <compilerArgument>-Xlint:unchecked</compilerArgument>
>++                    
>+                     <excludes>
>+                         <exclude>
>+-                            org/apache/jasper/compiler/JDTJavaCompiler.java
>+-                        </exclude>
>+-                        <exclude>
>+                             org/apache/jasper/compiler/AntJavaCompiler.java
>+                         </exclude>
>+                         <exclude>
>+@@ -299,14 +296,13 @@
>+             <version>2.2.1</version>
>+         </dependency>
>+ 
>+-
>++
>+     </dependencies>
>+ </project>
>+--- src/main/java/org/apache/jasper/compiler/JDTJavaCompiler.java.bak	2010-10-13 00:41:40.000000000 +0200
>++++ src/main/java/org/apache/jasper/compiler/JDTJavaCompiler.java	2012-08-30 10:13:25.619637005 +0200
>+@@ -248,6 +248,8 @@
>+                 return className.toCharArray();
>+             }
>+             
>++            public boolean ignoreOptionalProblems() {return false;}
>++            
>+             public char[] getContents() {
>+                 char[] result = null;
>+                 Reader reader = null;
>diff --git a/glassfish-jsp.spec b/glassfish-jsp.spec
>index adb8049..3daab0e 100644
>--- a/glassfish-jsp.spec
>+++ b/glassfish-jsp.spec
>@@ -4,7 +4,7 @@
> 
> Name:       glassfish-jsp
> Version:    2.2.6
>-Release:    1%{?dist}
>+Release:    2%{?dist}
> Summary:    Glassfish J2EE JSP API implementation
> 
> Group:      Development/Libraries
>@@ -15,6 +15,8 @@ Source0:    %{artifactId}-%{version}.tar.xz
> # SVN tag
> Source1:    generate_tarball.sh
> 
>+Patch0:     %{name}-build-eclipse-compilers.patch
>+
> BuildArch:  noarch
> 
> BuildRequires:  java
>@@ -28,6 +30,7 @@ BuildRequires:  maven-plugin-bundle
> BuildRequires:  maven-release-plugin
> BuildRequires:  maven-source-plugin
> BuildRequires:  glassfish-jsp-api
>+BuildRequires:  mvn(org.eclipse.jdt:core)
> BuildRequires:  mvn(javax.servlet:javax.servlet-api)
> BuildRequires:  mvn(javax.el:javax.el-api)
> BuildRequires:  mvn(javax.servlet.jsp:javax.servlet.jsp-api)
>@@ -61,7 +64,7 @@ Requires:   jpackage-utils
> 
> %prep
> %setup -q -n %{artifactId}-%{version}
>-
>+%patch0
> 
> %build
> mvn-rpmbuild install javadoc:javadoc
>@@ -93,6 +96,9 @@ install -pm 644 pom.xml $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP-%{name}.pom
> 
> 
> %changelog
>+* Thu Aug 30 2012 Krzysztof Daniel <kdaniel@redhat.com> 2.2.6-2
>+- Build Eclipse compiler adapters.
>+
> * Wed Aug 29 2012 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.2.6-1
> - Update to upstream version 2.2.6
> 
>-- 
>1.7.11.4
>

Actions: View | Diff

Attachments on bug 853046: 608161