You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@oodt.apache.org by ma...@apache.org on 2015/09/25 15:35:51 UTC

svn commit: r1705302 [4/4] - in /oodt/branches/dependency-update: ./ app/fmbrowser/ app/weditor/ catalog/ cli/ commons/ core/ crawler/ curator/services/ curator/webapp/ filemgr/ grid/ metadata/ mvn/archetypes/ mvn/archetypes/opsui/ mvn/archetypes/radix...

Modified: oodt/branches/dependency-update/webapp/fmprod/pom.xml
URL: http://svn.apache.org/viewvc/oodt/branches/dependency-update/webapp/fmprod/pom.xml?rev=1705302&r1=1705301&r2=1705302&view=diff
==============================================================================
--- oodt/branches/dependency-update/webapp/fmprod/pom.xml (original)
+++ oodt/branches/dependency-update/webapp/fmprod/pom.xml Fri Sep 25 13:35:50 2015
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
   Licensed to the Apache Software Foundation (ASF) under one or more contributor
   license agreements.  See the NOTICE.txt file distributed with this work for
@@ -26,68 +26,54 @@
   <artifactId>cas-product</artifactId>
   <packaging>war</packaging>
   <name>CAS Product Server Web Application</name>
-  <description>
-    This project builds on top of the CAS file management component and exposes
+  <description>This project builds on top of the CAS file management component and exposes
     its underlying data delivery capabilities using the OODT ProductServer
     component. All-in-all, this project contributes an OODT LargeProductHandler
     component, that can be used to deliver and format a CAS product structure
-    into an OODT XML Query Result Set.
-  </description>
-  <build>
-    <testSourceDirectory>${basedir}/src/test/java</testSourceDirectory>
-    <plugins>
+    into an OODT XML Query Result Set.</description>
+  <dependencies>
+    <dependency>
+      <groupId>javax.servlet</groupId>
+      <artifactId>servlet-api</artifactId>
+      <version>2.4</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>4.11</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
       <!--
-        For plugins by Maven we don't need to specify a groupId because the
-        groupId org.apache.maven.plugins is assumed by default.
+        Zip4j is released under the Apache License, Version 2.0
+        For reference, see: http://www.lingala.net/zip4j/about.php
       -->
-      <plugin>
-        <artifactId>maven-war-plugin</artifactId>
-        <version>2.4</version>
-        <configuration>
-          <webResources>
-            <resource>
-              <!-- this is relative to the pom.xml directory -->
-              <directory>.</directory>
-              <includes>
-                <include>LICENSE.txt</include>
-                <include>CHANGES.txt</include>
-              </includes>
-              <targetPath>META-INF/</targetPath>
-            </resource>
-          </webResources>
-        </configuration>
-      </plugin>
-      <plugin>
-        <artifactId>maven-assembly-plugin</artifactId>
-        <configuration>
-          <descriptorRefs>
-            <descriptorRef>
-              jar-with-dependencies
-            </descriptorRef>
-          </descriptorRefs>
-        </configuration>
-      </plugin>
-      <plugin>
-        <artifactId>maven-surefire-plugin</artifactId>
-        <configuration>
-          <systemProperties>
-            <property>
-              <name>java.util.logging.config.file</name>
-              <value>
-                ${basedir}/src/test/resources/test.logging.properties
-              </value>
-            </property>
-          </systemProperties>
-          <excludes>
-            <exclude>
-             org/apache/oodt/cas/product/service/resources/ResourceTestBase.java
-            </exclude>
-          </excludes>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-  <dependencies>
+      <groupId>net.lingala.zip4j</groupId>
+      <artifactId>zip4j</artifactId>
+      <version>1.3.1</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.cxf</groupId>
+      <artifactId>cxf-rt-frontend-jaxrs</artifactId>
+      <version>2.6.8</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.cxf</groupId>
+      <artifactId>cxf-rt-rs-extension-providers</artifactId>
+      <version>2.6.8</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.cxf</groupId>
+      <artifactId>cxf-rt-transports-local</artifactId>
+      <version>2.6.8</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.httpcomponents</groupId>
+      <artifactId>httpclient</artifactId>
+      <version>4.2.5</version>
+    </dependency>
     <dependency>
       <groupId>org.apache.oodt</groupId>
       <artifactId>cas-filemgr</artifactId>
@@ -118,28 +104,13 @@
       <scope>compile</scope>
     </dependency>
     <dependency>
