[weld-core/f19] Update to latest 1.1.x upstream

Wed Jul 10 18:48:08 UTC 2013

commit 1caa4c18ca76bd47364487ab59f4cf3d543a8c69
Author: Mat Booth <fedora at matbooth.co.uk>
Date:   Wed Jul 10 19:46:31 2013 +0100

    Update to latest 1.1.x upstream
    
    - Switch to using pom macros, drop upstreamed patches
    - Don't run or ship checkstyle config, fixed rhbz #825355
    - Build se-core module, fixes rhbz #969769
    - Fix FTBFS rhbz #914570

 .gitignore                                      |    1 +
 sources                                         |    2 +-
 weld-core-fix-compilation-problem-on-jdk7.patch |   40 -----------
 weld-core-fix-issue-with-bridge-methods.patch   |   36 ----------
 weld-core-remove-checkstyle.patch               |   72 --------------------
 weld-core.spec                                  |   80 +++++++++++++++-------
 6 files changed, 56 insertions(+), 175 deletions(-)
---

diff --git a/.gitignore b/.gitignore
index 00fb83c..731d072 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /weld-core-1.1.5.AS71.Final-CLEAN.tar.xz
+/1.1.13.Final.tar.gz
diff --git a/sources b/sources
index e2f9857..b474645 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-51587f7ca430115fa6edf686763cb9ca  weld-core-1.1.5.AS71.Final-CLEAN.tar.xz
+a0cdaeeba9fd237ecf03ac6339bca1ff  1.1.13.Final.tar.gz
diff --git a/weld-core.spec b/weld-core.spec
index dd57937..5e4a62e 100644
--- a/weld-core.spec
+++ b/weld-core.spec
@@ -1,28 +1,15 @@
-%global namedreltag .AS71.Final
+%global namedreltag .Final
 %global namedversion %{version}%{?namedreltag}
 
 Name: weld-core
-Version: 1.1.5
-Release: 6%{namedreltag}%{?dist}
+Version: 1.1.13
+Release: 1%{namedreltag}%{?dist}
 Summary: Reference Implementation for JSR-299: Contexts and Dependency Injection (CDI)
 Group: Development/Libraries
 License: ASL 2.0 and LGPLv2+ and (CDDL or GPLv2 with exceptions)
 URL: http://seamframework.org/Weld
 
-# git clone git://github.com/weld/core.git weld-core
-# cd weld-core && git checkout 1.1.5.AS71.Final && git checkout-index -f -a --prefix=weld-core-1.1.5.AS71.Final/
-# find weld-core-1.1.5.AS71.Final -name '*.jar' -delete
-# tar -cJf weld-core-1.1.5.AS71.Final-CLEAN.tar.xz weld-core-1.1.5.AS71.Final
-Source0: %{name}-%{namedversion}-CLEAN.tar.xz
-
-# Removing chestyle:
-Patch0: %{name}-remove-checkstyle.patch
-
-# Support for JDK7:
-Patch1: %{name}-fix-compilation-problem-on-jdk7.patch
-
-# Fix issue with bridge methods:
-Patch2: %{name}-fix-issue-with-bridge-methods.patch
+Source0: https://github.com/weld/core/archive/%{namedversion}.tar.gz
 
 BuildArch: noarch
 
@@ -30,25 +17,36 @@ BuildRequires: findbugs
 BuildRequires: jpackage-utils
 BuildRequires: java-devel
 BuildRequires: jboss-interceptor
-BuildRequires: jboss-jsf-2.1-api
-BuildRequires: jboss-jsp-2.2-api
 BuildRequires: jboss-servlet-3.0-api
 BuildRequires: maven-local
+BuildRequires: maven-clean-plugin
 BuildRequires: maven-compiler-plugin
+BuildRequires: maven-deploy-plugin
+BuildRequires: maven-dependency-plugin
+BuildRequires: maven-enforcer-plugin
 BuildRequires: maven-install-plugin
 BuildRequires: maven-jar-plugin
 BuildRequires: maven-javadoc-plugin
