From d69e484d9fee1b88d3a6f24461da577230bb87c0 Mon Sep 17 00:00:00 2001
From: Matthew Buckett <buckett@bumph.org>
Date: Wed, 17 Mar 2010 12:26:46 +0000
Subject: [PATCH] SAK-18211 Move common dependencies to <dependencyManagement>
 section, remove <version> tags that aren't needed, remove duplicate
 dependencies, remove pre-kernel dependencies (comments) and correct a little
 formatting

git-svn-id: https://source.sakaiproject.org/svn/portal/trunk@74739 66ffb92e-73f9-0310-93c1-f5514f145a0a
---
 portal/pom.xml                                | 21 +++++++++++-------
 portal/portal-api/api/pom.xml                 |  8 -------
 portal/portal-charon/charon/pom.xml           |  3 ++-
 portal/portal-impl/impl/pom.xml               |  3 ---
 portal/portal-render-api/api/pom.xml          | 22 -------------------
 portal/portal-render-engine-impl/impl/pom.xml | 13 -----------
 portal/portal-render-engine-impl/pack/pom.xml | 17 ++++----------
 portal/portal-render-impl/impl/pom.xml        | 21 ------------------
 portal/portal-service-impl/impl/pom.xml       | 17 --------------
 portal/portal-util/util/pom.xml               | 19 ----------------
 10 files changed, 19 insertions(+), 125 deletions(-)

diff --git a/portal/pom.xml b/portal/pom.xml
index e84f0de4fc37..fa664e00882c 100644
--- a/portal/pom.xml
+++ b/portal/pom.xml
@@ -38,32 +38,37 @@
       <dependency>
         <groupId>org.sakaiproject</groupId>
         <artifactId>sakai-portal-impl</artifactId>
-        <version>2.8-SNAPSHOT</version>
+        <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>org.sakaiproject</groupId>
         <artifactId>sakai-portal-util</artifactId>
-        <version>2.8-SNAPSHOT</version>
+        <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>org.sakaiproject</groupId>
         <artifactId>sakai-portal-render-engine-impl</artifactId>
-        <version>2.8-SNAPSHOT</version>
+        <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>org.sakaiproject</groupId>
         <artifactId>sakai-portal-render-impl</artifactId>
-        <version>2.8-SNAPSHOT</version>
+        <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>org.sakaiproject</groupId>
         <artifactId>sakai-portal-service-impl</artifactId>
-        <version>2.8-SNAPSHOT</version>
+        <version>${project.version}</version>
       </dependency>
       <dependency>
-      	<groupId>org.apache.velocity</groupId>
-      	<artifactId>velocity</artifactId>
-      	<version>1.6.3</version>
+        <groupId>org.apache.velocity</groupId>
+        <artifactId>velocity</artifactId>
+        <version>1.6.3</version>
+      </dependency>
+      <dependency>
+        <groupId>javax.portlet</groupId>
+        <artifactId>portlet-api</artifactId>
+        <version>1.0</version>
       </dependency>
     </dependencies>
   </dependencyManagement>
diff --git a/portal/portal-api/api/pom.xml b/portal/portal-api/api/pom.xml
index 428479319e0f..44a3b58b082f 100644
--- a/portal/portal-api/api/pom.xml
+++ b/portal/portal-api/api/pom.xml
@@ -27,18 +27,10 @@
       <groupId>org.sakaiproject.kernel</groupId>
       <artifactId>sakai-component-manager</artifactId>
     </dependency>
-<!--org.sakaiprojectsakai-site-api${sakai.version}-->
-<!--org.sakaiprojectsakai-component${sakai.version}-->
-<!--org.sakaiprojectsakai-component-api${sakai.version}-->
-<!--org.sakaiprojectsakai-tool-api${sakai.version}-->
-<!--javax.servletservlet-api${sakai.servletapi.version}-->
     <dependency>
       <groupId>javax.portlet</groupId>
       <artifactId>portlet-api</artifactId>
-      <version>1.0</version>
     </dependency>
-<!--org.sakaiprojectsakai-site-api${sakai.version}-->
-<!--org.sakaiprojectsakai-util-api${sakai.version}-->
   </dependencies>
   <build>
     <resources>
diff --git a/portal/portal-charon/charon/pom.xml b/portal/portal-charon/charon/pom.xml
index c013f3f6def3..926a7660072b 100644
--- a/portal/portal-charon/charon/pom.xml
+++ b/portal/portal-charon/charon/pom.xml
@@ -7,7 +7,7 @@
     <version>2.8-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