-      <groupId>org.apache.httpcomponents</groupId>
-      <artifactId>httpclient</artifactId>
-      <version>4.2.5</version>
-    </dependency>
-    <dependency>
       <groupId>org.apache.tika</groupId>
       <artifactId>tika-core</artifactId>
     </dependency>
     <dependency>
-      <groupId>javax.servlet</groupId>
-      <artifactId>servlet-api</artifactId>
-      <version>2.4</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <!--
-        Zip4j is released under the Apache License, Version 2.0
-        For reference, see: http://www.lingala.net/zip4j/about.php
-      -->
-      <groupId>net.lingala.zip4j</groupId>
-      <artifactId>zip4j</artifactId>
-      <version>1.3.1</version>
+      <groupId>org.apache.velocity</groupId>
+      <artifactId>velocity</artifactId>
+      <version>1.7</version>
     </dependency>
     <dependency>
       <groupId>org.codehaus.jettison</groupId>
@@ -147,43 +118,64 @@
       <version>1.3.4</version>
     </dependency>
     <dependency>
-      <groupId>org.apache.cxf</groupId>
-      <artifactId>cxf-rt-rs-extension-providers</artifactId>
-      <version>2.6.8</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.cxf</groupId>
-      <artifactId>cxf-rt-frontend-jaxrs</artifactId>
-      <version>2.6.8</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.cxf</groupId>
-      <artifactId>cxf-rt-transports-local</artifactId>
-      <version>2.6.8</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
       <groupId>org.easymock</groupId>
       <artifactId>easymock</artifactId>
       <version>3.1</version>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>4.11</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
       <groupId>xmlunit</groupId>
       <artifactId>xmlunit</artifactId>
       <version>1.4</version>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>org.apache.velocity</groupId>
-      <artifactId>velocity</artifactId>
-      <version>1.7</version>
-    </dependency>
   </dependencies>
+  <build>
+    <testSourceDirectory>${basedir}/src/test/java</testSourceDirectory>
+    <plugins>
+      <!--
+        For plugins by Maven we don't need to specify a groupId because the
+        groupId org.apache.maven.plugins is assumed by default.
+      -->
+      <plugin>
+        <artifactId>maven-war-plugin</artifactId>
+        <version>2.4</version>
+        <configuration>
+          <webResources>
+            <resource>
+              <!-- this is relative to the pom.xml directory -->
+              <directory>.</directory>
+              <includes>
+                <include>LICENSE.txt</include>
+                <include>CHANGES.txt</include>
+              </includes>
+              <targetPath>META-INF/</targetPath>
+            </resource>
+          </webResources>
+        </configuration>
+      </plugin>
+      <plugin>
+        <artifactId>maven-assembly-plugin</artifactId>
+        <configuration>
+          <descriptorRefs>
+            <descriptorRef>jar-with-dependencies</descriptorRef>
+          </descriptorRefs>
+        </configuration>
+      </plugin>
+      <plugin>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <configuration>
+          <systemProperties>
+            <property>
+              <name>java.util.logging.config.file</name>
+              <value>${basedir}/src/test/resources/test.logging.properties</value>
+            </property>
+          </systemProperties>
+          <excludes>
+            <exclude>org/apache/oodt/cas/product/service/resources/ResourceTestBase.java</exclude>
+          </excludes>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
 </project>

