[jboss-as/f17: 4/4] - Fixed BR - Fixed empty version requirement for org.eclipse.jdt:core

[Marek Goldmann]

commit db0451ed22627a851184d1507f4f410e51158d47
Author: Marek Goldmann <mgoldman at redhat.com>
Date:   Thu Aug 2 08:53:45 2012 +0200

    - Fixed BR
    - Fixed empty version requirement for org.eclipse.jdt:core

 ...sion-requirement-for-org.eclipse.jdt-core.patch |   37 ++++++++++++++++++++
 jboss-as.spec                                      |   11 ++++--
 2 files changed, 45 insertions(+), 3 deletions(-)
---
diff --git a/0026-Specify-version-requirement-for-org.eclipse.jdt-core.patch b/0026-Specify-version-requirement-for-org.eclipse.jdt-core.patch
new file mode 100644
index 0000000..50cd7f2
--- /dev/null
+++ b/0026-Specify-version-requirement-for-org.eclipse.jdt-core.patch
@@ -0,0 +1,37 @@
+From 7538a2eea9277d006a17be955ee2e7095adad09f Mon Sep 17 00:00:00 2001
+From: Marek Goldmann <mgoldman at redhat.com>
+Date: Wed, 1 Aug 2012 15:32:01 +0200
+Subject: [PATCH 26/26] Specify version requirement for org.eclipse.jdt:core
+ dependency
+
+---
+ pom.xml | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/pom.xml b/pom.xml
+index f05832e..f4ce7b5 100644
+--- a/pom.xml
++++ b/pom.xml
+@@ -217,7 +217,7 @@
+         <version.org.jboss.stdio>1.0.1.GA</version.org.jboss.stdio>
+         <version.org.jboss.threads>2.0.0.GA</version.org.jboss.threads>
+         <version.org.jboss.web>7.0.13.Final</version.org.jboss.web>
+-        <version.org.jboss.web.jasper-jdt>7.0.3.Final</version.org.jboss.web.jasper-jdt>
++        <version.org.jboss.web.jasper-jdt>3.3.0</version.org.jboss.web.jasper-jdt>
+         <version.org.jboss.weld.weld>1.1.5.AS71.Final</version.org.jboss.weld.weld>
+         <version.org.jboss.weld.weld-api>1.1.Final</version.org.jboss.weld.weld-api>
+         <version.org.jboss.ws.api>1.0.0.GA</version.org.jboss.ws.api>
+@@ -4973,8 +4973,8 @@
+             </dependency>
+ 
+             <dependency>
+-                <groupId>org.jboss.web</groupId>
+-                <artifactId>jasper-jdt</artifactId>
++                <groupId>org.eclipse.jdt</groupId>
++                <artifactId>core</artifactId>
+                 <version>${version.org.jboss.web.jasper-jdt}</version>
+             </dependency>
+ 
+-- 
+1.7.11.2
+
diff --git a/jboss-as.spec b/jboss-as.spec
index 4f4baa4..09d40fe 100644
--- a/jboss-as.spec
+++ b/jboss-as.spec
@@ -59,6 +59,7 @@ Patch21:          0022-Disable-testsuites.patch
 Patch22:          0023-Added-org.jboss.as.jdr-module.patch
 Patch23:          0024-Make-AS7-work-with-jython-2.2.1.patch
 Patch24:          0025-Remove-javax.jws.api.-This-is-part-of-the-JDK.patch
+Patch25:          0026-Specify-version-requirement-for-org.eclipse.jdt-core.patch
 
 BuildArch:        noarch
 
@@ -82,7 +83,6 @@ BuildRequires:    cal10n
 BuildRequires:    cdi-api
 BuildRequires:    cssparser
 BuildRequires:    dom4j
-# TODO: ecj dependency tree is big and ugly...
 BuildRequires:    ecj
 BuildRequires:    felix-configadmin
 BuildRequires:    felix-osgi-core
@@ -186,6 +186,10 @@ BuildRequires:    maven-surefire-plugin
 BuildRequires:    maven-dependency-plugin
 BuildRequires:    maven-help-plugin
 BuildRequires:    maven-shade-plugin
+BuildRequires:    maven-enforcer-plugin
+BuildRequires:    maven-ear-plugin
+BuildRequires:    maven-eclipse-plugin
+BuildRequires:    maven-ejb-plugin
 BuildRequires:    xml-maven-plugin
 BuildRequires:    mojarra
 BuildRequires:    mod_cluster-java >= 1.2.1-2
@@ -229,7 +233,6 @@ Requires:         cal10n
 Requires:         cdi-api
 Requires:         cssparser
 Requires:         dom4j
-# TODO: ecj dependency tree is big and ugly...
 Requires:         ecj
 Requires:         felix-configadmin
 Requires:         felix-osgi-core
@@ -848,9 +851,11 @@ rm -rf %{homedir}/modules/org/hornetq/main/lib/linux-${arch}/*
 %doc %{homedir}/LICENSE.txt
 
 %changelog
-* Fri Jul 20 2012 Marek Goldmann <mgoldman at redhat.com> 7.1.1-6
+* Wed Aug 01 2012 Marek Goldmann <mgoldman at redhat.com> 7.1.1-6
 - /usr/bin conflict between jboss-as-7.1.1-4 and filesystem-3.1-1, RHBZ#839419
 - Missing symlinks RHBZ#842997, RHBZ#842996
+- Fixed BR
+- Fixed empty version requirement for org.eclipse.jdt:core
 
 * Thu Jul 19 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 7.1.1-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild