.gitignore

+# Maven and test related noise
+target/
+derby.log
+logs/
+
+# IntelliJ IDEA noise
+out/
+.idea/
+*.iml
+*.ipr
+*.iws
+
+# Eclipse IDE noise
+.settings/
+.project
+.classpath
+
+# NetBeans noise
+nbproject/
+
+# Other Editor's noise
+*~
+*.swp
+
+# MacOSX noise
+.DS_Store

.mvn/wrapper/maven-wrapper.properties

+distributionUrl=https://repo1.maven.org/maven2/org/apache/maven/apache-maven/3.3.9/apache-maven-3.3.9-bin.zip
\ No newline at end of file

.travis.yml

+language: java

README.md

+
+## Builld status: 
+![Master branch build status](https://travis-ci.org/quartz-scheduler/quartz.svg?branch=master "Master build status")
+
+
+## Build instructions:
+
+### To compile:
+```
+  %> ./mvnw install -DskipTests
+```
+
+Note:  the final Quartz jar is found under quartz/target 
+
+### To build Quartz distribution kit:
+```
+  %> cd distribution
+  %> ./mvnw package
+```
+

README.txt

 1. To compile:
-  %> mvn install -DskipTests
+  %> ./mvnw install -DskipTests
   
 Note:  the final Quartz jar is found under quartz/target 
 
 2. To build Quartz distribution kit:
 
   %> cd distribution
-  %> mvn package
+  %> ./mvnw package
 
 3. To deploy Maven central repo (via Sonatype)
 
-  %> mvn clean deploy -P sign-artifacts,deploy-sonatype -DskipTests
+  %> ./mvnw clean deploy -P sign-artifacts,deploy-sonatype -DskipTests

checkstyle/pom.xml

@@ -2,10 +2,15 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
+  <parent>
+    <groupId>org.quartz-scheduler</groupId>
+    <artifactId>quartz-parent</artifactId>
+    <version>2.3.0-SNAPSHOT</version>
+  </parent>
+
   <groupId>org.quartz-scheduler.internal</groupId>
   <artifactId>quartz-checkstyle</artifactId>
   <name>quartz-checkstyle</name>
-  <version>2.2.3</version>
   <packaging>jar</packaging>
 
   <properties>

debian/changelog

+libquartz2-java (2.3.0-1) unstable; urgency=medium
+
+  * Team upload.
+  * New upstream release
+    - Refreshed the patch
+    - New dependency on libhikaricp-java
+  * Fixed the build failure with Java 10 (Closes: #905013)
+  * Ensure the Java 8 compatibility when built with Java 9 or later
+  * Standards-Version updated to 4.1.5
+  * Switch to debhelper level 11
+  * Use salsa.debian.org Vcs-* URLs
+  * Track and download the new releases from GitHub
+
+ -- Emmanuel Bourg <ebourg@apache.org>  Mon, 30 Jul 2018 17:08:12 +0200
+
 libquartz2-java (2.2.3-3) unstable; urgency=medium
 
   * Team upload.

debian/compat

-10
+11

debian/control

@@ -7,7 +7,7 @@ Uploaders:
  Torsten Werner <twerner@debian.org>,
  tony mancill <tmancill@debian.org>
 Build-Depends:
- debhelper (>= 10),
+ debhelper (>= 11~),
  default-jdk,
  javahelper,
  junit4,
@@ -21,15 +21,16 @@ Build-Depends:
  libgeronimo-jms-1.1-spec-java,
  libgeronimo-jta-1.2-spec-java,
  libhamcrest-java,
+ libhikaricp-java,
  libmail-java,
  libmaven-antrun-plugin-java,
  libmaven-bundle-plugin-java,
  libmaven-shade-plugin-java,
  libservlet3.1-java,
  maven-debian-helper (>= 1.4)
-Standards-Version: 4.1.2
-Vcs-Git: https://anonscm.debian.org/git/pkg-java/libquartz2-java.git
-Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/libquartz2-java.git
+Standards-Version: 4.1.5
+Vcs-Git: https://salsa.debian.org/java-team/libquartz2-java.git
+Vcs-Browser: https://salsa.debian.org/java-team/libquartz2-java
 Homepage: http://quartz-scheduler.org
 
 Package: libquartz2-java

debian/copyright

-Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: Quartz Scheduler
 Upstream-Contact:  James House <jhouse@terracotta.org> as Primary Developer
                    Jason Voegele <jvoegele@terracotta.org> as Build Engineer, Release Engineer
 Source: http://quartz-scheduler.org
+Files-Excluded: .settings
+                *.jar
+                */docs/*
 
 Files: *
-Copyright: 2005-2016, Terracotta, Inc.
+Copyright: 2005-2018, Terracotta, Inc.
 License: Apache-2.0
 
 Files: debian/*
@@ -13,7 +16,8 @@ Copyright: 2007-2008, Varun Hiremath <varunhiremath@gmail.com>
            2007-2011, Torsten Werner <twerner@debian.org>
            2009, Michael Koch <konqueror@gmx.de>
            2012, Mathieu Malaterre <malat@debian.org>
-           2014-2016, Emmanuel Bourg <ebourg@apache.org>
+           2014-2018, Emmanuel Bourg <ebourg@apache.org>
+           2017, tony mancill <tmancill@debian.org>
 License: Apache-2.0
 
 License: Apache-2.0

debian/maven.properties

@@ -3,3 +3,4 @@
 # maven.test.skip=true
 
 maven.test.skip=true
+maven.compiler.release=8

debian/maven.rules

@@ -23,3 +23,5 @@ log4j log4j jar s/.*/1.2.x/ * *
 javax.transaction s/jta/transaction-api/ jar s/.*/debian/ * * 
 javax.servlet s/servlet-api/javax.servlet-api/ * s/.*/3.1/ * *
 javax.mail s/mail/javax.mail-api/ * s/.*/debian/ * *
+com.zaxxer s/HikariCP-java6/HikariCP/ * s/.*/debian/ * *
+s/com.mchange/c3p0/ c3p0  * s/.*/debian/ * *

debian/orig-tar.sh

-#!/bin/sh -e
-
-# called by uscan with '--upstream-version' <version> <file>
-PACKAGE=$(dpkg-parsechangelog -S Source)
-VERSION=$2
-TAR=../${PACKAGE}_${VERSION}.orig.tar.xz
-DIR=${PACKAGE}-${VERSION}
-
-# clean up the upstream tarball
-svn export http://svn.terracotta.org/svn/quartz/tags/quartz-${VERSION} $DIR
-XZ_OPT=--best tar -c -J -v -f $TAR --exclude '.settings' --exclude '*.jar' --exclude '*/docs/*' $DIR
-rm -rf $3 $DIR

debian/patches/01-j2ee-dependencies.patch

@@ -3,7 +3,7 @@ Author: Emmanuel Bourg <ebourg@apache.org>
 Forwarded: not-needed
 --- a/quartz-core/pom.xml
 +++ b/quartz-core/pom.xml
-@@ -37,6 +37,18 @@
+@@ -43,6 +43,18 @@
        <version>5.0-2</version>
        <scope>provided</scope>
      </dependency>

debian/patches/02-java10-compatibility.patch

+Description: Fixes the compatibility with Java 10
+Author: Emmanuel Bourg <ebourg@apache.org>
+Bug: https://github.com/quartz-scheduler/quartz/pull/252
+--- a/quartz-core/src/main/java/org/quartz/xml/XMLSchedulingDataProcessor.java
++++ b/quartz-core/src/main/java/org/quartz/xml/XMLSchedulingDataProcessor.java
+@@ -195,7 +195,7 @@
+               return XMLConstants.NULL_NS_URI;
+           }
+         
+-          public Iterator<?> getPrefixes(String namespaceURI)
++          public Iterator<String> getPrefixes(String namespaceURI)
+           {
+               // This method isn't necessary for XPath processing.
+               throw new UnsupportedOperationException();

debian/patches/series

+02-java10-compatibility.patch
 01-j2ee-dependencies.patch

debian/rules

@@ -4,8 +4,5 @@
 	dh $@ --with javahelper
 
 override_dh_auto_install:
-	mh_installpom -plibquartz2-java --no-parent quartz/target/dependency-reduced-pom.xml
-	mh_installjar -plibquartz2-java --java-lib --usj-name=quartz2 quartz/target/dependency-reduced-pom.xml quartz/target/quartz-2.2.3.jar
-
-get-orig-source:
-	uscan --download-current-version --force-download
+	mh_installpom -plibquartz2-java --no-parent -e2.3.0 quartz/target/dependency-reduced-pom.xml
+	mh_installjar -plibquartz2-java --java-lib -e2.3.0 --usj-name=quartz2 quartz/target/dependency-reduced-pom.xml quartz/target/quartz-2.3.0-SNAPSHOT.jar

debian/watch

-version=3
-http://svn.terracotta.org/svn/quartz/tags quartz-([\d.]+)/ debian debian/orig-tar.sh
+version=4
+opts="repack,compression=xz" \
+https://github.com/quartz-scheduler/quartz/tags .*/quartz-([\d.]+).tar.gz

distribution/examples/pom.xml

@@ -6,7 +6,7 @@
   <parent>
     <groupId>org.quartz-scheduler</groupId>
     <artifactId>quartz-parent</artifactId>
-    <version>2.2.3</version>
+    <version>2.3.0-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 

distribution/pom.xml

@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.quartz-scheduler</groupId>
     <artifactId>quartz-parent</artifactId>
-    <version>2.2.3</version>
+    <version>2.3.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>quartz-kit</artifactId>
@@ -40,7 +40,7 @@
       <scope>provided</scope>
     </dependency>    
     <dependency>
-      <groupId>c3p0</groupId>
+      <groupId>com.mchange</groupId>
       <artifactId>c3p0</artifactId>
       <version>${c3p0.version}</version>
       <scope>provided</scope>
@@ -123,7 +123,7 @@
                   <artifactId>quartz-jobs</artifactId>
                 </dependency>                
                 <dependency>
-                  <groupId>c3p0</groupId>
+                  <groupId>com.mchange</groupId>
                   <artifactId>c3p0</artifactId>
                 </dependency>                
                 <dependency>