Modified: oodt/branches/dependency-update/webapp/wmonitor/pom.xml
URL: http://svn.apache.org/viewvc/oodt/branches/dependency-update/webapp/wmonitor/pom.xml?rev=1705302&r1=1705301&r2=1705302&view=diff
==============================================================================
--- oodt/branches/dependency-update/webapp/wmonitor/pom.xml (original)
+++ oodt/branches/dependency-update/webapp/wmonitor/pom.xml Fri Sep 25 13:35:50 2015
@@ -16,129 +16,129 @@ License for the specific language govern
 the License.
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-	
-	<modelVersion>4.0.0</modelVersion>
-	<parent>
-                <groupId>org.apache.oodt</groupId>
-                <artifactId>oodt-core</artifactId>
-                <version>0.11-SNAPSHOT</version>
-                <relativePath>../../core/pom.xml</relativePath>
-        </parent>
-        <groupId>org.apache.oodt</groupId>
-	<artifactId>wmonitor</artifactId>
-	<packaging>war</packaging>
-	<version>0.11-SNAPSHOT</version>
-	<name>CAS Workflow Manager Monitor Web App</name>
-	<properties>
-		<wicket.version>1.4.17</wicket.version>
-		<jetty.version>6.1.25</jetty.version>
-		<slf4j.version>1.5.8</slf4j.version>
-		<log4j.version>1.2.14</log4j.version>
-	</properties>
-	<scm>
-   		<connection>scm:svn:https://svn.apache.org/repos/asf/oodt/trunk/webapp/wmonitor</connection>
-   		<developerConnection>scm:svn:https://svn.apache.org/repos/asf/oodt/trunk/webapp/wmonitor</developerConnection>
-   		<url>http://svn.apache.org/viewvc/oodt/trunk/webapp/wmonitor</url>
-  	</scm>
-	<dependencies>
-		<dependency>
-			<groupId>org.apache.wicket</groupId>
-			<artifactId>wicket</artifactId>
-			<version>${wicket.version}</version>
-		</dependency>
-		<dependency>
-		  <groupId>org.apache.oodt</groupId>
-		  <artifactId>oodt-webapp-components</artifactId>
-		  <version>0.11-SNAPSHOT</version>
-		  <exclusions>
-		    <exclusion>
-		      <artifactId>cas-filemgr</artifactId>
-		      <groupId>org.apache.oodt</groupId>
-		    </exclusion>
-		  </exclusions>
-		</dependency>
 
