portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a..@apache.org
Subject svn commit: r1052125 [1/2] - in /portals/jetspeed-2/portal/trunk: ./ applications/jetspeed-demo/ applications/jetspeed-layouts/ applications/jetspeed/ components/jetspeed-capability/ components/jetspeed-cm/ components/jetspeed-db-tools/ components/jets...
Date Thu, 23 Dec 2010 01:20:27 GMT
Author: ate
Date: Thu Dec 23 01:20:26 2010
New Revision: 1052125

URL: http://svn.apache.org/viewvc?rev=1052125&view=rev
Log:
JS2-1227: Build failure with Maven 3
- initial cleanup of deprecated usages like ${pom.version} instead of ${project.version}
- dropping legacy bluesunrise.m1 repository as I could build with a clean (empty) local repository without it (which is *very* time consuming...)

Modified:
    portals/jetspeed-2/portal/trunk/applications/jetspeed-demo/jetspeed-mvn-demo-pom.xml
    portals/jetspeed-2/portal/trunk/applications/jetspeed-demo/pom.xml
    portals/jetspeed-2/portal/trunk/applications/jetspeed-layouts/pom.xml
    portals/jetspeed-2/portal/trunk/applications/jetspeed/pom.xml
    portals/jetspeed-2/portal/trunk/components/jetspeed-capability/pom.xml
    portals/jetspeed-2/portal/trunk/components/jetspeed-cm/pom.xml
    portals/jetspeed-2/portal/trunk/components/jetspeed-db-tools/pom.xml
    portals/jetspeed-2/portal/trunk/components/jetspeed-deploy-tools/pom.xml
    portals/jetspeed-2/portal/trunk/components/jetspeed-file-cache/pom.xml
    portals/jetspeed-2/portal/trunk/components/jetspeed-header-resource/pom.xml
    portals/jetspeed-2/portal/trunk/components/jetspeed-id-generator/pom.xml
    portals/jetspeed-2/portal/trunk/components/jetspeed-layout-portlets/pom.xml
    portals/jetspeed-2/portal/trunk/components/jetspeed-locator/pom.xml
    portals/jetspeed-2/portal/trunk/components/jetspeed-page-layout/pom.xml
    portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/pom.xml
    portals/jetspeed-2/portal/trunk/components/jetspeed-portal-site/pom.xml
    portals/jetspeed-2/portal/trunk/components/jetspeed-portal/pom.xml
    portals/jetspeed-2/portal/trunk/components/jetspeed-portlet-factory/pom.xml
    portals/jetspeed-2/portal/trunk/components/jetspeed-profiler/pom.xml
    portals/jetspeed-2/portal/trunk/components/jetspeed-rdbms/pom.xml
    portals/jetspeed-2/portal/trunk/components/jetspeed-registry/pom.xml
    portals/jetspeed-2/portal/trunk/components/jetspeed-search/pom.xml
    portals/jetspeed-2/portal/trunk/components/jetspeed-security/pom.xml
    portals/jetspeed-2/portal/trunk/components/jetspeed-serializer/pom.xml
    portals/jetspeed-2/portal/trunk/components/jetspeed-sso/pom.xml
    portals/jetspeed-2/portal/trunk/components/jetspeed-statistics/pom.xml
    portals/jetspeed-2/portal/trunk/components/jetspeed-utils/pom.xml
    portals/jetspeed-2/portal/trunk/enterprise/ear-full/build.xml
    portals/jetspeed-2/portal/trunk/enterprise/ear-full/pom.xml
    portals/jetspeed-2/portal/trunk/enterprise/ear-min/build.xml
    portals/jetspeed-2/portal/trunk/enterprise/ear-min/pom.xml
    portals/jetspeed-2/portal/trunk/enterprise/pom.xml
    portals/jetspeed-2/portal/trunk/jetspeed-archetype/pom.xml
    portals/jetspeed-2/portal/trunk/jetspeed-commons/pom.xml
    portals/jetspeed-2/portal/trunk/jetspeed-installer/jetspeed-mvn-ant-installer-pom.xml
    portals/jetspeed-2/portal/trunk/jetspeed-installer/jetspeed-mvn-database-pom.xml
    portals/jetspeed-2/portal/trunk/jetspeed-installer/jetspeed-mvn-tomcat-portal-pom.xml
    portals/jetspeed-2/portal/trunk/jetspeed-installer/pom.xml
    portals/jetspeed-2/portal/trunk/jetspeed-mvn-db-init-pom.xml
    portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/pom.xml
    portals/jetspeed-2/portal/trunk/maven/jetspeed-db-maven-plugin/pom.xml
    portals/jetspeed-2/portal/trunk/maven/jetspeed-deploy-maven-plugin/pom.xml
    portals/jetspeed-2/portal/trunk/maven/jetspeed-fileutils-maven-plugin/pom.xml
    portals/jetspeed-2/portal/trunk/maven/jetspeed-maven-utils/pom.xml
    portals/jetspeed-2/portal/trunk/maven/jetspeed-mvn-maven-plugin/pom.xml
    portals/jetspeed-2/portal/trunk/maven/jetspeed-unpack-maven-plugin/pom.xml
    portals/jetspeed-2/portal/trunk/maven/jetspeed-unpack-war-maven-plugin/pom.xml
    portals/jetspeed-2/portal/trunk/pom.xml

Modified: portals/jetspeed-2/portal/trunk/applications/jetspeed-demo/jetspeed-mvn-demo-pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed-demo/jetspeed-mvn-demo-pom.xml?rev=1052125&r1=1052124&r2=1052125&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/applications/jetspeed-demo/jetspeed-mvn-demo-pom.xml (original)
+++ portals/jetspeed-2/portal/trunk/applications/jetspeed-demo/jetspeed-mvn-demo-pom.xml Thu Dec 23 01:20:26 2010
@@ -37,7 +37,7 @@
   <packaging>pom</packaging>
 
   <properties>
-    <org.apache.portals.jetspeed.version>${pom.version}</org.apache.portals.jetspeed.version>
+    <org.apache.portals.jetspeed.version>${project.version}</org.apache.portals.jetspeed.version>
     <org.apache.jetspeed.portal.context.name>jetspeed</org.apache.jetspeed.portal.context.name>
     <org.apache.jetspeed.server.home>${project.build.directory}/demo-deploy</org.apache.jetspeed.server.home>
   </properties>
@@ -88,10 +88,10 @@
                   <seed>
                     <categories>serializer</categories>
                     <filterPropertiesFileName>
-                      ${project.build.directory}/jetspeed-demo-${pom.version}/WEB-INF/conf/spring-filter.properties
+                      ${project.build.directory}/jetspeed-demo-${project.version}/WEB-INF/conf/spring-filter.properties
                     </filterPropertiesFileName>
                     <applicationRootPath>
-                      ${project.build.directory}/jetspeed-demo-${pom.version}
+                      ${project.build.directory}/jetspeed-demo-${project.version}
                     </applicationRootPath>
                     <files>
                       <file>${project.build.directory}/db/seed/${seed.file}</file>
@@ -153,12 +153,12 @@
                   <psml>
                     <categories>pageSerializer</categories>
                     <filterPropertiesFileName>
-                      ${project.build.directory}/jetspeed-demo-${pom.version}/WEB-INF/conf/spring-filter.properties
+                      ${project.build.directory}/jetspeed-demo-${project.version}/WEB-INF/conf/spring-filter.properties
                     </filterPropertiesFileName>
                     <applicationRootPath>
-                      ${project.build.directory}/jetspeed-demo-${pom.version}
+                      ${project.build.directory}/jetspeed-demo-${project.version}
                     </applicationRootPath>
-					<psmlPagesPath>${project.build.directory}/jetspeed-demo-${pom.version}/WEB-INF/${seed.pages}</psmlPagesPath>
+					<psmlPagesPath>${project.build.directory}/jetspeed-demo-${project.version}/WEB-INF/${seed.pages}</psmlPagesPath>
                     <initProperties>
                       <org.apache.jetspeed.database.user>${org.apache.jetspeed.production.database.user}</org.apache.jetspeed.database.user>
                       <org.apache.jetspeed.database.password>${org.apache.jetspeed.production.database.password}</org.apache.jetspeed.database.password>
@@ -377,7 +377,7 @@
               <dependency>
                 <groupId>org.apache.portals.jetspeed-2</groupId>
                 <artifactId>jetspeed-demo</artifactId>
-                <version>${pom.version}</version>
+                <version>${project.version}</version>
                 <type>war</type>
               </dependency>
               <!-- j2-admin -->
@@ -625,7 +625,7 @@
               <dependency>
                 <groupId>org.apache.portals.jetspeed-2</groupId>
                 <artifactId>jetspeed-demo</artifactId>
-                <version>${pom.version}</version>
+                <version>${project.version}</version>
                 <type>war</type>
               </dependency>
               <!-- j2-admin -->

