SAK-25544 update generic-dao library

fk-snyk · Nov 18, 2015 · e0a5c0c · e0a5c0c
1 parent c4e9a12
commit e0a5c0c
Show file tree

Hide file tree

Showing 13 changed files with 14 additions and 39 deletions.
diff --git a/emailtemplateservice/impl/logic/pom.xml b/emailtemplateservice/impl/logic/pom.xml
@@ -33,9 +33,8 @@
             <artifactId>entitybroker-api</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.sakaiproject</groupId>
+            <groupId>org.sakaiproject.genericdao</groupId>
             <artifactId>generic-dao</artifactId>
-            <version>${generic-dao.version}</version>
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>

diff --git a/entitybroker/impl/pom.xml b/entitybroker/impl/pom.xml
@@ -59,7 +59,7 @@
         </dependency>
         <!-- generic DAO -->
         <dependency>
-            <groupId>org.sakaiproject</groupId>
+            <groupId>org.sakaiproject.genericdao</groupId>
             <artifactId>generic-dao</artifactId>
         </dependency>
         <dependency>

diff --git a/entitybroker/pom.xml b/entitybroker/pom.xml
@@ -161,11 +161,6 @@
         <version>${project.version}</version>
       </dependency>
       <!-- IMPL dependencies -->
-      <dependency>
-        <groupId>org.sakaiproject</groupId>
-        <artifactId>generic-dao</artifactId>
-        <version>${generic-dao.version}</version>
-      </dependency>
       <dependency>
         <groupId>org.azeckoski</groupId>
         <artifactId>reflectutils</artifactId>

diff --git a/hierarchy/impl/pom.xml b/hierarchy/impl/pom.xml
@@ -13,10 +13,6 @@
     <artifactId>hierarchy-impl</artifactId>
     <packaging>jar</packaging>
 
-    <properties>
-        <sakai.generic-dao.version>0.9.18</sakai.generic-dao.version>
-    </properties>
-
     <profiles>
         <profile>
             <id>sakai-10</id>
@@ -94,9 +90,8 @@
 
         <!-- generic DAO -->
         <dependency>
-            <groupId>org.sakaiproject</groupId>
+            <groupId>org.sakaiproject.genericdao</groupId>
             <artifactId>generic-dao</artifactId>
-            <version>${sakai.generic-dao.version}</version>
         </dependency>
 
         <!-- sakai dependencies -->

diff --git a/master/pom.xml b/master/pom.xml
@@ -123,8 +123,8 @@
     <sakai.slf4j.version>1.7.5</sakai.slf4j.version>
     <sakai.poi.version>3.13</sakai.poi.version>
     <sakai.okiosid.version>2.0</sakai.okiosid.version>
-    <generic-dao.version>0.9.18</generic-dao.version>
     <joda.time.version>2.9</joda.time.version>
+    <sakai.genericdao.version>0.10.0-SNAPSHOT</sakai.genericdao.version>
     <reflectutils.version>0.9.20</reflectutils.version>
     <!-- Sakai modules that are versioned separately -->
     <!-- lessonbuilder tool pom depends on msgcntr ver prop. Need to add a profile to the LB tool pom to mark change between 10.x master and earlier versions -->
@@ -982,6 +982,11 @@
         <version>${sakai.version}</version>
         <scope>provided</scope>
       </dependency>
+      <dependency>
+        <groupId>org.sakaiproject.genericdao</groupId>
+        <artifactId>generic-dao</artifactId>
+        <version>${sakai.genericdao.version}</version>
+      </dependency>
       <dependency>
         <groupId>org.sakaiproject.courier</groupId>
         <artifactId>sakai-courier-api</artifactId>

diff --git a/polls/impl/pom.xml b/polls/impl/pom.xml
@@ -39,9 +39,8 @@
         	<artifactId>emailtemplateservice-api</artifactId>
        </dependency>
         <dependency>
-            <groupId>org.sakaiproject</groupId>
+            <groupId>org.sakaiproject.genericdao</groupId>
             <artifactId>generic-dao</artifactId>
-            <version>${generic-dao.version}</version>
         </dependency>
         <dependency>
             <groupId>antlr</groupId>

diff --git a/profile2/impl/pom.xml b/profile2/impl/pom.xml
@@ -56,7 +56,7 @@
       		<scope>provided</scope>
    		</dependency> 
 		<dependency>
-			<groupId>org.sakaiproject</groupId>
+			<groupId>org.sakaiproject.genericdao</groupId>
 			<artifactId>generic-dao</artifactId>
 		</dependency>
 		<dependency>

diff --git a/profile2/pom.xml b/profile2/pom.xml
@@ -88,11 +88,6 @@
 				<artifactId>wicketstuff-objectautocomplete</artifactId>
 				<version>6.18.0</version>
 			</dependency>
-			<dependency>
-				<groupId>org.sakaiproject</groupId>
-				<artifactId>generic-dao</artifactId>
-				<version>${generic-dao.version}</version>
-			</dependency>
 			<dependency>
 				<groupId>org.imgscalr</groupId>
 				<artifactId>imgscalr-lib</artifactId>

diff --git a/reset-pass/account-validator-impl/pom.xml b/reset-pass/account-validator-impl/pom.xml
@@ -39,9 +39,8 @@
 
       <!-- generic DAO -->
 		<dependency>
-			<groupId>org.sakaiproject</groupId>
+			<groupId>org.sakaiproject.genericdao</groupId>
 			<artifactId>generic-dao</artifactId>
-			<version>${generic-dao.version}</version>
 		</dependency>
 
       <!-- spring and hibernate -->

diff --git a/rsf/sakai-rsf-core/pom.xml b/rsf/sakai-rsf-core/pom.xml
@@ -70,9 +70,8 @@
 			<scope>provided</scope>
 		</dependency>
 		<dependency>
-			<groupId>org.sakaiproject</groupId>
+			<groupId>org.sakaiproject.genericdao</groupId>
 			<artifactId>generic-dao</artifactId>
-			<version>${generic-dao.version}</version>
 			<scope>provided</scope>
 		</dependency>
 		<dependency>

diff --git a/signup/impl/pom.xml b/signup/impl/pom.xml
@@ -42,7 +42,7 @@
 
         <!-- third party dependencies -->
         <dependency>
-            <groupId>org.sakaiproject</groupId>
+            <groupId>org.sakaiproject.genericdao</groupId>
             <artifactId>generic-dao</artifactId>
         </dependency>
         <dependency>

diff --git a/signup/pack/pom.xml b/signup/pack/pom.xml
@@ -27,11 +27,6 @@
             <groupId>org.sakaiproject.kernel</groupId>
             <artifactId>sakai-kernel-util</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.sakaiproject</groupId>
-            <artifactId>generic-dao</artifactId>
-            <scope>compile</scope>
-        </dependency>
     </dependencies>
 
     <build />

diff --git a/signup/pom.xml b/signup/pom.xml
@@ -89,12 +89,6 @@
 				<version>${sakai.version}</version>
 				<scope>compile</scope>
 			</dependency>
-			<dependency>
-				<groupId>org.sakaiproject</groupId>
-				<artifactId>generic-dao</artifactId>
-				<version>${generic-dao.version}</version>
-				<scope>provided</scope>
-			</dependency>
 			<dependency>
 				<groupId>org.sakaiproject.jsf</groupId>
 				<artifactId>jsf-tool</artifactId>