SAK-31571 remove job scheduler deployer (sakaiproject#3092)

- moved deps quartz, opencsv to the general deployer
UHaooooo · Jul 28, 2016 · ad83c1d · ad83c1d
1 parent 446f5dc
commit ad83c1d
Show file tree

Hide file tree

Showing 13 changed files with 14 additions and 108 deletions.
diff --git a/assignment/pom.xml b/assignment/pom.xml
@@ -33,11 +33,6 @@
   <dependencyManagement>
     <dependencies>
       <dependency>
-                <groupId>net.sf.opencsv</groupId>
-                 <artifactId>opencsv</artifactId>
-                 <version>2.3</version>
-            </dependency>
-            <dependency>
         <groupId>${project.groupId}</groupId>
         <artifactId>sakai-assignment-impl</artifactId>
         <version>${project.version}</version>

diff --git a/deploy/shared/pom.xml b/deploy/shared/pom.xml
@@ -53,17 +53,20 @@
         </dependency>
         -->
 
-        <!-- required by a number of projects.  Job scheduler shared-deploy now deploys it -->
-        <!--
         <dependency>
             <groupId>org.quartz-scheduler</groupId>
             <artifactId>quartz</artifactId>
             <version>${sakai.quartz.version}</version>
             <scope>compile</scope>
         </dependency>
-        -->
+		<dependency>
+			<groupId>net.sf.opencsv</groupId>
+			<artifactId>opencsv</artifactId>
+			<version>${sakai.opencsv.version}</version>
+			<scope>compile</scope>
+		</dependency>
 
-        <!-- The kernel assembly includes these jars (transitive dependencies 
+        <!-- The kernel assembly includes these jars (transitive dependencies
             of hibernate-3.2.7.ga) despite the fact that the kernel does not explicitly 
             define these jars as dependencies. -->
 

diff --git a/gradebookng/tool/pom.xml b/gradebookng/tool/pom.xml
@@ -78,7 +78,6 @@
 		<dependency>
 			<groupId>net.sf.opencsv</groupId>
 			<artifactId>opencsv</artifactId>
-			<version>2.3</version>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.poi</groupId>

diff --git a/jobscheduler/pom.xml b/jobscheduler/pom.xml
@@ -15,7 +15,6 @@
 
   <modules>
     <module>scheduler-api</module>
-    <module>scheduler-deploy</module>
     <module>scheduler-component</module>
     <module>scheduler-component-shared</module>
     <module>scheduler-events-model</module>

diff --git a/jobscheduler/scheduler-deploy/pom.xml b/jobscheduler/scheduler-deploy/pom.xml
diff --git a/jobscheduler/scheduler-deploy/shared/pom.xml b/jobscheduler/scheduler-deploy/shared/pom.xml
diff --git a/kernel/kernel-impl/pom.xml b/kernel/kernel-impl/pom.xml
@@ -139,7 +139,6 @@
         <!-- for parsing CSV data from config service files -->
         <groupId>net.sf.opencsv</groupId>
         <artifactId>opencsv</artifactId>
-        <version>2.3</version>
     </dependency>
     <dependency>
       <groupId>org.hsqldb</groupId>

diff --git a/lessonbuilder/tool/pom.xml b/lessonbuilder/tool/pom.xml
@@ -200,7 +200,6 @@
         <dependency>
              <groupId>net.sf.opencsv</groupId>
              <artifactId>opencsv</artifactId>
-             <version>2.3</version>
         </dependency>
 
     </dependencies>

diff --git a/master/pom.xml b/master/pom.xml
@@ -100,6 +100,7 @@
     <sakai.lucene.version>4.10.4</sakai.lucene.version>
     <sakai.pluto.version>1.1.7</sakai.pluto.version>
     <sakai.quartz.version>2.2.2</sakai.quartz.version>
+    <sakai.opencsv.version>2.3</sakai.opencsv.version>
     <sakai.servletapi.version>2.4</sakai.servletapi.version>
     <sakai.sigar.version>1.6.4</sakai.sigar.version>
     <sakai.spatial4j.version>0.4.1</sakai.spatial4j.version>
@@ -872,6 +873,12 @@
         <version>${sakai.quartz.version}</version>
         <scope>provided</scope>
       </dependency>
+      <dependency>
+        <groupId>net.sf.opencsv</groupId>
+        <artifactId>opencsv</artifactId>
+        <version>${sakai.opencsv.version}</version>
+        <scope>provided</scope>
+      </dependency>
       <!-- Added to shared by the kernel (duplicate definition in kernel/pom.xml) -->
       <dependency>
         <groupId>com.h2database</groupId>

diff --git a/profile2/pom.xml b/profile2/pom.xml
@@ -93,12 +93,6 @@
 				<version>4.2</version>
 				<scope>compile</scope>
 			</dependency>
-			<dependency>
-				<groupId>net.sf.opencsv</groupId>
-				<artifactId>opencsv</artifactId>
-				<version>2.3</version>
-				<scope>compile</scope>
-			</dependency>
 		</dependencies>
 	</dependencyManagement>
 	<issueManagement>

diff --git a/signup/pom.xml b/signup/pom.xml
@@ -161,12 +161,6 @@
 				<version>2.0.8</version>
 				<scope>compile</scope>
 			</dependency>
-			<dependency>
-				<groupId>net.sf.opencsv</groupId>
-				<artifactId>opencsv</artifactId>
-				<version>2.3</version>
-				<scope>compile</scope>
-			</dependency>
 		</dependencies>
 	</dependencyManagement>
 

diff --git a/site-manage/pom.xml b/site-manage/pom.xml
@@ -123,12 +123,6 @@
                 <artifactId>sakai-siteassociation-util</artifactId>
                 <version>${project.version}</version>
             </dependency>
-	    <dependency>
-	      <groupId>net.sf.opencsv</groupId>
-	      <artifactId>opencsv</artifactId>
-	      <version>2.3</version>
-	      <scope>compile</scope>
-	    </dependency>
         </dependencies>
     </dependencyManagement>
 

diff --git a/user/user-tool/tool/pom.xml b/user/user-tool/tool/pom.xml
@@ -57,7 +57,6 @@
 	<dependency>
 		<groupId>net.sf.opencsv</groupId>
 		<artifactId>opencsv</artifactId>
-		<version>2.3</version>
 	</dependency>
 	<dependency>
 		<groupId>org.sakaiproject.portal</groupId>