-		<!-- LOGGING DEPENDENCIES - LOG4J -->
-		<dependency>
-			<groupId>org.slf4j</groupId>
-			<artifactId>slf4j-log4j12</artifactId>
-			<version>${slf4j.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>log4j</groupId>
-			<artifactId>log4j</artifactId>
-			<version>1.2.14</version>
-		</dependency>
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.apache.oodt</groupId>
+    <artifactId>oodt-core</artifactId>
+    <version>0.11-SNAPSHOT</version>
+    <relativePath>../../core/pom.xml</relativePath>
+  </parent>
+  <groupId>org.apache.oodt</groupId>
+  <artifactId>wmonitor</artifactId>
+  <version>0.11-SNAPSHOT</version>
+  <packaging>war</packaging>
+  <name>CAS Workflow Manager Monitor Web App</name>
+  <properties>
+    <wicket.version>1.4.17</wicket.version>
+    <jetty.version>6.1.25</jetty.version>
+    <slf4j.version>1.5.8</slf4j.version>
+    <log4j.version>1.2.14</log4j.version>
+  </properties>
+  <dependencies>
 
-		<!--  JUNIT DEPENDENCY FOR TESTING -->
-		<dependency>
-			<groupId>junit</groupId>
-			<artifactId>junit</artifactId>
-			<version>4.8.1</version>
-			<scope>test</scope>
-		</dependency>
+    <!--  JUNIT DEPENDENCY FOR TESTING -->
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>4.8.1</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>log4j</groupId>
+      <artifactId>log4j</artifactId>
+      <version>1.2.14</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.oodt</groupId>
+      <artifactId>oodt-webapp-components</artifactId>
+      <version>0.11-SNAPSHOT</version>
+      <exclusions>
+        <exclusion>
+          <groupId>org.apache.oodt</groupId>
+          <artifactId>cas-filemgr</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.wicket</groupId>
+      <artifactId>wicket</artifactId>
+      <version>${wicket.version}</version>
+    </dependency>
 
-		<!--  JETTY DEPENDENCIES FOR TESTING  -->
-		<dependency>
-			<groupId>org.mortbay.jetty</groupId>
-			<artifactId>jetty</artifactId>
-			<version>${jetty.version}</version>
-			<scope>provided</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.mortbay.jetty</groupId>
-			<artifactId>jetty-util</artifactId>
-			<version>${jetty.version}</version>
-			<scope>provided</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.mortbay.jetty</groupId>
-			<artifactId>jetty-management</artifactId>
-			<version>${jetty.version}</version>
-			<scope>provided</scope>
-		</dependency>
-	</dependencies>
-	<build>
-		<resources>
-			<resource>
-				<filtering>false</filtering>
-				<directory>src/main/resources</directory>
-			</resource>
-			<resource>
-				<filtering>false</filtering>
-				<directory>src/main/java</directory>
-				<includes>
-					<include>**</include>
-				</includes>
-				<excludes>
-					<exclude>**/*.java</exclude>
-				</excludes>
-			</resource>
-		</resources>
-		<testResources>
-			<testResource>
-				<filtering>false</filtering>
-				<directory>src/test/java</directory>
-				<includes>
-					<include>**</include>
-				</includes>
-				<excludes>
-					<exclude>**/*.java</exclude>
-				</excludes>
-			</testResource>
-		</testResources>
-		<plugins>
-			<plugin>
-				<inherited>true</inherited>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-compiler-plugin</artifactId>
-				<configuration>
-					<source>1.5</source>
-					<target>1.5</target>
-					<optimize>true</optimize>
-					<debug>true</debug>
-				</configuration>
-			</plugin>
-		</plugins>
-	</build>
-	</project>
+    <!--  JETTY DEPENDENCIES FOR TESTING  -->
+    <dependency>
+      <groupId>org.mortbay.jetty</groupId>
+      <artifactId>jetty</artifactId>
+      <version>${jetty.version}</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.mortbay.jetty</groupId>
+      <artifactId>jetty-management</artifactId>
+      <version>${jetty.version}</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.mortbay.jetty</groupId>
+      <artifactId>jetty-util</artifactId>
+      <version>${jetty.version}</version>
+      <scope>provided</scope>
+    </dependency>
+
+    <!-- LOGGING DEPENDENCIES - LOG4J -->
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-log4j12</artifactId>
+      <version>${slf4j.version}</version>
+    </dependency>
+  </dependencies>
+  <build>
+    <resources>
+      <resource>
+        <filtering>false</filtering>
+        <directory>src/main/resources</directory>
+      </resource>
+      <resource>
+        <filtering>false</filtering>
+        <directory>src/main/java</directory>
+        <includes>
+          <include>**</include>
+        </includes>
+        <excludes>
+          <exclude>**/*.java</exclude>
+        </excludes>
+      </resource>
+    </resources>
+    <testResources>
+      <testResource>
+        <filtering>false</filtering>
+        <directory>src/test/java</directory>
+        <includes>
+          <include>**</include>
+        </includes>
+        <excludes>
+          <exclude>**/*.java</exclude>
+        </excludes>
+      </testResource>
+    </testResources>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <inherited>true</inherited>
+        <configuration>
+          <source>1.5</source>
+          <target>1.5</target>
+          <optimize>true</optimize>
+          <debug>true</debug>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+  <scm>
+    <connection>scm:svn:https://svn.apache.org/repos/asf/oodt/trunk/webapp/wmonitor</connection>
+    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/oodt/trunk/webapp/wmonitor</developerConnection>
+    <url>http://svn.apache.org/viewvc/oodt/trunk/webapp/wmonitor</url>
+  </scm>
+</project>

Modified: oodt/branches/dependency-update/workflow/pom.xml
URL: http://svn.apache.org/viewvc/oodt/branches/dependency-update/workflow/pom.xml?rev=1705302&r1=1705301&r2=1705302&view=diff
==============================================================================
--- oodt/branches/dependency-update/workflow/pom.xml (original)
+++ oodt/branches/dependency-update/workflow/pom.xml Fri Sep 25 13:35:50 2015
@@ -16,7 +16,7 @@ License for the specific language govern
 the License.
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-  
+
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.apache.oodt</groupId>
@@ -31,6 +31,114 @@ the License.
      provides some out of the box backend implementations of them (including one based
      on the javax.sql.DataSource interface). This component provides everything that you need
      to execute workflows, and science processing pipelines.</description>
+  <dependencies>
+    <dependency>
+      <groupId>commons-codec</groupId>
+      <artifactId>commons-codec</artifactId>
+      <version>1.3</version>
+    </dependency>
+    <dependency>
+      <groupId>commons-collections</groupId>
+      <artifactId>commons-collections</artifactId>
+      <version>2.1</version>
+    </dependency>
+    <dependency>
+      <groupId>commons-dbcp</groupId>
+      <artifactId>commons-dbcp</artifactId>
+      <version>1.2.1</version>
+    </dependency>
+    <dependency>
+      <groupId>commons-httpclient</groupId>
+      <artifactId>commons-httpclient</artifactId>
+      <version>3.0</version>
+    </dependency>
+    <dependency>
+      <groupId>commons-io</groupId>
+      <artifactId>commons-io</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>commons-lang</groupId>
+      <artifactId>commons-lang</artifactId>
+      <version>2.4</version>
+    </dependency>
+    <dependency>
+      <groupId>commons-logging</groupId>
+      <artifactId>commons-logging</artifactId>
+      <version>1.0.3</version>
+    </dependency>
+    <dependency>
+      <groupId>commons-pool</groupId>
+      <artifactId>commons-pool</artifactId>
+      <version>1.2</version>
+    </dependency>
+    <dependency>
+      <groupId>concurrent</groupId>
+      <artifactId>concurrent</artifactId>
+      <version>1.3.4</version>
+    </dependency>
+    <dependency>
+      <groupId>hsqldb</groupId>
+      <artifactId>hsqldb</artifactId>
+      <version>1.8.0.7</version>
+    </dependency>
+    <dependency>
+      <groupId>joda-time</groupId>
+      <artifactId>joda-time</artifactId>
+      <version>2.5</version>
+    </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>3.8.2</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.geronimo.javamail</groupId>
+      <artifactId>geronimo-javamail_1.4_mail</artifactId>
+      <version>1.8.1</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.geronimo.specs</groupId>
+      <artifactId>geronimo-activation_1.1_spec</artifactId>
+      <version>1.1</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.lucene</groupId>
+      <artifactId>lucene-core</artifactId>
+      <version>2.0.0</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.oodt</groupId>
+      <artifactId>cas-cli</artifactId>
+      <version>${project.parent.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.oodt</groupId>
+      <artifactId>cas-metadata</artifactId>
+      <version>${project.parent.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.oodt</groupId>
+      <artifactId>cas-resource</artifactId>
+      <version>${project.parent.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.oodt</groupId>
+      <artifactId>oodt-commons</artifactId>
+      <version>${project.parent.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.safehaus.jug</groupId>
+      <artifactId>jug</artifactId>
+      <version>2.0.0</version>
+      <classifier>asl</classifier>
+    </dependency>
+    <dependency>
+      <groupId>xmlrpc</groupId>
+      <artifactId>xmlrpc</artifactId>
+      <version>2.0.1</version>
+    </dependency>
+  </dependencies>
   <build>
     <plugins>
       <plugin>
@@ -40,16 +148,16 @@ the License.
           <forkMode>pertest</forkMode>
           <useSystemClassLoader>false</useSystemClassLoader>
           <systemProperties>
-             <property>
-               <name>java.util.logging.config.file</name>
-               <value>${basedir}/src/test/resources/test.logging.properties</value>
-              </property>
-           </systemProperties>
-           <forkedProcessTimeoutInSeconds>0</forkedProcessTimeoutInSeconds>
-           <redirectTestOutputToFile>true</redirectTestOutputToFile>
-            <includes>
-              <include>**/*Test*.java</include>
-            </includes>
+            <property>
+              <name>java.util.logging.config.file</name>
+              <value>${basedir}/src/test/resources/test.logging.properties</value>
+            </property>
+          </systemProperties>
+          <forkedProcessTimeoutInSeconds>0</forkedProcessTimeoutInSeconds>
+          <redirectTestOutputToFile>true</redirectTestOutputToFile>
+          <includes>
+            <include>**/*Test*.java</include>
+          </includes>
         </configuration>
       </plugin>
       <plugin>
@@ -68,13 +176,13 @@ the License.
         </configuration>
         <executions>
           <execution>
-            <phase>package</phase>
             <goals>
               <goal>single</goal>
             </goals>
+            <phase>package</phase>
           </execution>
         </executions>
-      </plugin> 
+      </plugin>
     </plugins>
   </build>
   <profiles>
@@ -95,10 +203,10 @@ the License.
             </configuration>
             <executions>
               <execution>
-                <phase>verify</phase>
                 <goals>
                   <goal>check</goal>
                 </goals>
+                <phase>verify</phase>
               </execution>
             </executions>
           </plugin>
@@ -106,112 +214,4 @@ the License.
       </build>
     </profile>
   </profiles>
-  <dependencies>
-    <dependency>
-      <groupId>org.apache.oodt</groupId>
-      <artifactId>oodt-commons</artifactId>
-      <version>${project.parent.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.oodt</groupId>
-      <artifactId>cas-cli</artifactId>
-      <version>${project.parent.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.oodt</groupId>
-      <artifactId>cas-metadata</artifactId>
-      <version>${project.parent.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.oodt</groupId>
-      <artifactId>cas-resource</artifactId>
-      <version>${project.parent.version}</version>
-    </dependency>
-    <dependency>
-        <groupId>concurrent</groupId>
-        <artifactId>concurrent</artifactId>
-        <version>1.3.4</version>
-    </dependency>
-    <dependency>
-      <groupId>commons-lang</groupId>
-      <artifactId>commons-lang</artifactId>
-      <version>2.4</version>
-    </dependency>
-    <dependency>
-      <groupId>commons-dbcp</groupId>
-      <artifactId>commons-dbcp</artifactId>
-      <version>1.2.1</version>
-    </dependency>
-    <dependency>
-      <groupId>commons-collections</groupId>
-      <artifactId>commons-collections</artifactId>
-      <version>2.1</version>
-    </dependency>
-    <dependency>
-      <groupId>commons-httpclient</groupId>
-      <artifactId>commons-httpclient</artifactId>
-      <version>3.0</version>
-    </dependency>
-    <dependency>
-      <groupId>commons-logging</groupId>
-      <artifactId>commons-logging</artifactId>
-      <version>1.0.3</version>
-    </dependency>
-    <dependency>
-      <groupId>commons-codec</groupId>
-      <artifactId>commons-codec</artifactId>
-      <version>1.3</version>
-    </dependency>
-    <dependency>
-      <groupId>commons-pool</groupId>
-      <artifactId>commons-pool</artifactId>
-      <version>1.2</version>
-    </dependency>
-    <dependency>
-      <groupId>commons-io</groupId>
-      <artifactId>commons-io</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>xmlrpc</groupId>
-      <artifactId>xmlrpc</artifactId>
-      <version>2.0.1</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.lucene</groupId>
-      <artifactId>lucene-core</artifactId>
-      <version>2.0.0</version>
-    </dependency>
-    <dependency>
-      <groupId>org.safehaus.jug</groupId>
-      <artifactId>jug</artifactId>
-      <version>2.0.0</version>
-      <classifier>asl</classifier>
-    </dependency>
-    <dependency>
-      <groupId>hsqldb</groupId>
-      <artifactId>hsqldb</artifactId>
-      <version>1.8.0.7</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.geronimo.javamail</groupId>
-      <artifactId>geronimo-javamail_1.4_mail</artifactId>
-      <version>1.8.1</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.geronimo.specs</groupId>
-      <artifactId>geronimo-activation_1.1_spec</artifactId>
-      <version>1.1</version>
-    </dependency>
-    <dependency>
-      <groupId>joda-time</groupId>
-      <artifactId>joda-time</artifactId>
-      <version>2.5</version>
-    </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>3.8.2</version>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
 </project>

Modified: oodt/branches/dependency-update/xmlps/pom.xml
URL: http://svn.apache.org/viewvc/oodt/branches/dependency-update/xmlps/pom.xml?rev=1705302&r1=1705301&r2=1705302&view=diff
==============================================================================
--- oodt/branches/dependency-update/xmlps/pom.xml (original)
+++ oodt/branches/dependency-update/xmlps/pom.xml Fri Sep 25 13:35:50 2015
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-	<!--
+<!--
 		Licensed to the Apache Software Foundation (ASF) under one or more
 		contributor license agreements. See the NOTICE file distributed with
 		this work for additional information regarding copyright ownership.
@@ -15,129 +14,125 @@
 		the specific language governing permissions and limitations under the
 		License.
 	-->
-
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-	<parent>
-		<groupId>org.apache.oodt</groupId>
-		<artifactId>oodt-core</artifactId>
-		<version>0.11-SNAPSHOT</version>
-		<relativePath>../core/pom.xml</relativePath>
-	</parent>
-	<artifactId>oodt-xmlps</artifactId>
-	<name>XML-configured, DBMS-based Product and Profile Server</name>
-	<version>0.11-SNAPSHOT</version>
-	<description>
-	  An XML-configured DBMS-based Product and Profile meant to easily 
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.apache.oodt</groupId>
+    <artifactId>oodt-core</artifactId>
+    <version>0.11-SNAPSHOT</version>
+    <relativePath>../core/pom.xml</relativePath>
+  </parent>
+  <artifactId>oodt-xmlps</artifactId>
+  <version>0.11-SNAPSHOT</version>
+  <name>XML-configured, DBMS-based Product and Profile Server</name>
+  <description>An XML-configured DBMS-based Product and Profile meant to easily 
 	  sit on top of Web-Grid and other Product and Profile server contexts
-	  for rapid deployment and integration.
-	</description>
-	<build>
-	 <testSourceDirectory>${basedir}/src/test/java</testSourceDirectory>
-		<resources>
-			<resource>
-				<targetPath>org/apache/oodt/xmlps</targetPath>
-				<directory>${basedir}/src/main/conf</directory>
-			</resource>
-		</resources>
-		<testResources>
-			<testResource>
-				<targetPath>org/apache/oodt/xmlps/mapping</targetPath>
-				<filtering />
-				<directory>${basedir}/src/test/resources</directory>
-				<includes />
-				<excludes />
-			</testResource>
-		</testResources>
-		
-		<plugins>
-			<plugin>
-				<artifactId>maven-assembly-plugin</artifactId>
-				<configuration>
-					<descriptorRefs>
-						<descriptorRef>jar-with-dependencies</descriptorRef>
-					</descriptorRefs>
-				</configuration>
-			</plugin>
-			<plugin>
-				<artifactId>maven-surefire-plugin</artifactId>
-				<configuration>
-				    <forkMode>pertest</forkMode>
-					<systemProperties>
-			          <property>
-			            <name>java.util.logging.config.file</name>
-			            <value>${basedir}/src/test/resources/logging.properties</value>
-			          </property>					
-					</systemProperties>
-				</configuration>
-			</plugin>
-		</plugins>
-	</build>
-	<dependencies>
-		<dependency>
-			<groupId>org.apache.oodt</groupId>
-			<artifactId>oodt-commons</artifactId>
-			<version>${project.parent.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.oodt</groupId>
-			<artifactId>oodt-xmlquery</artifactId>
-			<version>${project.parent.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.oodt</groupId>
-			<artifactId>cas-metadata</artifactId>
-			<version>${project.parent.version}</version>
-			<optional />
-		</dependency>
-		<dependency>
-			<groupId>org.apache.oodt</groupId>
-			<artifactId>oodt-product</artifactId>
-			<version>${project.parent.version}</version>
-			<optional />
-		</dependency>
-		<dependency>
-			<groupId>org.apache.oodt</groupId>
-			<artifactId>oodt-profile</artifactId>
-			<version>${project.parent.version}</version>
-			<optional />
-		</dependency>
-		<dependency>
-			<groupId>commons-dbcp</groupId>
-			<artifactId>commons-dbcp</artifactId>
-			<version>1.2.1</version>
-			<optional />
-		</dependency>
-		<dependency>
-			<groupId>commons-collections</groupId>
-			<artifactId>commons-collections</artifactId>
-			<version>2.1</version>
-			<optional />
-		</dependency>
-		<dependency>
-			<groupId>commons-pool</groupId>
-			<artifactId>commons-pool</artifactId>
-			<version>1.2</version>
-			<optional />
-		</dependency>
-		<dependency>
-			<groupId>javax.servlet</groupId>
-			<artifactId>servlet-api</artifactId>
-			<version>2.3</version>
-			<scope>provided</scope>
-		</dependency>
-		<dependency>
-			<groupId>junit</groupId>
-			<artifactId>junit</artifactId>
-			<version>3.8.2</version>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.easymock</groupId>
-			<artifactId>easymock</artifactId>
-			<version>3.0</version>
-			<scope>test</scope>
-		</dependency>
-	</dependencies>
-</project>
+	  for rapid deployment and integration.</description>
+  <dependencies>
+    <dependency>
+      <groupId>commons-collections</groupId>
+      <artifactId>commons-collections</artifactId>
+      <version>2.1</version>
+      <optional></optional>
+    </dependency>
+    <dependency>
+      <groupId>commons-dbcp</groupId>
+      <artifactId>commons-dbcp</artifactId>
+      <version>1.2.1</version>
+      <optional></optional>
+    </dependency>
+    <dependency>
+      <groupId>commons-pool</groupId>
+      <artifactId>commons-pool</artifactId>
+      <version>1.2</version>
+      <optional></optional>
+    </dependency>
+    <dependency>
+      <groupId>javax.servlet</groupId>
+      <artifactId>servlet-api</artifactId>
+      <version>2.3</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>3.8.2</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.oodt</groupId>
+      <artifactId>cas-metadata</artifactId>
+      <version>${project.parent.version}</version>
+      <optional></optional>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.oodt</groupId>
+      <artifactId>oodt-commons</artifactId>
+      <version>${project.parent.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.oodt</groupId>
+      <artifactId>oodt-product</artifactId>
+      <version>${project.parent.version}</version>
+      <optional></optional>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.oodt</groupId>
+      <artifactId>oodt-profile</artifactId>
+      <version>${project.parent.version}</version>
+      <optional></optional>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.oodt</groupId>
+      <artifactId>oodt-xmlquery</artifactId>
+      <version>${project.parent.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.easymock</groupId>
+      <artifactId>easymock</artifactId>
+      <version>3.0</version>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+  <build>
+    <testSourceDirectory>${basedir}/src/test/java</testSourceDirectory>
+    <resources>
+      <resource>
+        <targetPath>org/apache/oodt/xmlps</targetPath>
+        <directory>${basedir}/src/main/conf</directory>
+      </resource>
+    </resources>
+    <testResources>
+      <testResource>
+        <targetPath>org/apache/oodt/xmlps/mapping</targetPath>
+        <filtering></filtering>
+        <directory>${basedir}/src/test/resources</directory>
+        <includes></includes>
+        <excludes></excludes>
+      </testResource>
+    </testResources>
 
+    <plugins>
+      <plugin>
+        <artifactId>maven-assembly-plugin</artifactId>
+        <configuration>
+          <descriptorRefs>
+            <descriptorRef>jar-with-dependencies</descriptorRef>
+          </descriptorRefs>
+        </configuration>
+      </plugin>
+      <plugin>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <configuration>
+          <forkMode>pertest</forkMode>
+          <systemProperties>
+            <property>
+              <name>java.util.logging.config.file</name>
+              <value>${basedir}/src/test/resources/logging.properties</value>
+            </property>
+          </systemProperties>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+</project>

Modified: oodt/branches/dependency-update/xmlquery/pom.xml
URL: http://svn.apache.org/viewvc/oodt/branches/dependency-update/xmlquery/pom.xml?rev=1705302&r1=1705301&r2=1705302&view=diff
==============================================================================
--- oodt/branches/dependency-update/xmlquery/pom.xml (original)
+++ oodt/branches/dependency-update/xmlquery/pom.xml Fri Sep 25 13:35:50 2015
@@ -24,8 +24,8 @@
     <relativePath>../core/pom.xml</relativePath>
   </parent>
   <artifactId>oodt-xmlquery</artifactId>
-  <name>Query Expression</name>
   <packaging>jar</packaging>
+  <name>Query Expression</name>
   <description>This component provides a way to express queries in a generic
     manner.  Its centerpiece is a class called XMLQuery that uses
     boolean postfix expressions to capture the domain, range, and
@@ -34,11 +34,19 @@
     query.  It's used by many other components as the standard way to
     pass a query and its results between servers, clients, nodes, and
     other components.</description>
-  <scm>
-   	<connection>scm:svn:https://svn.apache.org/repos/asf/oodt/trunk/xmlquery</connection>
-   	<developerConnection>scm:svn:https://svn.apache.org/repos/asf/oodt/trunk/xmlquery</developerConnection>
-   	<url>http://svn.apache.org/viewvc/oodt/trunk/xmlquery</url>
-  </scm>
+  <dependencies>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>3.8.2</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.oodt</groupId>
+      <artifactId>oodt-commons</artifactId>
+      <version>${project.parent.version}</version>
+    </dependency>
+  </dependencies>
   <build>
     <resources>
       <resource>
@@ -63,6 +71,11 @@
       </plugin>
     </plugins>
   </build>
+  <scm>
+    <connection>scm:svn:https://svn.apache.org/repos/asf/oodt/trunk/xmlquery</connection>
+    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/oodt/trunk/xmlquery</developerConnection>
+    <url>http://svn.apache.org/viewvc/oodt/trunk/xmlquery</url>
+  </scm>
   <profiles>
     <profile>
       <id>audit</id>
@@ -81,10 +94,10 @@
             </configuration>
             <executions>
               <execution>
-                <phase>verify</phase>
                 <goals>
                   <goal>check</goal>
                 </goals>
+                <phase>verify</phase>
               </execution>
             </executions>
           </plugin>
@@ -92,17 +105,4 @@
       </build>
     </profile>
   </profiles>
-  <dependencies>
-    <dependency>
-      <groupId>org.apache.oodt</groupId>
-      <artifactId>oodt-commons</artifactId>
-      <version>${project.parent.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>3.8.2</version>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
 </project>