Tag quartz-2.1.3 from quartz-2.1.3-rc branch

chrisdennis · Jan 25, 2012 · bcc5b78 · bcc5b78
1 parent ae74eb1
commit bcc5b78
Show file tree

Hide file tree

Showing 49 changed files with 518 additions and 585 deletions.
diff --git a/examples/pom.xml b/examples/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>org.quartz-scheduler</groupId>
     <artifactId>quartz-parent</artifactId>
-    <version>2.2.0-SNAPSHOT</version>
+    <version>2.1.3</version>
   </parent>
 
   <artifactId>quartz-examples</artifactId>
@@ -163,7 +163,6 @@
     <plugins>
       <plugin>
         <artifactId>maven-deploy-plugin</artifactId>
-        <version>2.7</version>
         <configuration>
           <skip>true</skip>
         </configuration>

diff --git a/pom.xml b/pom.xml
@@ -1,11 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
 <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>
   <groupId>org.quartz-scheduler</groupId>
   <artifactId>quartz-parent</artifactId>
-  <version>2.2.0-SNAPSHOT</version>
+  <version>2.1.3</version>
   <packaging>pom</packaging>
   <name>Quartz Parent POM</name>
 
@@ -56,30 +55,18 @@
     </license>
   </licenses>
 
-  <properties>
-	<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-	<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-  </properties>
-
   <dependencyManagement>
     <dependencies>
       <dependency>
         <groupId>org.quartz-scheduler</groupId>
         <artifactId>quartz</artifactId>
         <version>${project.version}</version>
       </dependency>
-      <dependency>
-        <groupId>org.quartz-scheduler</groupId>
-        <artifactId>quartz-jobs</artifactId>
-        <version>${project.version}</version>
-      </dependency>
     </dependencies>
   </dependencyManagement>
 
   <modules>
     <module>quartz</module>
-    <module>quartz-jobs</module>
-    <module>quartz-plugins</module>
     <module>quartz-jboss</module>
     <module>quartz-backward-compat</module>
     <module>examples</module>
@@ -93,8 +80,8 @@
           <artifactId>maven-compiler-plugin</artifactId>
           <version>2.0.2</version>
           <configuration>
-            <source>1.6</source>
-            <target>1.6</target>
+            <source>1.5</source>
+            <target>1.5</target>
           </configuration>
         </plugin>
         <plugin>
@@ -112,7 +99,6 @@
           </executions>
         </plugin>
         <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-surefire-plugin</artifactId>
           <version>2.10</version>
           <configuration>
@@ -190,11 +176,6 @@
           <enableRulesSummary>true</enableRulesSummary>
         </configuration>
       </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-surefire-plugin</artifactId>
-        <version>2.10</version>
-      </plugin>          
     </plugins>
   </build>
 
@@ -305,8 +286,6 @@
                   <doctitle>Quartz Enterprise Job Scheduler ${project.version} API</doctitle>
                   <sourcepath>${project.build.directory}/tim-quartz-2.0-ee-src:
                               ${basedir}/quartz/src/main/java:
-                              ${basedir}/quartz-jobs/src/main/java:
-                              ${basedir}/quartz-plugins/src/main/java:
                               ${basedir}/quartz-jboss/src/main/java:
                               ${basedir}/quartz-oracle/src/main/java:
                               ${basedir}/quartz-weblogic/src/main/java

diff --git a/quartz-all/pom.xml b/quartz-all/pom.xml
@@ -1,13 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<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">
+<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.2.0-SNAPSHOT</version>
+    <version>2.1.3</version>
   </parent>
 
   <artifactId>quartz-all</artifactId>
@@ -25,8 +23,6 @@
               <tasks>
                 <copy todir="${project.build.directory}/classes">
                   <fileset dir="${basedir}/../quartz/target/classes"/>
-                  <fileset dir="${basedir}/../quartz-jobs/target/classes"/>
-                  <fileset dir="${basedir}/../quartz-plugins/target/classes"/>
                   <fileset dir="${basedir}/../quartz-commonj/target/classes"/>
                   <fileset dir="${basedir}/../quartz-jboss/target/classes"/>
                   <fileset dir="${basedir}/../quartz-oracle/target/classes"/>
@@ -44,42 +40,38 @@
       <plugin>
         <artifactId>maven-deploy-plugin</artifactId>
         <configuration>
-          <skip>false</skip>
+          <skip>true</skip>
         </configuration>
       </plugin>
     </plugins>
     <pluginManagement>
-    	<plugins>
-    		<!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
-    		<plugin>
-    			<groupId>org.eclipse.m2e</groupId>
-    			<artifactId>lifecycle-mapping</artifactId>
-    			<version>1.0.0</version>
-    			<configuration>
-    				<lifecycleMappingMetadata>
-    					<pluginExecutions>
-    						<pluginExecution>
-    							<pluginExecutionFilter>
-    								<groupId>
-    									org.apache.maven.plugins
-    								</groupId>
-    								<artifactId>
-    									maven-antrun-plugin
-    								</artifactId>
-    								<versionRange>[1.3,)</versionRange>
-    								<goals>
-    									<goal>run</goal>
-    								</goals>
-    							</pluginExecutionFilter>
-    							<action>
-    								<ignore></ignore>
-    							</action>
-    						</pluginExecution>
-    					</pluginExecutions>
-    				</lifecycleMappingMetadata>
-    			</configuration>
-    		</plugin>
-    	</plugins>
+      <plugins>
+        <!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
+        <plugin>
+          <groupId>org.eclipse.m2e</groupId>
+          <artifactId>lifecycle-mapping</artifactId>
+          <version>1.0.0</version>
+          <configuration>
+            <lifecycleMappingMetadata>
+              <pluginExecutions>
+                <pluginExecution>
+                  <pluginExecutionFilter>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-antrun-plugin</artifactId>
+                    <versionRange>[1.3,)</versionRange>
+                    <goals>
+                      <goal>run</goal>
+                    </goals>
+                  </pluginExecutionFilter>
+                  <action>
+                    <ignore/>
+                  </action>
+                </pluginExecution>
+              </pluginExecutions>
+            </lifecycleMappingMetadata>
+          </configuration>
+        </plugin>
+      </plugins>
     </pluginManagement>
   </build>
 