-  <name>portal</name>
+  <name>Sakai Portal Webapp</name>
   <groupId>org.sakaiproject</groupId>
   <artifactId>portal</artifactId>
   <organization>
@@ -25,5 +25,6 @@
   <build>
     <resources/>
     <sourceDirectory>src/java</sourceDirectory>
+    <finalName>portal</finalName>
   </build>
 </project>
diff --git a/portal/portal-impl/impl/pom.xml b/portal/portal-impl/impl/pom.xml
index 35eacaf48662..a608391a4062 100644
--- a/portal/portal-impl/impl/pom.xml
+++ b/portal/portal-impl/impl/pom.xml
@@ -39,7 +39,6 @@
     <dependency>
       <groupId>javax.portlet</groupId>
       <artifactId>portlet-api</artifactId>
-      <version>1.0</version>
     </dependency>
     <dependency>
       <groupId>org.sakaiproject</groupId>
@@ -78,12 +77,10 @@
     <dependency>
       <groupId>commons-collections</groupId>
       <artifactId>commons-collections</artifactId>
-      <version>3.1</version>
     </dependency>
     <dependency>
       <groupId>log4j</groupId>
       <artifactId>log4j</artifactId>
-      <version>1.2.9</version>
     </dependency>
     <dependency>
       <groupId>jtidy</groupId>
diff --git a/portal/portal-render-api/api/pom.xml b/portal/portal-render-api/api/pom.xml
index 6fbfbb030269..27921b340be4 100644
--- a/portal/portal-render-api/api/pom.xml
+++ b/portal/portal-render-api/api/pom.xml
@@ -31,39 +31,17 @@
       <groupId>org.sakaiproject.kernel</groupId>
       <artifactId>sakai-component-manager</artifactId>
     </dependency>
-<!--
-      This has been relocated to sakai-kernel-util
-      org.sakaiproject.kernel.utilsakai-tool-util-->
-<!--
-      This has been relocated to sakai-kernel-util
-      org.sakaiproject.kernel.utilsakai-user-util-->
-<!--
-      This has been relocated to sakai-kernel-util
-      org.sakaiproject.kernel.utilsakai-util-->
     <dependency>
       <groupId>org.sakaiproject</groupId>
       <artifactId>sakai-portal-api</artifactId>
     </dependency>
-<!--org.sakaiprojectsakai-tool-api${sakai.version}-->
-<!--org.sakaiprojectsakai-component-api${sakai.version}-->
-<!--org.sakaiprojectsakai-component${sakai.version}-->
-<!--org.sakaiprojectsakai-site-api${sakai.version}-->
-<!--org.sakaiprojectsakai-entity-api${sakai.version}-->
-<!--org.sakaiprojectsakai-authz-api${sakai.version}-->
-<!--org.sakaiprojectsakai-user-api${sakai.version}-->
-<!--org.sakaiprojectsakai-util-api${sakai.version}-->
-<!--org.sakaiprojectsakai-tool-util${sakai.version}-->
-<!--org.sakaiprojectsakai-util${sakai.version}-->
     <dependency>
       <groupId>org.sakaiproject</groupId>
       <artifactId>sakai-portal-util</artifactId>
     </dependency>
-<!--org.sakaiprojectsakai-user-util${sakai.version}-->
-<!--javax.servletservlet-api${sakai.servletapi.version}-->
     <dependency>
       <groupId>commons-logging</groupId>
       <artifactId>commons-logging</artifactId>
-      <version>1.0.4</version>
     </dependency>
   </dependencies>
   <build>
diff --git a/portal/portal-render-engine-impl/impl/pom.xml b/portal/portal-render-engine-impl/impl/pom.xml
index 92f9d7436876..c001485fc390 100644
--- a/portal/portal-render-engine-impl/impl/pom.xml
+++ b/portal/portal-render-engine-impl/impl/pom.xml
@@ -16,9 +16,6 @@
   </organization>
   <inceptionYear>2003</inceptionYear>
   <packaging>jar</packaging>
-  <properties>
-    <deploy.target/>
-  </properties>
   <dependencies>
     <dependency>
       <groupId>org.sakaiproject.kernel</groupId>
@@ -36,9 +33,6 @@
       <groupId>org.sakaiproject.kernel</groupId>
       <artifactId>sakai-component-manager</artifactId>
     </dependency>
-<!--
-      This has been relocated to sakai-kernel-util
-      org.sakaiproject.kernel.utilsakai-util-->
     <dependency>
       <groupId>org.sakaiproject</groupId>
       <artifactId>sakai-portal-api</artifactId>
