[thredds] build fix for quartz 2.1.1

gil gil at fedoraproject.org
Fri Feb 13 04:23:13 UTC 2015


commit ac214ff8c23e14756499da3df2a3fac5ea8a38d8
Author: gil <puntogil at libero.it>
Date:   Fri Feb 13 05:22:48 2015 +0100

    build fix for quartz 2.1.1

 thredds-4.3.19-quartz.patch |   51 +++++++++++++++++++++++++++++++++++++++++++
 thredds.spec                |    6 ++++-
 2 files changed, 56 insertions(+), 1 deletions(-)
---
diff --git a/thredds-4.3.19-quartz.patch b/thredds-4.3.19-quartz.patch
new file mode 100644
index 0000000..64ed707
--- /dev/null
+++ b/thredds-4.3.19-quartz.patch
@@ -0,0 +1,51 @@
+diff -Nru thredds-4.3.19/cdm/pom.xml thredds-4.3.19.quartz/cdm/pom.xml
+--- thredds-4.3.19/cdm/pom.xml	2015-02-13 05:16:34.455115633 +0100
++++ thredds-4.3.19.quartz/cdm/pom.xml	2015-02-13 05:16:02.543875065 +0100
+@@ -86,8 +86,8 @@
+ 
+     <!-- Required for reading THREDDS files. -->
+     <dependency>
+-      <groupId>org.quartz-scheduler</groupId>
+-      <artifactId>quartz</artifactId>
++      <groupId>org.quartz-scheduler.internal</groupId>
++      <artifactId>quartz-core</artifactId>
+     </dependency>
+ 
+     <!-- Required for ncstream, cdmRemote. -->
+diff -Nru thredds-4.3.19/cdm/src/main/java/thredds/inventory/CollectionUpdater.java thredds-4.3.19.quartz/cdm/src/main/java/thredds/inventory/CollectionUpdater.java
+--- thredds-4.3.19/cdm/src/main/java/thredds/inventory/CollectionUpdater.java	2013-10-16 14:38:24.000000000 +0200
++++ thredds-4.3.19.quartz/cdm/src/main/java/thredds/inventory/CollectionUpdater.java	2015-02-13 04:57:07.776440666 +0100
+@@ -150,6 +150,10 @@
+     public void schedulingDataCleared() {
+       //To change body of implemented methods use File | Settings | File Templates.
+     }
++
++    public void schedulerStarting() {
++      //To change body of implemented methods use File | Settings | File Templates.
++    }
+   }
+ 
+   public void scheduleTasks(FeatureCollectionConfig config, CollectionManager manager) {
+diff -Nru thredds-4.3.19/pom.xml thredds-4.3.19.quartz/pom.xml
+--- thredds-4.3.19/pom.xml	2015-02-13 05:16:34.469114862 +0100
++++ thredds-4.3.19.quartz/pom.xml	2015-02-13 05:15:18.768288640 +0100
+@@ -497,8 +497,8 @@
+         <version>${com.google.protobuf.version}</version>
+       </dependency>
+       <dependency>
+-        <groupId>org.quartz-scheduler</groupId>
+-        <artifactId>quartz</artifactId>
++        <groupId>org.quartz-scheduler.internal</groupId>
++        <artifactId>quartz-core</artifactId>
+         <version>${org.quartz-scheduler.version}</version>
+       </dependency>
+       <dependency>
+@@ -927,7 +927,7 @@
+     <org.jsoup.version>1.7.2</org.jsoup.version>
+     <org.jdom2.version>2.0.4</org.jdom2.version>
+     <org.jdom-legacy.version>1.1.3</org.jdom-legacy.version>
+-    <org.quartz-scheduler.version>2.1.1</org.quartz-scheduler.version>
++    <org.quartz-scheduler.version>2.2.1</org.quartz-scheduler.version>
+     <org.slf4j.version>1.7.5</org.slf4j.version>
+     <org.springframework.version>3.2.2.RELEASE</org.springframework.version>
+     <org.springframework.security.version>3.1.3.RELEASE</org.springframework.security.version>
diff --git a/thredds.spec b/thredds.spec
index 58aa4af..06e63da 100644
--- a/thredds.spec
+++ b/thredds.spec
@@ -19,6 +19,8 @@ Patch0:        thredds-4.3.16-cdm-jna35.patch
 # see https://github.com/Unidata/thredds/tree/http4/
 Patch1:        thredds-4.3.18-cdm-http4.patch
 Patch2:        thredds-4.3.18-cdm-use-proper-system-environment-variables.patch
+# build fix for quartz 2.1.1
+Patch3:        thredds-4.3.19-quartz.patch
 
 BuildRequires: mvn(com.google.protobuf:protobuf-java)
 BuildRequires: mvn(com.sleepycat:je)
@@ -31,7 +33,7 @@ BuildRequires: mvn(org.apache.httpcomponents:httpclient)
 BuildRequires: mvn(org.apache.httpcomponents:httpcore)
 BuildRequires: mvn(org.apache.httpcomponents:httpmime)
 BuildRequires: mvn(org.jdom:jdom2)
-BuildRequires: mvn(org.quartz-scheduler:quartz)
+BuildRequires: mvn(org.quartz-scheduler.internal:quartz-core)
 BuildRequires: mvn(org.slf4j:jcl-over-slf4j)
 BuildRequires: mvn(org.slf4j:slf4j-api)
 BuildRequires: mvn(org.slf4j:slf4j-log4j12)
@@ -122,6 +124,8 @@ This package contains javadoc for %{name}.
 %patch0 -p0
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
+
 
 # Disable unavailable build deps
 %pom_disable_module visad


More information about the scm-commits mailing list