diff --git a/quartz-backward-compat/pom.xml b/quartz-backward-compat/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.quartz-scheduler</groupId>
     <artifactId>quartz-parent</artifactId>
-    <version>2.2.0-SNAPSHOT</version>
+    <version>2.1.3</version>
   </parent>
 
   <artifactId>quartz-backward-compat</artifactId>
-  <name>Quartz Backward compatibility package</name>
+  <name>Quartz backward compatibility package</name>
 
   <dependencies>
     <dependency>

diff --git a/quartz-commonj/pom.xml b/quartz-commonj/pom.xml
@@ -1,11 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<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/xsd/maven-4.0.0.xsd">
+<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/xsd/maven-4.0.0.xsd">
     <parent>
         <artifactId>quartz-parent</artifactId>
         <groupId>org.quartz-scheduler</groupId>
-        <version>2.2.0-SNAPSHOT</version>
+        <version>2.1.3</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/quartz-jboss/.settings/org.maven.ide.eclipse.prefs b/quartz-jboss/.settings/org.maven.ide.eclipse.prefs
@@ -0,0 +1,9 @@
+#Fri Nov 06 11:05:16 PST 2009
+activeProfiles=
+eclipse.preferences.version=1
+fullBuildGoals=process-test-resources
+includeModules=false
+resolveWorkspaceProjects=true
+resourceFilterGoals=process-resources resources\:testResources
+skipCompilerPlugin=true
+version=1
diff --git a/quartz-jboss/pom.xml b/quartz-jboss/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.quartz-scheduler</groupId>
     <artifactId>quartz-parent</artifactId>
-    <version>2.2.0-SNAPSHOT</version>
+    <version>2.1.3</version>
   </parent>
 
   <artifactId>quartz-jboss</artifactId>
-  <name>Quartz JBoss</name>
+  <name>quartz-jboss</name>
 
   <dependencies>
     <dependency>

diff --git a/quartz-jobs/pom.xml b/quartz-jobs/pom.xml
diff --git a/quartz-oracle/.settings/org.maven.ide.eclipse.prefs b/quartz-oracle/.settings/org.maven.ide.eclipse.prefs
@@ -0,0 +1,9 @@
+#Fri Nov 06 11:05:16 PST 2009
+activeProfiles=
+eclipse.preferences.version=1
+fullBuildGoals=process-test-resources
+includeModules=false
+resolveWorkspaceProjects=true
+resourceFilterGoals=process-resources resources\:testResources
+skipCompilerPlugin=true
+version=1
diff --git a/quartz-oracle/pom.xml b/quartz-oracle/pom.xml
@@ -1,13 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<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">
+<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.2.0-SNAPSHOT</version>
+    <version>2.1.3</version>
   </parent>
 
   <artifactId>quartz-oracle</artifactId>

diff --git a/quartz-plugins/pom.xml b/quartz-plugins/pom.xml
diff --git a/quartz-weblogic/.settings/org.maven.ide.eclipse.prefs b/quartz-weblogic/.settings/org.maven.ide.eclipse.prefs
@@ -0,0 +1,9 @@
+#Fri Nov 06 11:05:16 PST 2009
+activeProfiles=
+eclipse.preferences.version=1
+fullBuildGoals=process-test-resources
+includeModules=false
+resolveWorkspaceProjects=true
+resourceFilterGoals=process-resources resources\:testResources
+skipCompilerPlugin=true
+version=1
diff --git a/quartz-weblogic/pom.xml b/quartz-weblogic/pom.xml
@@ -1,13 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<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">
+<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.2.0-SNAPSHOT</version>
+    <version>2.1.3</version>
   </parent>
 
   <artifactId>quartz-weblogic</artifactId>

diff --git a/quartz/.settings/org.eclipse.jdt.ui.prefs b/quartz/.settings/org.eclipse.jdt.ui.prefs
@@ -1,4 +1,4 @@
-#Wed Oct 19 17:44:16 EDT 2011
+#Fri Nov 06 11:02:52 PST 2009
 eclipse.preferences.version=1
 editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=false
 sp_cleanup.add_default_serial_version_id=true

diff --git a/quartz/.settings/org.maven.ide.eclipse.prefs b/quartz/.settings/org.maven.ide.eclipse.prefs
@@ -0,0 +1,9 @@
+#Fri Nov 06 11:01:34 PST 2009
+activeProfiles=
+eclipse.preferences.version=1
+fullBuildGoals=process-test-resources
+includeModules=false
+resolveWorkspaceProjects=true
+resourceFilterGoals=process-resources resources\:testResources
+skipCompilerPlugin=true
+version=1