@@ -52,11 +46,6 @@
       <groupId>org.sakaiproject</groupId>
       <artifactId>sakai-portal-render-api</artifactId>
     </dependency>
-<!--org.sakaiprojectsakai-component-api${sakai.version}-->
-<!--org.sakaiprojectsakai-component${sakai.version}-->
-<!--org.sakaiprojectsakai-util-api${sakai.version}-->
-<!--org.sakaiprojectsakai-util${sakai.version}-->
-<!--javax.servletservlet-api${sakai.servletapi.version}-->
     <dependency>
       <groupId>commons-logging</groupId>
       <artifactId>commons-logging</artifactId>
@@ -69,12 +58,10 @@
     <dependency>
       <groupId>commons-collections</groupId>
       <artifactId>commons-collections</artifactId>
-      <version>3.1</version>
     </dependency>
     <dependency>
       <groupId>log4j</groupId>
       <artifactId>log4j</artifactId>
-      <version>1.2.9</version>
     </dependency>
     <dependency>
       <groupId>jtidy</groupId>
diff --git a/portal/portal-render-engine-impl/pack/pom.xml b/portal/portal-render-engine-impl/pack/pom.xml
index 7c548762d854..ee198f2779a5 100644
--- a/portal/portal-render-engine-impl/pack/pom.xml
+++ b/portal/portal-render-engine-impl/pack/pom.xml
@@ -36,15 +36,6 @@
     <dependency>
       <groupId>org.sakaiproject.kernel</groupId>
       <artifactId>sakai-component-manager</artifactId>
-    </dependency>
-      <dependency>
-      <groupId>org.sakaiproject</groupId>
-      <artifactId>sakai-portal-api</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.sakaiproject</groupId>
-      <artifactId>sakai-portal-util</artifactId>
-      <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.sakaiproject</groupId>
@@ -60,12 +51,13 @@
     </dependency>
     <dependency>
       <groupId>org.sakaiproject</groupId>
-      <artifactId>sakai-portal-util</artifactId>
-      <scope>test</scope>
+      <artifactId>sakai-portal-render-api</artifactId>
     </dependency>
+    
     <dependency>
       <groupId>org.sakaiproject</groupId>
-      <artifactId>sakai-portal-render-api</artifactId>
+      <artifactId>sakai-portal-util</artifactId>
+      <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>httpunit</groupId>
@@ -76,7 +68,6 @@
     <dependency>
       <groupId>commons-logging</groupId>
       <artifactId>commons-logging</artifactId>
-      <version>1.0.4</version>
     </dependency>
   </dependencies>
   <build>
diff --git a/portal/portal-render-impl/impl/pom.xml b/portal/portal-render-impl/impl/pom.xml
index f7cddfa8270f..9880f0964ccb 100644
--- a/portal/portal-render-impl/impl/pom.xml
+++ b/portal/portal-render-impl/impl/pom.xml
@@ -36,15 +36,6 @@
       <groupId>org.sakaiproject.kernel</groupId>
       <artifactId>sakai-component-manager</artifactId>
     </dependency>
-<!--
-      This has been relocated to sakai-kernel-util
-      org.sakaiproject.kernel.utilsakai-tool-util-->
-<!--
-      This has been relocated to sakai-kernel-util
-      org.sakaiproject.kernel.utilsakai-user-util-->
-<!--
-      This has been relocated to sakai-kernel-util
-      org.sakaiproject.kernel.utilsakai-util-->
     <dependency>
       <groupId>org.apache.pluto</groupId>
       <artifactId>pluto-container</artifactId>
@@ -58,7 +49,6 @@
     <dependency>
       <groupId>javax.portlet</groupId>
       <artifactId>portlet-api</artifactId>
-      <version>1.0</version>
     </dependency>
     <dependency>
       <groupId>commons-codec</groupId>
@@ -73,21 +63,10 @@
       <groupId>org.sakaiproject</groupId>
       <artifactId>sakai-portal-render-api</artifactId>
     </dependency>
-<!--org.sakaiprojectsakai-tool-api${sakai.version}-->
-<!--org.sakaiprojectsakai-component-api${sakai.version}-->
-<!--org.sakaiprojectsakai-site-api${sakai.version}-->
-<!--org.sakaiprojectsakai-entity-api${sakai.version}-->
-<!--org.sakaiprojectsakai-authz-api${sakai.version}-->
-<!--org.sakaiprojectsakai-user-api${sakai.version}-->
-<!--org.sakaiprojectsakai-util-api${sakai.version}-->
-<!--org.sakaiprojectsakai-tool-util${sakai.version}-->
-<!--org.sakaiprojectsakai-util${sakai.version}-->
     <dependency>
       <groupId>org.sakaiproject</groupId>
       <artifactId>sakai-portal-util</artifactId>
     </dependency>