+BuildRequires: maven-shade-plugin
 BuildRequires: maven-surefire-provider-junit4
+BuildRequires: maven-surefire-report-plugin
+BuildRequires: maven-plugin-build-helper
 BuildRequires: weld-api
 BuildRequires: weld-parent
+BuildRequires: mvn(javax.enterprise:cdi-api)
+BuildRequires: mvn(javax.faces:jsf-api)
+BuildRequires: mvn(javax.persistence:persistence-api)
+BuildRequires: mvn(javax.servlet.jsp:jsp-api)
 
 Requires: java
 Requires: jpackage-utils
 Requires: jboss-interceptor
-Requires: jboss-jsf-2.1-api
-Requires: jboss-jsp-2.2-api
 Requires: jboss-servlet-3.0-api
 Requires: weld-api
+Requires: mvn(javax.enterprise:cdi-api)
+Requires: mvn(javax.faces:jsf-api)
+Requires: mvn(javax.persistence:persistence-api)
+Requires: mvn(javax.servlet.jsp:jsp-api)
 
 
 %description
@@ -70,10 +68,28 @@ This package contains the API documentation for %{name}.
 
 
 %prep
-%setup -q -n %{name}-%{namedversion}
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
+%setup -q -n core-%{namedversion}
+
+find . -name '*.jar' -exec rm {} \;
+find . -name '*.class' -exec rm {} \;
+
+# Not needed for build
+%pom_remove_plugin org.eclipse.m2e:lifecycle-mapping
+
+# We don't want to build these modules
+%pom_disable_module porting-package
+%pom_disable_module tests
+%pom_disable_module tests-arquillian
+%pom_disable_module inject-tck-runner
+%pom_disable_module jboss-tck-runner
+
+# Don't ship or run checkstyle configuration, see rhbz #825355
+%pom_remove_dep org.jboss.weld:weld-build-config
+%pom_disable_module build-config
+%pom_remove_plugin org.apache.maven.plugins:maven-checkstyle-plugin
+
+# Disable envs that are not needed
+%pom_disable_module environments/servlet
 
 
 %build
@@ -84,16 +100,21 @@ mvn-rpmbuild install javadoc:aggregate
 
 # Jar files:
 install -d -m 755 %{buildroot}%{_javadir}
-install -pm 644 impl/target/weld-core-%{namedversion}.jar %{buildroot}%{_javadir}/%{name}.jar
+install -pm 644 impl/target/weld-core-%{namedversion}.jar \
+  %{buildroot}%{_javadir}/weld-core.jar
+install -pm 644 environments/se/core/target/weld-se-core-%{namedversion}.jar \
+  %{buildroot}%{_javadir}/weld-se-core.jar
 
 # POM files:
 install -d -m 755 %{buildroot}%{_mavenpomdir}
 install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}-parent.pom
 install -pm 644 impl/pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
+install -pm 644 environments/se/core/pom.xml %{buildroot}%{_mavenpomdir}/JPP-weld-se-core.pom
 
 # Dependencies map:
 %add_maven_depmap JPP-%{name}-parent.pom
 %add_maven_depmap JPP-%{name}.pom %{name}.jar
+%add_maven_depmap JPP-weld-se-core.pom weld-se-core.jar
 
 # Javadoc files:
 install -d -m 755 %{buildroot}%{_javadocdir}/%{name}
@@ -111,6 +132,13 @@ cp -rp target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}
 
 
 %changelog
+* Wed Jul 10 2013 Mat Booth <fedora at matbooth.co.uk> - 1.1.13-1.Final
+- Update to latest 1.1.x upstream
+- Switch to using pom macros, drop upstreamed patches
+- Don't run or ship checkstyle config, fixed rhbz #825355
+- Build se-core module, fixes rhbz #969769
+- Fix FTBFS rhbz #914570
+
 * Fri Feb 15 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1.5-6.AS71.Final
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
 