Modified: portals/jetspeed-2/portal/trunk/applications/jetspeed-demo/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed-demo/pom.xml?rev=1052125&r1=1052124&r2=1052125&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/applications/jetspeed-demo/pom.xml (original)
+++ portals/jetspeed-2/portal/trunk/applications/jetspeed-demo/pom.xml Thu Dec 23 01:20:26 2010
@@ -40,14 +40,14 @@
     <dependency>
       <groupId>org.apache.portals.jetspeed-2</groupId>
       <artifactId>jetspeed</artifactId>
-      <version>${pom.version}</version>
+      <version>${project.version}</version>
       <type>war</type>
       <scope>runtime</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.portals.jetspeed-2</groupId>
       <artifactId>jetspeed-dependencies</artifactId>
-      <version>${pom.version}</version>
+      <version>${project.version}</version>
       <type>pom</type>
     </dependency>
   </dependencies>
@@ -83,7 +83,7 @@
               <goal>process</goal>
             </goals>
             <configuration>
-              <outputDirectory>${project.build.directory}/${build.finalName}</outputDirectory>
+              <outputDirectory>${project.build.directory}/${project.build.finalName}</outputDirectory>
               <attached>false</attached>
             </configuration>
           </execution>
@@ -92,7 +92,7 @@
       <plugin>
         <groupId>org.apache.portals.jetspeed-2</groupId>
         <artifactId>jetspeed-deploy-maven-plugin</artifactId>
-        <version>${pom.version}</version>
+        <version>${project.version}</version>
         <executions>
           <execution>
             <id>deploy-jetspeed-layouts</id>
@@ -118,7 +118,7 @@
           <dependency>
             <groupId>org.apache.portals.jetspeed-2</groupId>
             <artifactId>jetspeed-layouts</artifactId>
-            <version>${pom.version}</version>
+            <version>${project.version}</version>
             <type>war</type>
           </dependency>
         </dependencies>

Modified: portals/jetspeed-2/portal/trunk/applications/jetspeed-layouts/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed-layouts/pom.xml?rev=1052125&r1=1052124&r2=1052125&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/applications/jetspeed-layouts/pom.xml (original)
+++ portals/jetspeed-2/portal/trunk/applications/jetspeed-layouts/pom.xml Thu Dec 23 01:20:26 2010
@@ -82,7 +82,7 @@
               <goal>process</goal>
             </goals>
             <configuration>
-              <outputDirectory>${project.build.directory}/${build.finalName}</outputDirectory>
+              <outputDirectory>${project.build.directory}/${project.build.finalName}</outputDirectory>
               <attached>false</attached>
             </configuration>
           </execution>

Modified: portals/jetspeed-2/portal/trunk/applications/jetspeed/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/pom.xml?rev=1052125&r1=1052124&r2=1052125&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/applications/jetspeed/pom.xml (original)
+++ portals/jetspeed-2/portal/trunk/applications/jetspeed/pom.xml Thu Dec 23 01:20:26 2010
@@ -67,16 +67,16 @@
               <goal>process</goal>
             </goals>
             <configuration>
-              <outputDirectory>${project.build.directory}/${build.finalName}</outputDirectory>
+              <outputDirectory>${project.build.directory}/${project.build.finalName}</outputDirectory>
               <attached>false</attached>
             </configuration>
           </execution>
         </executions>
       </plugin>
       <plugin>
-        <groupId>${pom.groupId}</groupId>
+        <groupId>${project.groupId}</groupId>
         <artifactId>jetspeed-unpack-maven-plugin</artifactId>
-        <version>${pom.version}</version>
+        <version>${project.version}</version>
         <executions>
           <execution>
             <id>unpack-dojo</id>
@@ -112,7 +112,7 @@
             <phase>process-resources</phase>
             <configuration>
               <unpack>
-                <artifact>${groupId}:jetspeed-portal-resources:jar</artifact>
+                <artifact>${project.groupId}:jetspeed-portal-resources:jar</artifact>
                 <targetDirectory>${project.build.directory}/${project.build.finalName}/WEB-INF</targetDirectory>
                 <resources>
                   <resource>
@@ -134,9 +134,9 @@
         </executions>
         <dependencies>
           <dependency>
-            <groupId>${pom.groupId}</groupId>
+            <groupId>${project.groupId}</groupId>
             <artifactId>jetspeed-portal-resources</artifactId>