-<!--org.sakaiprojectsakai-user-util${sakai.version}-->
-<!--javax.servletservlet-api${sakai.servletapi.version}-->
     <dependency>
       <groupId>commons-logging</groupId>
       <artifactId>commons-logging</artifactId>
diff --git a/portal/portal-service-impl/impl/pom.xml b/portal/portal-service-impl/impl/pom.xml
index d92f163ca9fe..45ae00a432b2 100644
--- a/portal/portal-service-impl/impl/pom.xml
+++ b/portal/portal-service-impl/impl/pom.xml
@@ -36,24 +36,14 @@
       <groupId>org.sakaiproject.kernel</groupId>
       <artifactId>sakai-component-manager</artifactId>
     </dependency>
-<!--
-      This has been relocated to sakai-kernel-util
-      org.sakaiproject.kernel.utilsakai-util-->
     <dependency>
       <groupId>org.sakaiproject</groupId>
       <artifactId>sakai-portal-api</artifactId>
     </dependency>
-<!--org.sakaiprojectsakai-alias-api${sakai.version}-->
-<!--org.sakaiprojectsakai-entity-api${sakai.version}-->
-<!--org.sakaiprojectsakai-component-api${sakai.version}-->
-<!--org.sakaiprojectsakai-component${sakai.version}-->
-<!--org.sakaiprojectsakai-tool-api${sakai.version}-->
     <dependency>
       <groupId>commons-logging</groupId>
       <artifactId>commons-logging</artifactId>
-      <version>1.0.4</version>
     </dependency>
-<!--javax.servletservlet-api${sakai.servletapi.version}-->
     <dependency>
       <groupId>org.apache.pluto</groupId>
       <artifactId>pluto-container</artifactId>
@@ -67,14 +57,7 @@
     <dependency>
       <groupId>javax.portlet</groupId>
       <artifactId>portlet-api</artifactId>
-      <version>1.0</version>
     </dependency>
-<!--org.sakaiprojectsakai-site-api${sakai.version}-->
-<!--org.sakaiprojectsakai-util${sakai.version}-->
-<!--org.sakaiprojectsakai-util-api${sakai.version}-->
-<!--org.sakaiprojectsakai-entity-api${sakai.version}-->
-<!--org.sakaiprojectsakai-authz-api${sakai.version}-->
-<!--org.sakaiprojectsakai-user-api${sakai.version}-->
     <dependency>
       <groupId>castor</groupId>
       <artifactId>castor</artifactId>
diff --git a/portal/portal-util/util/pom.xml b/portal/portal-util/util/pom.xml
index 117943107d4f..3c946e2265a7 100644
--- a/portal/portal-util/util/pom.xml
+++ b/portal/portal-util/util/pom.xml
@@ -36,33 +36,14 @@
       <groupId>org.sakaiproject.kernel</groupId>
       <artifactId>sakai-component-manager</artifactId>
     </dependency>
-<!--
-      This has been relocated to sakai-kernel-util
-      org.sakaiproject.kernel.utilsakai-tool-util-->
-<!--
-      This has been relocated to sakai-kernel-util
-      org.sakaiproject.kernel.utilsakai-util-->
-<!--org.sakaiprojectsakai-component-api${sakai.version}-->
-<!--org.sakaiprojectsakai-email-api${sakai.version}-->
-<!--org.sakaiprojectsakai-event-api${sakai.version}-->
-<!--org.sakaiprojectsakai-tool-api${sakai.version}-->
-<!--org.sakaiprojectsakai-user-api${sakai.version}-->
-<!--org.sakaiprojectsakai-entity-api${sakai.version}-->
-<!--org.sakaiprojectsakai-tool-util${sakai.version}-->
-<!--org.sakaiprojectsakai-authz-api${sakai.version}-->
-<!--org.sakaiprojectsakai-site-api${sakai.version}-->
     <dependency>
       <groupId>org.sakaiproject</groupId>
       <artifactId>sakai-portal-api</artifactId>
     </dependency>
-<!--org.sakaiprojectsakai-util-api${sakai.version}-->
-<!--org.sakaiprojectsakai-util${sakai.version}-->
     <dependency>
       <groupId>commons-logging</groupId>
       <artifactId>commons-logging</artifactId>
-      <version>1.0.4</version>
     </dependency>
-<!--javax.servletservlet-api${sakai.servletapi.version}-->
   </dependencies>
   <build>
     <resources>