[quartz] update to 2.2.1 (rhbz#1089761)

gil gil at fedoraproject.org
Fri Aug 29 10:55:32 UTC 2014 

commit 3923e179dccc4877190c8b70ebc2735a4c91c079
Author: gil <puntogil at libero.it>
Date:   Fri Aug 29 12:52:14 2014 +0200

    update to 2.2.1 (rhbz#1089761)

 .gitignore  |    1 +
 quartz.spec |  103 ++++++++++++++++++++++++++++++++++++++++++----------------
 sources     |    2 +-
 3 files changed, 76 insertions(+), 30 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index a22f7da..0507c1d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 /quartz-2.1.2.tar.xz
 /quartz-2.1.7.tar.xz
+/quartz-2.2.1.tar.xz
diff --git a/quartz.spec b/quartz.spec
index 7989889..ae8694a 100644
--- a/quartz.spec
+++ b/quartz.spec
@@ -1,42 +1,38 @@
 Summary:        Enterprise Job Scheduler for Java
 Name:           quartz
-Version:        2.1.7
-Release:        11%{?dist}
+Version:        2.2.1
+Release:        1%{?dist}
 Epoch:          0
 License:        ASL 2.0
 URL:            http://www.quartz-scheduler.org/
-# svn export http://svn.terracotta.org/svn/quartz/tags/quartz-2.1.7
-# tar caf quartz-2.1.7.tar.xz quartz-2.1.7
+# svn export http://svn.terracotta.org/svn/quartz/tags/quartz-2.2.1
+# tar caf quartz-2.2.1.tar.xz quartz-2.2.1
 Source0:        %{name}-%{version}.tar.xz
 
-BuildRequires:  java-devel >= 0:1.5.0
-
 BuildRequires:  maven-local
+BuildRequires:  maven-antrun-plugin
 BuildRequires:  maven-checkstyle-plugin
-BuildRequires:  maven-clean-plugin
 BuildRequires:  maven-dependency-plugin
 BuildRequires:  maven-enforcer-plugin
-BuildRequires:  maven-pmd-plugin
 BuildRequires:  maven-release-plugin
+BuildRequires:  maven-shade-plugin
 BuildRequires:  maven-shared
-BuildRequires:  maven-source-plugin
 BuildRequires:  rmic-maven-plugin
-
 BuildRequires:  mvn(com.mchange:c3p0)
-BuildRequires:  mvn(org.apache.geronimo.specs:specs)
-BuildRequires:  mvn(org.apache.geronimo.specs:geronimo-commonj_1.1_spec)
-BuildRequires:  mvn(org.apache.geronimo.specs:geronimo-ejb_2.1_spec)
-BuildRequires:  mvn(javax.jms:jms)
 BuildRequires:  mvn(javax.mail:mail) >= 1.4.3
-BuildRequires:  mvn(javax.servlet:servlet-api) >= 2.5
-BuildRequires:  mvn(javax.transaction:jta)
 BuildRequires:  mvn(javax.xml.bind:jaxb-api)
-BuildRequires:  mvn(log4j:log4j)
+BuildRequires:  mvn(log4j:log4j:1.2.17)
+BuildRequires:  mvn(org.apache.geronimo.specs:specs:pom:)
+BuildRequires:  mvn(org.apache.geronimo.specs:geronimo-commonj_1.1_spec)
+BuildRequires:  mvn(org.apache.geronimo.specs:geronimo-ejb_2.1_spec)
+BuildRequires:  mvn(org.apache.geronimo.specs:geronimo-jms_1.1_spec)
+BuildRequires:  mvn(org.apache.geronimo.specs:geronimo-jta_1.1_spec)
+BuildRequires:  mvn(org.apache.tomcat:tomcat-servlet-api)
 BuildRequires:  mvn(org.slf4j:slf4j-api)
 BuildRequires:  mvn(org.slf4j:slf4j-log4j12)
-
 # test deps
 BuildRequires:  mvn(asm:asm)
+BuildRequires:  mvn(commons-io:commons-io)
 BuildRequires:  mvn(junit:junit)
 BuildRequires:  mvn(org.apache.derby:derby)
 BuildRequires:  mvn(org.hamcrest:hamcrest-library) >= 1.2
@@ -57,22 +53,67 @@ Summary:        API docs for %{name}
 This package contains the API Documentation for %{name}.
 
 %prep
-%setup -q 
+%setup -q
+# Unwated modules
 %pom_disable_module quartz-jboss
-# Bundles everything
-%pom_disable_module quartz-all
+%pom_disable_module quartz-oracle
+%pom_disable_module quartz-weblogic
+
+# Unavailable deps
+# org.terracotta.toolkit:terracotta-toolkit-api,terracotta-toolkit-api-internal:2.1.0
+%pom_disable_module terracotta
+
 %pom_remove_plugin org.codehaus.mojo:findbugs-maven-plugin
+# Unwated plugin disable source JARs
+%pom_remove_plugin :maven-source-plugin
+
 # Fix c3p0 groupId
-sed -i -e 's/groupId>c3p0</groupId>com.mchange</' quartz/pom.xml
-# Fix jms artifactId
-sed -i -e 's/artifactId>jms-api</artifactId>jms</' quartz/pom.xml
+sed -i -e 's/groupId>c3p0</groupId>com.mchange</' **/pom.xml pom.xml
 # Fix junit artifactId
-sed -i -e 's/artifactId>junit-dep</artifactId>junit</' quartz/pom.xml
+sed -i -e 's/artifactId>junit-dep</artifactId>junit</' **/pom.xml pom.xml
+
+# Use available javax apis
+%pom_remove_dep org.apache.openejb:javaee-api quartz-core
+%pom_add_dep org.apache.geronimo.specs:geronimo-jta_1.1_spec::provided quartz-core
+%pom_add_dep org.apache.tomcat:tomcat-servlet-api::provided quartz-core
+%pom_remove_dep org.apache.openejb:javaee-api quartz-jobs
+%pom_add_dep org.apache.geronimo.specs:geronimo-ejb_2.1_spec::provided quartz-jobs
+%pom_add_dep org.apache.geronimo.specs:geronimo-jms_1.1_spec::provided quartz-jobs 
+%pom_remove_dep org.apache.openejb:javaee-api quartz-plugins
+%pom_add_dep org.apache.geronimo.specs:geronimo-jta_1.1_spec::provided quartz-plugins
+# Disable javadoc jar
+%pom_xpath_remove "pom:build/pom:plugins/pom:plugin[pom:artifactId = 'maven-javadoc-plugin' ]/pom:executions" quartz-jobs
+
+# Fix log4j version
+sed -i -e 's/<log4j.version>1.2.16/<log4j.version>1.2.17/' pom.xml
+# This artefact bundled all quartz modules
+%pom_disable_module quartz
+%if 0
+# Unavailable plugins
+# org.terracotta:maven-forge-plugin:1.0.7
+%pom_remove_plugin org.terracotta:maven-forge-plugin quartz
+%pom_remove_plugin :gmaven-plugin quartz
+# Disable javadoc jar
+%pom_xpath_remove "pom:build/pom:plugins/pom:plugin[pom:artifactId = 'maven-javadoc-plugin' ]/pom:executions" quartz
+# Unavailable deps
+%pom_remove_dep org.quartz-scheduler.internal:quartz-jboss quartz
+%pom_remove_dep org.quartz-scheduler.internal:quartz-oracle quartz
+%pom_remove_dep org.quartz-scheduler.internal:quartz-terracotta-bootstrap quartz
+%pom_remove_dep org.quartz-scheduler.internal:quartz-weblogic quartz
+# Remove unavailable libraries references, ( TODO provide a OSGi MANIFEST.MF file ).
+sed -i '/org.jboss/d' quartz/pom.xml
+sed -i '/org.terracotta.toolkit/d' quartz/pom.xml
+sed -i '/weblogic.jdbc/d' quartz/pom.xml
+sed -i '/oracle.sql/d' quartz/pom.xml
+%endif
+
+cp -p distribution/src/main/assembly/root/licenses/LICENSE.txt .
+sed -i 's/\r//' LICENSE.txt
 
 %build
 
-%mvn_file :%{name} %{name}/%{name} %{name} 
-%mvn_file :%{name}-backward-compat %{name}/%{name}-backward-compat %{name}-backward-compat
+%mvn_file :%{name}-core %{name}/%{name}-core %{name}/%{name} %{name}
+%mvn_alias :%{name}-core org.quartz-scheduler:%{name}
 # skip tests for now due to requirement on hamcrest 1.2
 %mvn_build -f -- -Dproject.build.sourceEncoding=UTF-8
 
@@ -80,12 +121,16 @@ sed -i -e 's/artifactId>junit-dep</artifactId>junit</' quartz/pom.xml
 %mvn_install
 
 %files -f .mfiles
-%doc README.txt NOTICE.txt LICENSE.txt
+%dir %{_javadir}/%{name}
+%doc README.txt LICENSE.txt
 
 %files javadoc -f .mfiles-javadoc
-%doc LICENSE.txt NOTICE.txt
+%doc LICENSE.txt
 
 %changelog
+* Fri Jul 11 2014 gil cattaneo <puntogil at libero.it> 2.2.1-1
+- update to 2.2.1
+
 * Sun Jun 08 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0:2.1.7-11
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
 
diff --git a/sources b/sources
index f4d2b31..0c53409 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-c370d25daff1269a77d3466c33492491  quartz-2.1.7.tar.xz
+29753aa7451bd2b58ad40e7572d8b311  quartz-2.2.1.tar.xz

More information about the scm-commits mailing list