-            <version>${pom.version}</version>
+            <version>${project.version}</version>
           </dependency>
         </dependencies>
       </plugin>

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-capability/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-capability/pom.xml?rev=1052125&r1=1052124&r2=1052125&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-capability/pom.xml (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-capability/pom.xml Thu Dec 23 01:20:26 2010
@@ -43,21 +43,21 @@
 
     <!-- Build Dependencies -->
     <dependency>
-      <groupId>${pom.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>jetspeed-api</artifactId>
       <scope>provided</scope>
     </dependency>
     <dependency>
-      <groupId>${pom.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>jetspeed-commons</artifactId>
       <scope>provided</scope>
     </dependency>
     <dependency>
-      <groupId>${pom.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>jetspeed-rdbms</artifactId>
     </dependency>
     <dependency>
-      <groupId>${pom.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>jetspeed-serializer</artifactId>
     </dependency>
     <dependency>
@@ -66,7 +66,7 @@
     </dependency>
 
     <dependency>
-      <groupId>${pom.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>jetspeed-cm</artifactId>
       <scope>test</scope>
     </dependency>
@@ -106,9 +106,9 @@
   <build>
     <plugins>
       <plugin>
-        <groupId>${pom.groupId}</groupId>
+        <groupId>${project.groupId}</groupId>
         <artifactId>jetspeed-unpack-maven-plugin</artifactId>
-        <version>${pom.version}</version>
+        <version>${project.version}</version>
         <executions>
           <execution>
             <id>unpack-test-resources</id>
@@ -139,9 +139,9 @@
         </executions>
         <dependencies>
           <dependency>
-            <groupId>${pom.groupId}</groupId>
+            <groupId>${project.groupId}</groupId>
             <artifactId>jetspeed-portal-resources</artifactId>
-            <version>${pom.version}</version>
+            <version>${project.version}</version>
           </dependency>
         </dependencies>
       </plugin>

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-cm/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-cm/pom.xml?rev=1052125&r1=1052124&r2=1052125&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-cm/pom.xml (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-cm/pom.xml Thu Dec 23 01:20:26 2010
@@ -41,7 +41,7 @@
 
         <!-- Build Dependencies -->
         <dependency>
-            <groupId>${pom.groupId}</groupId>
+            <groupId>${project.groupId}</groupId>
             <artifactId>jetspeed-api</artifactId>
             <scope>provided</scope>
         </dependency>
@@ -134,11 +134,6 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>oro</groupId>
-            <artifactId>oro</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
             <groupId>jmock</groupId>
             <artifactId>jmock-cglib</artifactId>
             <scope>test</scope>

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-db-tools/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-db-tools/pom.xml?rev=1052125&r1=1052124&r2=1052125&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-db-tools/pom.xml (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-db-tools/pom.xml Thu Dec 23 01:20:26 2010
@@ -56,15 +56,11 @@
 
     <!-- Build Dependencies -->
     <dependency>
-      <groupId>${pom.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>jetspeed-api</artifactId>
     </dependency>
     <dependency>
-      <groupId>${pom.groupId}</groupId>
-      <artifactId>jetspeed-api</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>${pom.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>jetspeed-commons</artifactId>
     </dependency>
     <dependency>
@@ -73,7 +69,7 @@
       <version>${org.apache.portals.bridges.common.version}</version>
     </dependency>
     <dependency>
-      <groupId>${pom.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>jetspeed-cm</artifactId>
       <exclusions>
         <exclusion>
@@ -159,9 +155,9 @@
         </configuration>
       </plugin>
       <plugin>
-        <groupId>${pom.groupId}</groupId>
+        <groupId>${project.groupId}</groupId>
         <artifactId>jetspeed-unpack-maven-plugin</artifactId>
-        <version>${pom.version}</version>
+        <version>${project.version}</version>
         <executions>
           <execution>
             <id>unpack-test-resources</id>
@@ -196,9 +192,9 @@
         </executions>
         <dependencies>
           <dependency>
-            <groupId>${pom.groupId}</groupId>
+            <groupId>${project.groupId}</groupId>
             <artifactId>jetspeed-portal-resources</artifactId>
-            <version>${pom.version}</version>
+            <version>${project.version}</version>
           </dependency>
         </dependencies>
       </plugin>

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-deploy-tools/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-deploy-tools/pom.xml?rev=1052125&r1=1052124&r2=1052125&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-deploy-tools/pom.xml (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-deploy-tools/pom.xml Thu Dec 23 01:20:26 2010
@@ -39,7 +39,7 @@
 
     <!-- Build Dependencies -->
     <dependency>
-      <groupId>${pom.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>jetspeed-api</artifactId>
       <scope>provided</scope>
     </dependency>
@@ -49,9 +49,9 @@
   <build>
     <plugins>
       <plugin>
-        <groupId>${pom.groupId}</groupId>
+        <groupId>${project.groupId}</groupId>
         <artifactId>jetspeed-unpack-maven-plugin</artifactId>
-        <version>${pom.version}</version>
+        <version>${project.version}</version>
         <executions>
           <execution>
             <id>unpack-resources</id>
@@ -74,9 +74,9 @@
         </executions>
         <dependencies>
           <dependency>
-            <groupId>${pom.groupId}</groupId>
+            <groupId>${project.groupId}</groupId>
             <artifactId>jetspeed-portal-resources</artifactId>
-            <version>${pom.version}</version>
+            <version>${project.version}</version>
           </dependency>
         </dependencies>
       </plugin>

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-file-cache/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-file-cache/pom.xml?rev=1052125&r1=1052124&r2=1052125&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-file-cache/pom.xml (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-file-cache/pom.xml Thu Dec 23 01:20:26 2010
@@ -41,7 +41,7 @@
 
         <!-- Build Dependencies -->
         <dependency>
-            <groupId>${pom.groupId}</groupId>
+            <groupId>${project.groupId}</groupId>
             <artifactId>jetspeed-api</artifactId>
             <scope>provided</scope>
         </dependency>
@@ -67,7 +67,7 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>${pom.groupId}</groupId>
+            <groupId>${project.groupId}</groupId>
             <artifactId>jetspeed-cm</artifactId>
             <scope>test</scope>
         </dependency>

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-header-resource/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-header-resource/pom.xml?rev=1052125&r1=1052124&r2=1052125&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-header-resource/pom.xml (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-header-resource/pom.xml Thu Dec 23 01:20:26 2010
@@ -41,7 +41,7 @@
 
         <!-- Build Dependencies -->
         <dependency>
-            <groupId>${pom.groupId}</groupId>
+            <groupId>${project.groupId}</groupId>
             <artifactId>jetspeed-api</artifactId>
             <scope>provided</scope>
         </dependency>

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-id-generator/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-id-generator/pom.xml?rev=1052125&r1=1052124&r2=1052125&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-id-generator/pom.xml (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-id-generator/pom.xml Thu Dec 23 01:20:26 2010
@@ -41,7 +41,7 @@
 
         <!-- Build Dependencies -->
         <dependency>
-            <groupId>${pom.groupId}</groupId>
+            <groupId>${project.groupId}</groupId>
             <artifactId>jetspeed-api</artifactId>
             <scope>provided</scope>
         </dependency>

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-layout-portlets/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-layout-portlets/pom.xml?rev=1052125&r1=1052124&r2=1052125&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-layout-portlets/pom.xml (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-layout-portlets/pom.xml Thu Dec 23 01:20:26 2010
@@ -39,17 +39,17 @@
 
     <!-- Build Dependencies -->
     <dependency>
-      <groupId>${pom.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>jetspeed-api</artifactId>
       <scope>provided</scope>
     </dependency>
     <dependency>
-      <groupId>${pom.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>jetspeed-commons</artifactId>
       <scope>provided</scope>
     </dependency>
     <dependency>
-      <groupId>${pom.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>jetspeed-portal</artifactId>
       <scope>provided</scope>
     </dependency>
@@ -64,7 +64,7 @@
 
     <!-- Test Dependencies -->
     <dependency>
-      <groupId>${pom.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>jetspeed-page-layout</artifactId>
       <scope>test</scope>
     </dependency>

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-locator/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-locator/pom.xml?rev=1052125&r1=1052124&r2=1052125&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-locator/pom.xml (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-locator/pom.xml Thu Dec 23 01:20:26 2010
@@ -43,7 +43,7 @@
 
         <!-- Build Dependencies -->
         <dependency>
-            <groupId>${pom.groupId}</groupId>
+            <groupId>${project.groupId}</groupId>
             <artifactId>jetspeed-api</artifactId>
             <scope>provided</scope>
         </dependency>
@@ -54,7 +54,7 @@
         
         <!-- Test Dependencies -->
         <dependency>
-            <groupId>${pom.groupId}</groupId>
+            <groupId>${project.groupId}</groupId>
             <artifactId>jetspeed-cm</artifactId>
             <scope>test</scope>
         </dependency>

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-page-layout/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-page-layout/pom.xml?rev=1052125&r1=1052124&r2=1052125&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-page-layout/pom.xml (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-page-layout/pom.xml Thu Dec 23 01:20:26 2010
@@ -41,17 +41,17 @@
 
         <!-- Build Dependencies -->
         <dependency>
-            <groupId>${pom.groupId}</groupId>
+            <groupId>${project.groupId}</groupId>
             <artifactId>jetspeed-api</artifactId>
             <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>${pom.groupId}</groupId>
+            <groupId>${project.groupId}</groupId>
             <artifactId>jetspeed-commons</artifactId>
             <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>${pom.groupId}</groupId>
+            <groupId>${project.groupId}</groupId>
             <artifactId>jetspeed-page-manager</artifactId>
         </dependency>
         <dependency>
@@ -61,26 +61,21 @@
         
         <!-- Test Dependencies -->
         <dependency>
-          <groupId>${pom.groupId}</groupId>
+          <groupId>${project.groupId}</groupId>
           <artifactId>jetspeed-cm</artifactId>
           <scope>test</scope>
         </dependency>
         <dependency>
-          <groupId>${pom.groupId}</groupId>
+          <groupId>${project.groupId}</groupId>
           <artifactId>jetspeed-id-generator</artifactId>
           <scope>test</scope>
         </dependency>
         <dependency>
-          <groupId>${pom.groupId}</groupId>
+          <groupId>${project.groupId}</groupId>
           <artifactId>jetspeed-file-cache</artifactId>
           <scope>test</scope>
         </dependency>
         <dependency>
-          <groupId>${pom.groupId}</groupId>
-          <artifactId>jetspeed-page-manager</artifactId>
-          <scope>test</scope>
-        </dependency>
-        <dependency>
           <groupId>org.slf4j</groupId>
           <artifactId>slf4j-log4j12</artifactId>
           <scope>test</scope>
@@ -91,9 +86,9 @@
     <build>
       <plugins>
         <plugin>
-          <groupId>${pom.groupId}</groupId>
+          <groupId>${project.groupId}</groupId>
           <artifactId>jetspeed-unpack-maven-plugin</artifactId>
-          <version>${pom.version}</version>
+          <version>${project.version}</version>
           <executions>
             <execution>
               <id>unpack-test-resources</id>
@@ -121,9 +116,9 @@
           </executions>
           <dependencies>
             <dependency>
-              <groupId>${pom.groupId}</groupId>
+              <groupId>${project.groupId}</groupId>
               <artifactId>jetspeed-portal-resources</artifactId>
-              <version>${pom.version}</version>
+              <version>${project.version}</version>
             </dependency>
           </dependencies>
         </plugin>

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/pom.xml?rev=1052125&r1=1052124&r2=1052125&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/pom.xml (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/pom.xml Thu Dec 23 01:20:26 2010
@@ -43,25 +43,25 @@
 
     <!-- Build Dependencies -->
     <dependency>
-      <groupId>${pom.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>jetspeed-api</artifactId>
       <scope>provided</scope>
     </dependency>
     <dependency>
-      <groupId>${pom.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>jetspeed-commons</artifactId>
       <scope>provided</scope>
     </dependency>
     <dependency>
-      <groupId>${pom.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>jetspeed-rdbms</artifactId>
     </dependency>
     <dependency>
-      <groupId>${pom.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>jetspeed-file-cache</artifactId>
     </dependency>
     <dependency>
-      <groupId>${pom.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>jetspeed-security</artifactId>
     </dependency>
     <dependency>
@@ -87,7 +87,7 @@
 
     <!-- Test Dependencies -->
     <dependency>
-      <groupId>${pom.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>jetspeed-id-generator</artifactId>
       <scope>test</scope>
     </dependency>
@@ -153,9 +153,9 @@
         </configuration>
       </plugin>
       <plugin>
-        <groupId>${pom.groupId}</groupId>
+        <groupId>${project.groupId}</groupId>
         <artifactId>jetspeed-unpack-maven-plugin</artifactId>
-        <version>${pom.version}</version>
+        <version>${project.version}</version>
         <executions>
           <execution>
             <id>unpack-test-resources</id>
@@ -185,9 +185,9 @@
         </executions>
         <dependencies>
           <dependency>
-            <groupId>${pom.groupId}</groupId>
+            <groupId>${project.groupId}</groupId>
             <artifactId>jetspeed-portal-resources</artifactId>
-            <version>${pom.version}</version>
+            <version>${project.version}</version>
           </dependency>
         </dependencies>
       </plugin>

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portal-site/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal-site/pom.xml?rev=1052125&r1=1052124&r2=1052125&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal-site/pom.xml (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal-site/pom.xml Thu Dec 23 01:20:26 2010
@@ -41,12 +41,12 @@
 
     <!-- Build Dependencies -->
     <dependency>
-      <groupId>${pom.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>jetspeed-api</artifactId>
       <scope>provided</scope>
     </dependency>
     <dependency>
-      <groupId>${pom.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>jetspeed-commons</artifactId>
       <scope>provided</scope>
     </dependency>
@@ -57,27 +57,27 @@
 
     <!-- Test Dependencies -->
     <dependency>
-      <groupId>${pom.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>jetspeed-cm</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>${pom.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>jetspeed-profiler</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>${pom.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>jetspeed-id-generator</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>${pom.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>jetspeed-file-cache</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>${pom.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>jetspeed-page-manager</artifactId>
       <scope>test</scope>
     </dependency>
@@ -91,9 +91,9 @@
   <build>
     <plugins>
       <plugin>
-        <groupId>${pom.groupId}</groupId>
+        <groupId>${project.groupId}</groupId>
         <artifactId>jetspeed-unpack-maven-plugin</artifactId>
-        <version>${pom.version}</version>
+        <version>${project.version}</version>
         <executions>
           <execution>
             <id>unpack-test-resources</id>
@@ -121,9 +121,9 @@
         </executions>
         <dependencies>
           <dependency>
-            <groupId>${pom.groupId}</groupId>
+            <groupId>${project.groupId}</groupId>
             <artifactId>jetspeed-portal-resources</artifactId>
-            <version>${pom.version}</version>
+            <version>${project.version}</version>
           </dependency>
         </dependencies>
       </plugin>

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/pom.xml?rev=1052125&r1=1052124&r2=1052125&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal/pom.xml (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal/pom.xml Thu Dec 23 01:20:26 2010
@@ -41,37 +41,37 @@
 
     <!-- Build Dependencies -->
     <dependency>
-      <groupId>${pom.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>jetspeed-api</artifactId>
       <scope>provided</scope>
     </dependency>
     <dependency>
-      <groupId>${pom.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>jetspeed-commons</artifactId>
       <scope>provided</scope>
     </dependency>
     <dependency>
-      <groupId>${pom.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>jetspeed-rdbms</artifactId>
     </dependency>
     <dependency>
-      <groupId>${pom.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>jetspeed-deploy-tools</artifactId>
     </dependency>
     <dependency>
-      <groupId>${pom.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>jetspeed-registry</artifactId>
     </dependency>
     <dependency>
-      <groupId>${pom.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>jetspeed-page-manager</artifactId>
     </dependency>
     <dependency>
-      <groupId>${pom.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>jetspeed-security</artifactId>
     </dependency>
     <dependency>
-      <groupId>${pom.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>jetspeed-page-layout</artifactId>
     </dependency>
     <dependency>
@@ -195,42 +195,42 @@
 
     <!-- Test Dependencies -->
     <dependency>
-      <groupId>${pom.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>jetspeed-statistics</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>${pom.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>jetspeed-header-resource</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>${pom.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>jetspeed-search</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>${pom.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>jetspeed-sso</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>${pom.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>jetspeed-profiler</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>${pom.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>jetspeed-id-generator</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>${pom.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>jetspeed-capability</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>${pom.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>jetspeed-portal-site</artifactId>
       <scope>test</scope>
     </dependency>
@@ -297,9 +297,9 @@
         </configuration>
       </plugin>
       <plugin>
-        <groupId>${pom.groupId}</groupId>
+        <groupId>${project.groupId}</groupId>
         <artifactId>jetspeed-unpack-maven-plugin</artifactId>
-        <version>${pom.version}</version>
+        <version>${project.version}</version>
         <executions>
           <execution>
             <id>unpack-test-resources</id>
@@ -337,9 +337,9 @@
         </executions>
         <dependencies>
           <dependency>
-            <groupId>${pom.groupId}</groupId>
+            <groupId>${project.groupId}</groupId>
             <artifactId>jetspeed-portal-resources</artifactId>
-            <version>${pom.version}</version>
+            <version>${project.version}</version>
           </dependency>
         </dependencies>
       </plugin>

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portlet-factory/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portlet-factory/pom.xml?rev=1052125&r1=1052124&r2=1052125&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-portlet-factory/pom.xml (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portlet-factory/pom.xml Thu Dec 23 01:20:26 2010
@@ -41,12 +41,12 @@
 
 	<!-- Build Dependencies -->
     <dependency>
-      <groupId>${pom.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>jetspeed-api</artifactId>
       <scope>provided</scope>
     </dependency>
     <dependency>
-      <groupId>${pom.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>jetspeed-commons</artifactId>
       <scope>provided</scope>
     </dependency>

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-profiler/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-profiler/pom.xml?rev=1052125&r1=1052124&r2=1052125&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-profiler/pom.xml (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-profiler/pom.xml Thu Dec 23 01:20:26 2010
@@ -41,50 +41,50 @@
 
     <!-- Build Dependencies -->
     <dependency>
-      <groupId>${pom.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>jetspeed-api</artifactId>
       <scope>provided</scope>
     </dependency>
     <dependency>
-      <groupId>${pom.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>jetspeed-commons</artifactId>
       <scope>provided</scope>
     </dependency>
     <dependency>
-      <groupId>${pom.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>jetspeed-locator</artifactId>
     </dependency>
     <dependency>
-      <groupId>${pom.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>jetspeed-rdbms</artifactId>
     </dependency>
     <dependency>
-      <groupId>${pom.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>jetspeed-security</artifactId>
     </dependency>
     <dependency>
-      <groupId>${pom.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>jetspeed-serializer</artifactId>
     </dependency>
 
     <!-- Test Dependencies -->
     <dependency>
-      <groupId>${pom.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>jetspeed-capability</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>${pom.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>jetspeed-registry</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>${pom.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>jetspeed-search</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>${pom.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>jetspeed-file-cache</artifactId>
       <scope>test</scope>
     </dependency>
@@ -119,9 +119,9 @@
   <build>
     <plugins>
       <plugin>
-        <groupId>${pom.groupId}</groupId>
+        <groupId>${project.groupId}</groupId>
         <artifactId>jetspeed-unpack-maven-plugin</artifactId>
-        <version>${pom.version}</version>
+        <version>${project.version}</version>
         <executions>
           <execution>
             <id>unpack-test-resources</id>
@@ -157,9 +157,9 @@
         </executions>
         <dependencies>
           <dependency>
-            <groupId>${pom.groupId}</groupId>
+            <groupId>${project.groupId}</groupId>
             <artifactId>jetspeed-portal-resources</artifactId>
-            <version>${pom.version}</version>
+            <version>${project.version}</version>
           </dependency>
         </dependencies>
       </plugin>

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-rdbms/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-rdbms/pom.xml?rev=1052125&r1=1052124&r2=1052125&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-rdbms/pom.xml (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-rdbms/pom.xml Thu Dec 23 01:20:26 2010
@@ -41,19 +41,19 @@
     
     <!-- Build Dependencies -->
     <dependency>
-      <groupId>${pom.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>jetspeed-api</artifactId>
       <scope>provided</scope>
     </dependency>
     <dependency>
-      <groupId>${pom.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>jetspeed-commons</artifactId>
       <scope>provided</scope>
     </dependency>
     <dependency>
-      <groupId>${pom.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>jetspeed-cm</artifactId>
-      <version>${pom.version}</version>
+      <version>${project.version}</version>
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
@@ -119,9 +119,9 @@
   <build>
     <plugins>
       <plugin>
-        <groupId>${pom.groupId}</groupId>
+        <groupId>${project.groupId}</groupId>
         <artifactId>jetspeed-unpack-maven-plugin</artifactId>
-        <version>${pom.version}</version>
+        <version>${project.version}</version>
         <executions>
           <execution>
             <id>unpack-test-resources</id>
@@ -145,9 +145,9 @@
         </executions>
         <dependencies>
           <dependency>
-            <groupId>${pom.groupId}</groupId>
+            <groupId>${project.groupId}</groupId>
             <artifactId>jetspeed-portal-resources</artifactId>
-            <version>${pom.version}</version>
+            <version>${project.version}</version>
           </dependency>
         </dependencies>
       </plugin>

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-registry/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-registry/pom.xml?rev=1052125&r1=1052124&r2=1052125&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-registry/pom.xml (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-registry/pom.xml Thu Dec 23 01:20:26 2010
@@ -41,12 +41,12 @@
 
     <!-- Build Dependencies -->
     <dependency>
-      <groupId>${pom.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>jetspeed-api</artifactId>
       <scope>provided</scope>
     </dependency>
     <dependency>
-      <groupId>${pom.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>jetspeed-commons</artifactId>
       <scope>provided</scope>
     </dependency>
@@ -73,19 +73,19 @@
       <artifactId>geronimo-activation_1.1_spec</artifactId>
     </dependency>
     <dependency>
-      <groupId>${pom.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>jetspeed-rdbms</artifactId>
     </dependency>
     <dependency>
-      <groupId>${pom.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>jetspeed-portlet-factory</artifactId>
     </dependency>
     <dependency>
-      <groupId>${pom.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>jetspeed-search</artifactId>
     </dependency>
     <dependency>
-      <groupId>${pom.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>jetspeed-serializer</artifactId>
     </dependency>
     <dependency>
@@ -95,12 +95,12 @@
 
     <!-- Test Dependencies -->
     <dependency>
-      <groupId>${pom.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>jetspeed-file-cache</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>${pom.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>jetspeed-page-layout</artifactId>
       <scope>test</scope>
     </dependency>
@@ -166,9 +166,9 @@
         </configuration>
       </plugin>
       <plugin>
-        <groupId>${pom.groupId}</groupId>
+        <groupId>${project.groupId}</groupId>
         <artifactId>jetspeed-unpack-maven-plugin</artifactId>
-        <version>${pom.version}</version>
+        <version>${project.version}</version>
         <executions>
           <execution>
             <id>unpack-test-resources</id>
@@ -195,9 +195,9 @@
         </executions>
         <dependencies>
           <dependency>
-            <groupId>${pom.groupId}</groupId>
+            <groupId>${project.groupId}</groupId>
             <artifactId>jetspeed-portal-resources</artifactId>
-            <version>${pom.version}</version>
+            <version>${project.version}</version>
           </dependency>
         </dependencies>
       </plugin>

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-search/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-search/pom.xml?rev=1052125&r1=1052124&r2=1052125&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-search/pom.xml (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-search/pom.xml Thu Dec 23 01:20:26 2010
@@ -41,12 +41,12 @@
 
     <!-- Build Dependencies -->
     <dependency>
-      <groupId>${pom.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>jetspeed-api</artifactId>
       <scope>provided</scope>
     </dependency>
     <dependency>
-      <groupId>${pom.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>jetspeed-commons</artifactId>
       <scope>provided</scope>
     </dependency>
@@ -77,7 +77,7 @@
     
     <!-- Test Dependencies -->
     <dependency>
-      <groupId>${pom.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>jetspeed-cm</artifactId>
       <scope>test</scope>
     </dependency>

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-security/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-security/pom.xml?rev=1052125&r1=1052124&r2=1052125&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-security/pom.xml (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-security/pom.xml Thu Dec 23 01:20:26 2010
@@ -41,21 +41,21 @@
 
     <!-- Build Dependencies -->
     <dependency>
-      <groupId>${pom.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>jetspeed-api</artifactId>
       <scope>provided</scope>
     </dependency>
     <dependency>
-      <groupId>${pom.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>jetspeed-commons</artifactId>
       <scope>provided</scope>
     </dependency>
     <dependency>
-      <groupId>${pom.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>jetspeed-rdbms</artifactId>
     </dependency>
     <dependency>
-      <groupId>${pom.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>jetspeed-serializer</artifactId>
     </dependency>
     <dependency>
@@ -78,7 +78,7 @@
 
     <!-- Test Dependencies -->
     <dependency>
-      <groupId>${pom.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>jetspeed-file-cache</artifactId>
       <scope>test</scope>
     </dependency>
@@ -127,14 +127,6 @@
       <scope>test</scope>
     </dependency>
 
-    <!-- used by Apache DS -->
-    <dependency>
-      <artifactId>slf4j-log4j12</artifactId>
-      <groupId>org.slf4j</groupId>
-      <scope>test</scope>
-    </dependency>
-
-
   </dependencies>
 
   <build>
@@ -151,9 +143,9 @@
         </configuration>
       </plugin>
       <plugin>
-        <groupId>${pom.groupId}</groupId>
+        <groupId>${project.groupId}</groupId>
         <artifactId>jetspeed-unpack-maven-plugin</artifactId>
-        <version>${pom.version}</version>
+        <version>${project.version}</version>
         <executions>
           <execution>
             <id>unpack-test-resources</id>
@@ -184,9 +176,9 @@
         </executions>
         <dependencies>
           <dependency>
-            <groupId>${pom.groupId}</groupId>
+            <groupId>${project.groupId}</groupId>
             <artifactId>jetspeed-portal-resources</artifactId>
-            <version>${pom.version}</version>
+            <version>${project.version}</version>
           </dependency>
         </dependencies>
       </plugin>

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-serializer/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-serializer/pom.xml?rev=1052125&r1=1052124&r2=1052125&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-serializer/pom.xml (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-serializer/pom.xml Thu Dec 23 01:20:26 2010
@@ -41,12 +41,12 @@
 
     <!-- Build Dependencies -->
     <dependency>
-      <groupId>${pom.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>jetspeed-api</artifactId>
       <scope>provided</scope>
     </dependency>
     <dependency>
-      <groupId>${pom.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>jetspeed-commons</artifactId>
       <scope>provided</scope>
     </dependency>
@@ -110,11 +110,11 @@
     <!--
       The following commented out dependencies are necessary to run the TestSerializer unit test. However, since this
       brings in circular dependency references to the build (breaking the build), I have commented out the
-      TestSerializer as well as disabling the test <dependency> <groupId>${pom.groupId}</groupId>
+      TestSerializer as well as disabling the test <dependency> <groupId>${project.groupId}</groupId>
       <artifactId>jetspeed-registry</artifactId> <scope>test</scope> </dependency> <dependency>
-      <groupId>${pom.groupId}</groupId> <artifactId>jetspeed-capability</artifactId> <scope>test</scope> </dependency>
+      <groupId>${project.groupId}</groupId> <artifactId>jetspeed-capability</artifactId> <scope>test</scope> </dependency>
 
-      <dependency> <groupId>${pom.groupId}</groupId> <artifactId>jetspeed-profiler</artifactId> <scope>test</scope>
+      <dependency> <groupId>${project.groupId}</groupId> <artifactId>jetspeed-profiler</artifactId> <scope>test</scope>
       </dependency>
     -->
     <dependency>
@@ -130,7 +130,7 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>${pom.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>jetspeed-cm</artifactId>
     </dependency>
     <dependency>
@@ -153,9 +153,9 @@
         </configuration>
       </plugin>
       <plugin>
-        <groupId>${pom.groupId}</groupId>
+        <groupId>${project.groupId}</groupId>
         <artifactId>jetspeed-unpack-maven-plugin</artifactId>
-        <version>${pom.version}</version>
+        <version>${project.version}</version>
         <executions>
           <execution>
             <id>unpack-test-resources</id>
@@ -191,9 +191,9 @@
         </executions>
         <dependencies>
           <dependency>
-            <groupId>${pom.groupId}</groupId>
+            <groupId>${project.groupId}</groupId>
             <artifactId>jetspeed-portal-resources</artifactId>
-            <version>${pom.version}</version>
+            <version>${project.version}</version>
           </dependency>
         </dependencies>
       </plugin>

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-sso/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-sso/pom.xml?rev=1052125&r1=1052124&r2=1052125&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-sso/pom.xml (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-sso/pom.xml Thu Dec 23 01:20:26 2010
@@ -41,21 +41,21 @@
 
     <!-- Build Dependencies -->
     <dependency>
-      <groupId>${pom.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>jetspeed-api</artifactId>
       <scope>provided</scope>
     </dependency>
     <dependency>
-      <groupId>${pom.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>jetspeed-commons</artifactId>
       <scope>provided</scope>
     </dependency>
     <dependency>
-      <groupId>${pom.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>jetspeed-rdbms</artifactId>
     </dependency>
     <dependency>
-      <groupId>${pom.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>jetspeed-security</artifactId>
     </dependency>
     <dependency>
@@ -70,7 +70,7 @@
 
     <!-- Test Dependencies -->
     <dependency>
-      <groupId>${pom.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>jetspeed-file-cache</artifactId>
       <scope>test</scope>
     </dependency>
@@ -92,18 +92,12 @@
     </dependency>
 
     <dependency>
-      <groupId>tyrex</groupId>
-      <artifactId>tyrex</artifactId>
-      <scope>provided</scope>
-    </dependency>
-
-    <dependency>
       <groupId>commons-io</groupId>
       <artifactId>commons-io</artifactId>
     </dependency>
 
     <dependency>
-      <groupId>${pom.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>jetspeed-cm</artifactId>
       <scope>test</scope>
     </dependency>
@@ -124,9 +118,9 @@
   <build>
     <plugins>
       <plugin>
-        <groupId>${pom.groupId}</groupId>
+        <groupId>${project.groupId}</groupId>
         <artifactId>jetspeed-unpack-maven-plugin</artifactId>
-        <version>${pom.version}</version>
+        <version>${project.version}</version>
         <executions>
           <execution>
             <id>unpack-test-resources</id>
@@ -153,9 +147,9 @@
         </executions>
         <dependencies>
           <dependency>
-            <groupId>${pom.groupId}</groupId>
+            <groupId>${project.groupId}</groupId>
             <artifactId>jetspeed-portal-resources</artifactId>
-            <version>${pom.version}</version>
+            <version>${project.version}</version>
           </dependency>
         </dependencies>
       </plugin>

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-statistics/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-statistics/pom.xml?rev=1052125&r1=1052124&r2=1052125&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-statistics/pom.xml (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-statistics/pom.xml Thu Dec 23 01:20:26 2010
@@ -41,17 +41,17 @@
 
     <!-- Build Dependencies -->
     <dependency>
-      <groupId>${pom.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>jetspeed-api</artifactId>
       <scope>provided</scope>
     </dependency>
     <dependency>
-      <groupId>${pom.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>jetspeed-commons</artifactId>
       <scope>provided</scope>
     </dependency>
     <dependency>
-      <groupId>${pom.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>jetspeed-rdbms</artifactId>
     </dependency>
     <dependency>
@@ -65,12 +65,12 @@
 
     <!-- Test Dependencies -->
     <dependency>
-      <groupId>${pom.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>jetspeed-registry</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>${pom.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>jetspeed-security</artifactId>
       <scope>test</scope>
     </dependency>
@@ -105,9 +105,9 @@
   <build>
     <plugins>
       <plugin>
-        <groupId>${pom.groupId}</groupId>
+        <groupId>${project.groupId}</groupId>
         <artifactId>jetspeed-unpack-maven-plugin</artifactId>
-        <version>${pom.version}</version>
+        <version>${project.version}</version>
         <executions>
           <execution>
             <id>unpack-test-resources</id>
@@ -138,9 +138,9 @@
         </executions>
         <dependencies>
           <dependency>
-            <groupId>${pom.groupId}</groupId>
+            <groupId>${project.groupId}</groupId>
             <artifactId>jetspeed-portal-resources</artifactId>
-            <version>${pom.version}</version>
+            <version>${project.version}</version>
           </dependency>
         </dependencies>
       </plugin>

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-utils/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-utils/pom.xml?rev=1052125&r1=1052124&r2=1052125&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-utils/pom.xml (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-utils/pom.xml Thu Dec 23 01:20:26 2010
@@ -41,7 +41,7 @@
 
         <!-- Build Dependencies -->
         <dependency>
-            <groupId>${pom.groupId}</groupId>
+            <groupId>${project.groupId}</groupId>
             <artifactId>jetspeed-api</artifactId>
             <scope>provided</scope>
         </dependency>

Modified: portals/jetspeed-2/portal/trunk/enterprise/ear-full/build.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/enterprise/ear-full/build.xml?rev=1052125&r1=1052124&r2=1052125&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/enterprise/ear-full/build.xml (original)
+++ portals/jetspeed-2/portal/trunk/enterprise/ear-full/build.xml Thu Dec 23 01:20:26 2010
@@ -29,15 +29,15 @@
 
     <!-- configure jetspeed-demo portal application for Websphere -->
     <mkdir dir="${project.build.directory}/package-skinny-wars/websphere"/>
-    <unzip src="${project.build.directory}/package-skinny-wars/jetspeed-demo-${pom.version}.war" dest="${project.build.directory}/package-skinny-wars/websphere"/>
+    <unzip src="${project.build.directory}/package-skinny-wars/jetspeed-demo-${project.version}.war" dest="${project.build.directory}/package-skinny-wars/websphere"/>
     <!-- configure using conditional tasks -->
     <antcall target="configurePSML" inheritall="true"/>
     <antcall target="configureWEBXML" inheritall="true"/>
     <antcall target="configureDBPM" inheritall="true"/>
     <antcall target="configureAssembly" inheritall="true"/>
     <!-- reassemble jetspeed-demo portal application -->
-    <delete file="${project.build.directory}/package-skinny-wars/jetspeed-demo-${pom.version}.war"/>
-    <zip destfile="${project.build.directory}/package-skinny-wars/jetspeed-demo-${pom.version}.war" basedir="${project.build.directory}/package-skinny-wars/websphere"/>
+    <delete file="${project.build.directory}/package-skinny-wars/jetspeed-demo-${project.version}.war"/>
+    <zip destfile="${project.build.directory}/package-skinny-wars/jetspeed-demo-${project.version}.war" basedir="${project.build.directory}/package-skinny-wars/websphere"/>
     <delete dir="${project.build.directory}/package-skinny-wars/websphere"/>
     
     <!-- 
@@ -46,15 +46,15 @@
          Workaround is extracting the jaxb-api-2.1.jar from the Jetspeed Portal war and move it to the shared jars within the ear.
       -->
     <mkdir dir="${project.build.directory}/package-skinny-wars/tmp"/>
-    <unzip src="${project.build.directory}/package-skinny-wars/jetspeed-demo-${pom.version}.war" dest="${project.build.directory}/package-skinny-wars/lib">
+    <unzip src="${project.build.directory}/package-skinny-wars/jetspeed-demo-${project.version}.war" dest="${project.build.directory}/package-skinny-wars/lib">
       <patternset>
         <include name="WEB-INF/lib/jaxb-api-*.jar"/>
       </patternset>
       <mapper type="flatten"/>
     </unzip>
-    <move file="${project.build.directory}/package-skinny-wars/jetspeed-demo-${pom.version}.war" todir="${project.build.directory}/package-skinny-wars/tmp"/>
-    <zip destfile="${project.build.directory}/package-skinny-wars/jetspeed-demo-${pom.version}.war">
-      <zipfileset src="${project.build.directory}/package-skinny-wars/tmp/jetspeed-demo-${pom.version}.war">
+    <move file="${project.build.directory}/package-skinny-wars/jetspeed-demo-${project.version}.war" todir="${project.build.directory}/package-skinny-wars/tmp"/>
+    <zip destfile="${project.build.directory}/package-skinny-wars/jetspeed-demo-${project.version}.war">
+      <zipfileset src="${project.build.directory}/package-skinny-wars/tmp/jetspeed-demo-${project.version}.war">
         <exclude name="WEB-INF/lib/jaxb-api-*.jar"/>
       </zipfileset>
     </zip>                
@@ -71,12 +71,12 @@
       </path>
     </pathconvert>
     <!-- set skinny wars classpath -->
-    <jar destfile="${project.build.directory}/package-skinny-wars/jetspeed-demo-${pom.version}.war" update="true">
+    <jar destfile="${project.build.directory}/package-skinny-wars/jetspeed-demo-${project.version}.war" update="true">
       <manifest>
         <attribute name="Class-Path" value="${war.manifest.classpath}"/>
       </manifest>
     </jar>
-    <jar destfile="${project.build.directory}/package-skinny-wars/j2-admin-${pom.version}.war" update="true">
+    <jar destfile="${project.build.directory}/package-skinny-wars/j2-admin-${project.version}.war" update="true">
       <manifest>
         <attribute name="Class-Path" value="${war.manifest.classpath}"/>
       </manifest>

Modified: portals/jetspeed-2/portal/trunk/enterprise/ear-full/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/enterprise/ear-full/pom.xml?rev=1052125&r1=1052124&r2=1052125&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/enterprise/ear-full/pom.xml (original)
+++ portals/jetspeed-2/portal/trunk/enterprise/ear-full/pom.xml Thu Dec 23 01:20:26 2010
@@ -70,16 +70,17 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-ear-plugin</artifactId>
+        <version>2.4.2</version>
         <configuration>
           <modules>
             <!-- skinny wars: must be explicitly repackaged in build.xml invoked below -->
             <webModule>
-              <groupId>${pom.groupId}</groupId>
+              <groupId>${project.groupId}</groupId>
               <artifactId>jetspeed-demo</artifactId>
               <contextRoot>/jetspeed</contextRoot>
             </webModule>                                              
             <webModule>
-              <groupId>${pom.groupId}</groupId>
+              <groupId>${project.groupId}</groupId>
               <artifactId>j2-admin</artifactId>
               <contextRoot>/j2-admin</contextRoot>
             </webModule>
@@ -111,12 +112,12 @@
               <bundleDir>/lib</bundleDir>
             </jarModule>
             <jarModule>
-              <groupId>${pom.groupId}</groupId>
+              <groupId>${project.groupId}</groupId>
               <artifactId>jetspeed-api</artifactId>
               <bundleDir>/lib</bundleDir>
             </jarModule>
             <jarModule>
-              <groupId>${pom.groupId}</groupId>
+              <groupId>${project.groupId}</groupId>
               <artifactId>jetspeed-commons</artifactId>
               <bundleDir>/lib</bundleDir>
             </jarModule>
@@ -159,7 +160,7 @@
                   <property name="org.apache.portals.applications.apa-demo.version" value="${org.apache.portals.applications.apa-demo.version}"/>
                   <property name="org.apache.portals.applications.apa-rss.version" value="${org.apache.portals.applications.apa-rss.version}"/>
                   <property name="org.apache.portals.applications.apa-webcontent.version" value="${org.apache.portals.applications.apa-webcontent.version}"/>
-                  <property name="pom.version" value="${pom.version}"/>
+                  <property name="pom.version" value="${project.version}"/>
                   <property name="project.build.directory" value="${project.build.directory}"/>
                   <property name="project.build.finalName" value="${project.build.finalName}"/>
                 </ant>
@@ -172,14 +173,14 @@
         </executions>
         <dependencies>
           <dependency>
-            <groupId>${pom.groupId}</groupId>
+            <groupId>${project.groupId}</groupId>
             <artifactId>jetspeed-api</artifactId>
-            <version>${pom.version}</version>
+            <version>${project.version}</version>
           </dependency>        
           <dependency>
-            <groupId>${pom.groupId}</groupId>
+            <groupId>${project.groupId}</groupId>
             <artifactId>jetspeed-deploy-tools</artifactId>
-            <version>${pom.version}</version>
+            <version>${project.version}</version>
           </dependency>        
           <!-- force ant version for plugin -->
           <dependency>

Modified: portals/jetspeed-2/portal/trunk/enterprise/ear-min/build.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/enterprise/ear-min/build.xml?rev=1052125&r1=1052124&r2=1052125&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/enterprise/ear-min/build.xml (original)
+++ portals/jetspeed-2/portal/trunk/enterprise/ear-min/build.xml Thu Dec 23 01:20:26 2010
@@ -29,7 +29,7 @@
 
     <!-- configure jetspeed-demo portal application for Websphere -->
     <mkdir dir="${project.build.directory}/package-skinny-wars/websphere"/>
-    <unzip src="${project.build.directory}/package-skinny-wars/jetspeed-demo-${pom.version}.war" dest="${project.build.directory}/package-skinny-wars/websphere"/>
+    <unzip src="${project.build.directory}/package-skinny-wars/jetspeed-demo-${project.version}.war" dest="${project.build.directory}/package-skinny-wars/websphere"/>
     <!-- configure using conditional tasks -->
     <antcall target="configureMinPSML" inheritall="true"/>
     <antcall target="configurePSML" inheritall="true"/>
@@ -37,8 +37,8 @@
     <antcall target="configureDBPM" inheritall="true"/>
     <antcall target="configureAssembly" inheritall="true"/>
     <!-- reassemble jetspeed-demo portal application -->
-    <delete file="${project.build.directory}/package-skinny-wars/jetspeed-demo-${pom.version}.war"/>
-    <zip destfile="${project.build.directory}/package-skinny-wars/jetspeed-demo-${pom.version}.war" basedir="${project.build.directory}/package-skinny-wars/websphere"/>
+    <delete file="${project.build.directory}/package-skinny-wars/jetspeed-demo-${project.version}.war"/>
+    <zip destfile="${project.build.directory}/package-skinny-wars/jetspeed-demo-${project.version}.war" basedir="${project.build.directory}/package-skinny-wars/websphere"/>
     <delete dir="${project.build.directory}/package-skinny-wars/websphere"/>
     
     <!-- 
@@ -47,15 +47,15 @@
          Workaround is extracting the jaxb-api-2.1.jar from the Jetspeed Portal war and move it to the shared jars within the ear.
       -->
     <mkdir dir="${project.build.directory}/package-skinny-wars/tmp"/>
-    <unzip src="${project.build.directory}/package-skinny-wars/jetspeed-demo-${pom.version}.war" dest="${project.build.directory}/package-skinny-wars/lib">
+    <unzip src="${project.build.directory}/package-skinny-wars/jetspeed-demo-${project.version}.war" dest="${project.build.directory}/package-skinny-wars/lib">
       <patternset>
         <include name="WEB-INF/lib/jaxb-api-*.jar"/>
       </patternset>
       <mapper type="flatten"/>
     </unzip>
-    <move file="${project.build.directory}/package-skinny-wars/jetspeed-demo-${pom.version}.war" todir="${project.build.directory}/package-skinny-wars/tmp"/>
-    <zip destfile="${project.build.directory}/package-skinny-wars/jetspeed-demo-${pom.version}.war">
-      <zipfileset src="${project.build.directory}/package-skinny-wars/tmp/jetspeed-demo-${pom.version}.war">
+    <move file="${project.build.directory}/package-skinny-wars/jetspeed-demo-${project.version}.war" todir="${project.build.directory}/package-skinny-wars/tmp"/>
+    <zip destfile="${project.build.directory}/package-skinny-wars/jetspeed-demo-${project.version}.war">
+      <zipfileset src="${project.build.directory}/package-skinny-wars/tmp/jetspeed-demo-${project.version}.war">
         <exclude name="WEB-INF/lib/jaxb-api-*.jar"/>
       </zipfileset>
     </zip>                
@@ -72,12 +72,12 @@
       </path>
     </pathconvert>
     <!-- set skinny wars classpath -->
-    <jar destfile="${project.build.directory}/package-skinny-wars/jetspeed-demo-${pom.version}.war" update="true">
+    <jar destfile="${project.build.directory}/package-skinny-wars/jetspeed-demo-${project.version}.war" update="true">
       <manifest>
         <attribute name="Class-Path" value="${war.manifest.classpath}"/>
       </manifest>
     </jar>
-    <jar destfile="${project.build.directory}/package-skinny-wars/j2-admin-${pom.version}.war" update="true">
+    <jar destfile="${project.build.directory}/package-skinny-wars/j2-admin-${project.version}.war" update="true">
       <manifest>
         <attribute name="Class-Path" value="${war.manifest.classpath}"/>
       </manifest>

Modified: portals/jetspeed-2/portal/trunk/enterprise/ear-min/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/enterprise/ear-min/pom.xml?rev=1052125&r1=1052124&r2=1052125&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/enterprise/ear-min/pom.xml (original)
+++ portals/jetspeed-2/portal/trunk/enterprise/ear-min/pom.xml Thu Dec 23 01:20:26 2010
@@ -45,6 +45,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-ear-plugin</artifactId>
+        <version>2.4.2</version>
         <configuration>
           <archive>
             <manifest>
@@ -54,12 +55,12 @@
           <modules>
             <!-- skinny wars: must be explicitly repackaged in build.xml invoked below -->
             <webModule>
-              <groupId>${pom.groupId}</groupId>
+              <groupId>${project.groupId}</groupId>
               <artifactId>jetspeed-demo</artifactId>
               <contextRoot>/jetspeed</contextRoot>
             </webModule>                       
             <webModule>
-              <groupId>${pom.groupId}</groupId>
+              <groupId>${project.groupId}</groupId>
               <artifactId>j2-admin</artifactId>
               <contextRoot>/j2-admin</contextRoot>
             </webModule>
@@ -71,12 +72,12 @@
               <bundleDir>/lib</bundleDir>
             </jarModule>
             <jarModule>
-              <groupId>${pom.groupId}</groupId>
+              <groupId>${project.groupId}</groupId>
               <artifactId>jetspeed-api</artifactId>
               <bundleDir>/lib</bundleDir>
             </jarModule>
             <jarModule>
-              <groupId>${pom.groupId}</groupId>
+              <groupId>${project.groupId}</groupId>
               <artifactId>jetspeed-commons</artifactId>
               <bundleDir>/lib</bundleDir>
             </jarModule>
@@ -115,7 +116,7 @@
                 <ant target="ear-min-package" dir="${basedir}" inheritAll="true">
                   <property name="basedir" value="${basedir}"/>
                   <property name="configureDBPM" value="${configureDBPM}"/>
-                  <property name="pom.version" value="${pom.version}"/>
+                  <property name="pom.version" value="${project.version}"/>
                   <property name="project.build.directory" value="${project.build.directory}"/>
                   <property name="project.build.finalName" value="${project.build.finalName}"/>
                 </ant>

Modified: portals/jetspeed-2/portal/trunk/enterprise/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/enterprise/pom.xml?rev=1052125&r1=1052124&r2=1052125&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/enterprise/pom.xml (original)
+++ portals/jetspeed-2/portal/trunk/enterprise/pom.xml Thu Dec 23 01:20:26 2010
@@ -52,12 +52,12 @@
 
   <dependencies>
     <dependency>
-      <groupId>${pom.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>jetspeed-demo</artifactId>
       <type>war</type>
     </dependency>
     <dependency>
-      <groupId>${pom.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>j2-admin</artifactId>
       <type>war</type>
     </dependency>
@@ -67,11 +67,11 @@
       <artifactId>ccpp</artifactId>
     </dependency>
     <dependency>
-      <groupId>${pom.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>jetspeed-api</artifactId>
     </dependency>
     <dependency>
-      <groupId>${pom.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>jetspeed-commons</artifactId>
     </dependency>
     <dependency>

Modified: portals/jetspeed-2/portal/trunk/jetspeed-archetype/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-archetype/pom.xml?rev=1052125&r1=1052124&r2=1052125&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-archetype/pom.xml (original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-archetype/pom.xml Thu Dec 23 01:20:26 2010
@@ -34,14 +34,14 @@
 
   <dependencies>
     <dependency>
-      <groupId>${pom.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>jetspeed-portal-resources</artifactId>
-      <version>${pom.version}</version>
+      <version>${project.version}</version>
     </dependency>
     <dependency>
-      <groupId>${pom.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>jetspeed</artifactId>
-      <version>${pom.version}</version>
+      <version>${project.version}</version>
       <type>war</type>
     </dependency>
   </dependencies>
@@ -62,9 +62,9 @@
       </plugin>
 
       <plugin>
-        <groupId>${pom.groupId}</groupId>
+        <groupId>${project.groupId}</groupId>
         <artifactId>jetspeed-unpack-maven-plugin</artifactId>
-        <version>${pom.version}</version>
+        <version>${project.version}</version>
         <executions>
           <execution>
             <id>unpack-archetype-seed-resources</id>
@@ -74,7 +74,7 @@
             <phase>generate-resources</phase>
             <configuration>
               <unpack>
-                <artifact>${pom.groupId}:jetspeed-portal-resources:jar</artifact>
+                <artifact>${project.groupId}:jetspeed-portal-resources:jar</artifact>
                 <targetDirectory>${project.build.outputDirectory}</targetDirectory>
                 <resources>
                   <resource>
@@ -95,17 +95,17 @@
         </executions>
         <dependencies>
           <dependency>
-            <groupId>${pom.groupId}</groupId>
+            <groupId>${project.groupId}</groupId>
             <artifactId>jetspeed-portal-resources</artifactId>
-            <version>${pom.version}</version>
+            <version>${project.version}</version>
           </dependency>
         </dependencies>
       </plugin>
 
       <plugin>
-        <groupId>${pom.groupId}</groupId>
+        <groupId>${project.groupId}</groupId>
         <artifactId>jetspeed-unpack-war-maven-plugin</artifactId>
-        <version>${pom.version}</version>
+        <version>${project.version}</version>
         <executions>
           <execution>
             <id>unpack-archetype-page-resources</id>
@@ -115,7 +115,7 @@
             <phase>generate-resources</phase>
             <configuration>
               <unpack>
-                <artifact>${pom.groupId}:jetspeed:war</artifact>
+                <artifact>${project.groupId}:jetspeed:war</artifact>
                 <targetDirectory>${project.build.outputDirectory}</targetDirectory>
                 <resources>
                   <resource>
@@ -131,9 +131,9 @@
         </executions>
         <dependencies>
           <dependency>
-            <groupId>${pom.groupId}</groupId>
+            <groupId>${project.groupId}</groupId>
             <artifactId>jetspeed</artifactId>
-            <version>${pom.version}</version>
+            <version>${project.version}</version>
             <type>war</type>
           </dependency>
         </dependencies>

Modified: portals/jetspeed-2/portal/trunk/jetspeed-commons/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-commons/pom.xml?rev=1052125&r1=1052124&r2=1052125&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-commons/pom.xml (original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-commons/pom.xml Thu Dec 23 01:20:26 2010
@@ -41,7 +41,7 @@
         
         <!-- Build Dependencies -->
         <dependency>
-            <groupId>${pom.groupId}</groupId>
+            <groupId>${project.groupId}</groupId>
             <artifactId>jetspeed-api</artifactId>
             <scope>provided</scope>
         </dependency>

Modified: portals/jetspeed-2/portal/trunk/jetspeed-installer/jetspeed-mvn-ant-installer-pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-installer/jetspeed-mvn-ant-installer-pom.xml?rev=1052125&r1=1052124&r2=1052125&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-installer/jetspeed-mvn-ant-installer-pom.xml (original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-installer/jetspeed-mvn-ant-installer-pom.xml Thu Dec 23 01:20:26 2010
@@ -41,7 +41,7 @@
     <dependency>
       <groupId>org.apache.portals.jetspeed-2</groupId>
       <artifactId>jetspeed-ant-tasks</artifactId>
-      <version>${pom.version}</version>
+      <version>${project.version}</version>
       <type>jar</type>
     </dependency>
   </dependencies>

Modified: portals/jetspeed-2/portal/trunk/jetspeed-installer/jetspeed-mvn-database-pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-installer/jetspeed-mvn-database-pom.xml?rev=1052125&r1=1052124&r2=1052125&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-installer/jetspeed-mvn-database-pom.xml (original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-installer/jetspeed-mvn-database-pom.xml Thu Dec 23 01:20:26 2010
@@ -38,7 +38,7 @@
   <packaging>pom</packaging>
 
   <properties>
-    <org.apache.portals.jetspeed.version>${pom.version}</org.apache.portals.jetspeed.version>
+    <org.apache.portals.jetspeed.version>${project.version}</org.apache.portals.jetspeed.version>
     <org.apache.jetspeed.portal.context.name>jetspeed</org.apache.jetspeed.portal.context.name>
   </properties>
 
@@ -91,15 +91,15 @@
           <artifactId>pluto-container-api</artifactId>
         </exclusion>
         <exclusion>
-          <groupId>${pom.groupId}</groupId>
+          <groupId>${project.groupId}</groupId>
           <artifactId>jetspeed-api</artifactId>
         </exclusion>
         <exclusion>
-          <groupId>${pom.groupId}</groupId>
+          <groupId>${project.groupId}</groupId>
           <artifactId>jetspeed-commons</artifactId>
         </exclusion>
         <exclusion>
-          <groupId>${pom.groupId}</groupId>
+          <groupId>${project.groupId}</groupId>
           <artifactId>jetspeed-cm</artifactId>
         </exclusion>
         <exclusion>
@@ -229,7 +229,7 @@
                   </resource>
                   <resource>
                     <path>seed</path>
-                    <destination>database/resources</destination>
+                    <destination>database/resources/seed</destination>
                   </resource>
                   <resource>
                     <path>ddl</path>

Modified: portals/jetspeed-2/portal/trunk/jetspeed-installer/jetspeed-mvn-tomcat-portal-pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-installer/jetspeed-mvn-tomcat-portal-pom.xml?rev=1052125&r1=1052124&r2=1052125&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-installer/jetspeed-mvn-tomcat-portal-pom.xml (original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-installer/jetspeed-mvn-tomcat-portal-pom.xml Thu Dec 23 01:20:26 2010
@@ -41,7 +41,7 @@
     <tomcat.version.major>6</tomcat.version.major>
     <tomcat.version.minor>6.0.18</tomcat.version.minor>
     <tomcat.name>apache-tomcat-${tomcat.version.minor}</tomcat.name>
-    <org.apache.portals.jetspeed.version>${pom.version}</org.apache.portals.jetspeed.version>
+    <org.apache.portals.jetspeed.version>${project.version}</org.apache.portals.jetspeed.version>
     <org.apache.jetspeed.portal.context.name>jetspeed</org.apache.jetspeed.portal.context.name>
     <org.apache.jetspeed.portal.home>${project.build.directory}/${tomcat.name}</org.apache.jetspeed.portal.home>
   </properties>
@@ -287,7 +287,7 @@
               <dependency>
                 <groupId>org.apache.portals.jetspeed-2</groupId>
                 <artifactId>jetspeed-demo</artifactId>
-                <version>${pom.version}</version>
+                <version>${project.version}</version>
                 <type>war</type>
               </dependency>
               <!-- j2-admin portal applications -->

Modified: portals/jetspeed-2/portal/trunk/jetspeed-installer/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-installer/pom.xml?rev=1052125&r1=1052124&r2=1052125&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-installer/pom.xml (original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-installer/pom.xml Thu Dec 23 01:20:26 2010
@@ -40,7 +40,7 @@
       <plugin>
         <groupId>org.apache.portals.jetspeed-2</groupId>
         <artifactId>jetspeed-mvn-maven-plugin</artifactId>
-        <version>${pom.version}</version>
+        <version>${project.version}</version>
         <configuration>
           <targets combine.children="append">
             <target>

Modified: portals/jetspeed-2/portal/trunk/jetspeed-mvn-db-init-pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-mvn-db-init-pom.xml?rev=1052125&r1=1052124&r2=1052125&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-mvn-db-init-pom.xml (original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-mvn-db-init-pom.xml Thu Dec 23 01:20:26 2010
@@ -40,9 +40,9 @@
 
     <plugins>
       <plugin>
-        <groupId>${pom.groupId}</groupId>
+        <groupId>${project.groupId}</groupId>
         <artifactId>jetspeed-db-maven-plugin</artifactId>
-        <version>${pom.version}</version>
+        <version>${project.version}</version>
         <configuration>
           <connection>
             <username>${org.apache.jetspeed.@database.type@.database.user}</username>
@@ -96,7 +96,7 @@
           <dependency>
             <groupId>${groupId}</groupId>
             <artifactId>jetspeed-portal-resources</artifactId>
-            <version>${pom.version}</version>
+            <version>${project.version}</version>
           </dependency>
           <dependency>
             <groupId>${org.apache.jetspeed.@database.type@.jdbc.driver.groupId}</groupId>

Modified: portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/pom.xml?rev=1052125&r1=1052124&r2=1052125&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/pom.xml (original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/pom.xml Thu Dec 23 01:20:26 2010
@@ -38,9 +38,9 @@
   <build>
     <plugins>
       <plugin>
-        <groupId>${pom.groupId}</groupId>
+        <groupId>${project.groupId}</groupId>
         <artifactId>jetspeed-db-maven-plugin</artifactId>
-        <version>${pom.version}</version>        
+        <version>${project.version}</version>        
         <executions>
           <execution>
             <phase>process-resources</phase>

Modified: portals/jetspeed-2/portal/trunk/maven/jetspeed-db-maven-plugin/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/maven/jetspeed-db-maven-plugin/pom.xml?rev=1052125&r1=1052124&r2=1052125&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/maven/jetspeed-db-maven-plugin/pom.xml (original)
+++ portals/jetspeed-2/portal/trunk/maven/jetspeed-db-maven-plugin/pom.xml Thu Dec 23 01:20:26 2010
@@ -36,11 +36,11 @@
   <packaging>maven-plugin</packaging>
   <dependencies>
     <dependency>
-      <groupId>${pom.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>jetspeed-api</artifactId>
     </dependency>
     <dependency>
-      <groupId>${pom.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>jetspeed-maven-utils</artifactId>
     </dependency>
     <dependency>



---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org
For additional commands, e-mail: jetspeed-dev-help@portals.apache.org


Mime
View raw message