Modified: oodt/branches/dependency-update/pom.xml URL: http://svn.apache.org/viewvc/oodt/branches/dependency-update/pom.xml?rev=1705302&r1=1705301&r2=1705302&view=diff ============================================================================== --- oodt/branches/dependency-update/pom.xml (original) +++ oodt/branches/dependency-update/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 @@ -16,91 +16,89 @@ 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> + <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</artifactId> - <name>Apache OODT</name> - <packaging>pom</packaging> - <description> - Apache OODT is middleware for metadata. - </description> + <artifactId>oodt</artifactId> + <packaging>pom</packaging> + <name>Apache OODT</name> + <description>Apache OODT is middleware for metadata.</description> - <scm> - <connection>scm:svn:https://svn.apache.org/repos/asf/oodt/trunk</connection> - <developerConnection>scm:svn:https://svn.apache.org/repos/asf/oodt/trunk</developerConnection> - <url>http://svn.apache.org/viewvc/oodt/trunk</url> - </scm> + <modules> + <module>core</module> + <module>commons</module> + <module>cli</module> + <module>pcs/input</module> + <module>metadata</module> + <module>protocol/api</module> + <module>protocol/ftp</module> + <module>protocol/http</module> + <module>protocol/imaps</module> + <module>protocol/sftp</module> + <module>xmlquery</module> + <module>sso</module> + <module>filemgr</module> + <module>catalog</module> + <module>workflow</module> + <module>crawler</module> + <module>resource</module> + <module>curator/services</module> + <module>curator/webapp</module> + <module>pge</module> + <module>mvn/plugins/cas-install</module> + <module>mvn/archetypes</module> + <module>pushpull</module> + <module>product</module> + <module>profile</module> + <module>grid</module> + <module>xmlps</module> + <module>opendapps</module> + <module>webapp/components</module> + <module>webapp/fmbrowser</module> + <module>webapp/fmprod</module> + <module>webapp/wmonitor</module> + <module>app/fmbrowser</module> + <module>app/weditor</module> + <module>pcs/core</module> + <module>pcs/opsui</module> + <module>pcs/services</module> + </modules> - <modules> - <module>core</module> - <module>commons</module> - <module>cli</module> - <module>pcs/input</module> - <module>metadata</module> - <module>protocol/api</module> - <module>protocol/ftp</module> - <module>protocol/http</module> - <module>protocol/imaps</module> - <module>protocol/sftp</module> - <module>xmlquery</module> - <module>sso</module> - <module>filemgr</module> - <module>catalog</module> - <module>workflow</module> - <module>crawler</module> - <module>resource</module> - <module>curator/services</module> - <module>curator/webapp</module> - <module>pge</module> - <module>mvn/plugins/cas-install</module> - <module>mvn/archetypes</module> - <module>pushpull</module> - <module>product</module> - <module>profile</module> - <module>grid</module> - <module>xmlps</module> - <module>opendapps</module> - <module>webapp/components</module> - <module>webapp/fmbrowser</module> - <module>webapp/fmprod</module> - <module>webapp/wmonitor</module> - <module>app/fmbrowser</module> - <module>app/weditor</module> - <module>pcs/core</module> - <module>pcs/opsui</module> - <module>pcs/services</module> - </modules> - <profiles> - <profile> - <id>audit</id> - <activation> - <activeByDefault>false</activeByDefault> - </activation> - <build> - <plugins> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>rat-maven-plugin</artifactId> - <executions> - <execution> - <phase>verify</phase> - <goals> - <goal>check</goal> - </goals> - </execution> - </executions> - <configuration> - <numUnapprovedLicenses>11</numUnapprovedLicenses> - </configuration> - </plugin> - </plugins> - </build> - </profile> - </profiles> + <scm> + <connection>scm:svn:https://svn.apache.org/repos/asf/oodt/trunk</connection> + <developerConnection>scm:svn:https://svn.apache.org/repos/asf/oodt/trunk</developerConnection> + <url>http://svn.apache.org/viewvc/oodt/trunk</url> + </scm> + <profiles> + <profile> + <id>audit</id> + <activation> + <activeByDefault>false</activeByDefault> + </activation> + <build> + <plugins> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>rat-maven-plugin</artifactId> + <configuration> + <numUnapprovedLicenses>11</numUnapprovedLicenses> + </configuration> + <executions> + <execution> + <goals> + <goal>check</goal> + </goals> + <phase>verify</phase> + </execution> + </executions> + </plugin> + </plugins> + </build> + </profile> + </profiles> </project>
Modified: oodt/branches/dependency-update/product/pom.xml URL: http://svn.apache.org/viewvc/oodt/branches/dependency-update/product/pom.xml?rev=1705302&r1=1705301&r2=1705302&view=diff ============================================================================== --- oodt/branches/dependency-update/product/pom.xml (original) +++ oodt/branches/dependency-update/product/pom.xml Fri Sep 25 13:35:50 2015 @@ -16,109 +16,107 @@ 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-product</artifactId> - <name>Product Service</name> - <description> - The Product Service provides access to data products. Products can be + <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-product</artifactId> + <name>Product Service</name> + <description>The Product Service provides access to data products. Products can be scientific datasets, images, documents, or anything with an electronic representation. The Product Service accepts standard query expressions (see the Query Expression component) and returns zero or more matching products. In addition, the product service can transform products from proprietary formats and into Internet standard formats or run other transformations, all - without impacting local stores or operations. - </description> - <scm> - <connection>scm:svn:https://svn.apache.org/repos/asf/oodt/trunk/product</connection> - <developerConnection>scm:svn:https://svn.apache.org/repos/asf/oodt/trunk/product</developerConnection> - <url>http://svn.apache.org/viewvc/oodt/trunk/product</url> - </scm> - <build> - <resources> - <resource> - <targetPath>org/apache/oodt/product</targetPath> - <directory>${basedir}/src/main/conf</directory> - <includes> - <include>displayableTypes.xml</include> - </includes> - </resource> - </resources> + without impacting local stores or operations.</description> + <dependencies> + <dependency> + <groupId>commons-codec</groupId> + <artifactId>commons-codec</artifactId> + <version>1.3</version> + </dependency> + <dependency> + <groupId>commons-io</groupId> + <artifactId>commons-io</artifactId> + </dependency> + <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>3.8.2</version> + <scope>test</scope> + </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-xmlquery</artifactId> + <version>${project.parent.version}</version> + </dependency> + <dependency> + <groupId>org.apache.tika</groupId> + <artifactId>tika-core</artifactId> + </dependency> + </dependencies> + <build> + <resources> + <resource> + <targetPath>org/apache/oodt/product</targetPath> + <directory>${basedir}/src/main/conf</directory> + <includes> + <include>displayableTypes.xml</include> + </includes> + </resource> + </resources> + <plugins> + <plugin> + <artifactId>maven-assembly-plugin</artifactId> + <configuration> + <descriptorRefs> + <descriptorRef>jar-with-dependencies</descriptorRef> + </descriptorRefs> + </configuration> + </plugin> + </plugins> + </build> + <scm> + <connection>scm:svn:https://svn.apache.org/repos/asf/oodt/trunk/product</connection> + <developerConnection>scm:svn:https://svn.apache.org/repos/asf/oodt/trunk/product</developerConnection> + <url>http://svn.apache.org/viewvc/oodt/trunk/product</url> + </scm> + <profiles> + <profile> + <id>audit</id> + <activation> + <activeByDefault>false</activeByDefault> + </activation> + <build> <plugins> - <plugin> - <artifactId>maven-assembly-plugin</artifactId> - <configuration> - <descriptorRefs> - <descriptorRef>jar-with-dependencies</descriptorRef> - </descriptorRefs> - </configuration> - </plugin> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>rat-maven-plugin</artifactId> + <executions> + <execution> + <goals> + <goal>check</goal> + </goals> + <phase>verify</phase> + </execution> + </executions> + </plugin> </plugins> - </build> - <profiles> - <profile> - <id>audit</id> - <activation> - <activeByDefault>false</activeByDefault> - </activation> - <build> - <plugins> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>rat-maven-plugin</artifactId> - <executions> - <execution> - <phase>verify</phase> - <goals> - <goal>check</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - </build> - </profile> - </profiles> - <dependencies> - <dependency> - <groupId>org.apache.oodt</groupId> - <artifactId>oodt-commons</artifactId> - <version>${project.parent.version}</version> - </dependency> - <dependency> - <groupId>commons-io</groupId> - <artifactId>commons-io</artifactId> - </dependency> - <dependency> - <groupId>commons-codec</groupId> - <artifactId>commons-codec</artifactId> - <version>1.3</version> - </dependency> - <dependency> - <groupId>org.apache.tika</groupId> - <artifactId>tika-core</artifactId> - </dependency> - <dependency> - <groupId>org.apache.oodt</groupId> - <artifactId>oodt-xmlquery</artifactId> - <version>${project.parent.version}</version> - </dependency> - <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>3.8.2</version> - <scope>test</scope> - </dependency> - </dependencies> + </build> + </profile> + </profiles> </project> Modified: oodt/branches/dependency-update/profile/pom.xml URL: http://svn.apache.org/viewvc/oodt/branches/dependency-update/profile/pom.xml?rev=1705302&r1=1705301&r2=1705302&view=diff ============================================================================== --- oodt/branches/dependency-update/profile/pom.xml (original) +++ oodt/branches/dependency-update/profile/pom.xml Fri Sep 25 13:35:50 2015 @@ -31,11 +31,55 @@ Dublin Core and ISO-11179 metadata as well as URIs for locations. The Profile Service catalogs metadata descriptions and provides creating, updating, and querying capabilities.</description> - <scm> - <connection>scm:svn:https://svn.apache.org/repos/asf/oodt/trunk/profile</connection> - <developerConnection>scm:svn:https://svn.apache.org/repos/asf/oodt/trunk/profile</developerConnection> - <url>http://svn.apache.org/viewvc/oodt/trunk/profile</url> - </scm> + <dependencies> + <dependency> + <groupId>com.ibm.icu</groupId> + <artifactId>icu4j</artifactId> + <version>3.4.4</version> + </dependency> + <dependency> + <groupId>commons-codec</groupId> + <artifactId>commons-codec</artifactId> + <version>1.3</version> + </dependency> + <dependency> + <groupId>commons-httpclient</groupId> + <artifactId>commons-httpclient</artifactId> + <version>3.0-alpha1</version> + </dependency> + <dependency> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + <version>1.0.4</version> + </dependency> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>3.8.2</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.jena</groupId> + <artifactId>apache-jena-libs</artifactId> + <version>${jena.version}</version> + <type>pom</type> + </dependency> + <dependency> + <groupId>org.apache.oodt</groupId> + <artifactId>cas-filemgr</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.apache.oodt</groupId> + <artifactId>oodt-xmlquery</artifactId> + <version>${project.parent.version}</version> + </dependency> + </dependencies> <build> <resources> <resource> @@ -54,6 +98,11 @@ </plugin> </plugins> </build> + <scm> + <connection>scm:svn:https://svn.apache.org/repos/asf/oodt/trunk/profile</connection> + <developerConnection>scm:svn:https://svn.apache.org/repos/asf/oodt/trunk/profile</developerConnection> + <url>http://svn.apache.org/viewvc/oodt/trunk/profile</url> + </scm> <profiles> <profile> <id>audit</id> @@ -73,10 +122,10 @@ </configuration> <executions> <execution> - <phase>verify</phase> <goals> <goal>check</goal> </goals> + <phase>verify</phase> </execution> </executions> </plugin> @@ -84,53 +133,4 @@ </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>oodt-xmlquery</artifactId> - <version>${project.parent.version}</version> - </dependency> - <dependency> - <groupId>org.apache.oodt</groupId> - <artifactId>cas-filemgr</artifactId> - <version>${project.parent.version}</version> - </dependency> - <dependency> - <groupId>org.apache.jena</groupId> - <artifactId>apache-jena-libs</artifactId> - <type>pom</type> - <version>${jena.version}</version> - </dependency> - <dependency> - <groupId>com.ibm.icu</groupId> - <artifactId>icu4j</artifactId> - <version>3.4.4</version> - </dependency> - <dependency> - <groupId>commons-httpclient</groupId> - <artifactId>commons-httpclient</artifactId> - <version>3.0-alpha1</version> - </dependency> - <dependency> - <groupId>commons-codec</groupId> - <artifactId>commons-codec</artifactId> - <version>1.3</version> - </dependency> - <dependency> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> - <version>1.0.4</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/protocol/api/pom.xml URL: http://svn.apache.org/viewvc/oodt/branches/dependency-update/protocol/api/pom.xml?rev=1705302&r1=1705301&r2=1705302&view=diff ============================================================================== --- oodt/branches/dependency-update/protocol/api/pom.xml (original) +++ oodt/branches/dependency-update/protocol/api/pom.xml Fri Sep 25 13:35:50 2015 @@ -11,70 +11,62 @@ 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>cas-protocol-api</artifactId> - <name>CAS Protocol</name> - <profiles> - <profile> - <id>audit</id> - <activation> - <activeByDefault>false</activeByDefault> - </activation> - <build> - <plugins> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>rat-maven-plugin</artifactId> - <configuration> - <excludes> - <exclude>**/resources/examples/**/*</exclude> - </excludes> - </configuration> - <executions> - <execution> - <phase>verify</phase> - <goals> - <goal>check</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - </build> - </profile> - </profiles> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-assembly-plugin</artifactId> - <version>2.2-beta-2</version> - <configuration> - <descriptors> - <descriptor>src/main/assembly/assembly.xml</descriptor> - </descriptors> - <archive> - <manifest> - <mainClass>org.apache.oodt.cas.protocol.system.CLProtocolManager</mainClass> - </manifest> - </archive> - </configuration> - <executions> - <execution> - <phase>package</phase> - <goals> - <goal>single</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> + <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>cas-protocol-api</artifactId> + <name>CAS Protocol</name> + <dependencies> + <dependency> + <groupId>com.thoughtworks.xstream</groupId> + <artifactId>xstream</artifactId> + <version>1.3.1</version> + <exclusions> + <exclusion> + <!-- xom is an optional dependency of xstream. Its also an Apache incompatible + license --> + <groupId>xom</groupId> + <artifactId>xom</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>commons-lang</groupId> + <artifactId>commons-lang</artifactId> + <version>2.3</version> + </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-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>oodt-commons</artifactId> + <version>${project.parent.version}</version> + </dependency> + <dependency> + <groupId>xmlrpc</groupId> + <artifactId>xmlrpc</artifactId> + <version>2.0.1</version> + </dependency> + </dependencies> + <build> <resources> <resource> <targetPath>org/apache/oodt/cas/protocol</targetPath> @@ -84,51 +76,59 @@ </includes> </resource> </resources> - </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>cas-metadata</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>commons-lang</groupId> - <artifactId>commons-lang</artifactId> - <version>2.3</version> - </dependency> - <dependency> - <groupId>xmlrpc</groupId> - <artifactId>xmlrpc</artifactId> - <version>2.0.1</version> - </dependency> - <dependency> - <groupId>com.thoughtworks.xstream</groupId> - <artifactId>xstream</artifactId> - <version>1.3.1</version> - <exclusions> - <exclusion> - <!-- xom is an optional dependency of xstream. Its also an Apache incompatible - license --> - <groupId>xom</groupId> - <artifactId>xom</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>3.8.2</version> - <scope>test</scope> - </dependency> - </dependencies> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-assembly-plugin</artifactId> + <version>2.2-beta-2</version> + <configuration> + <descriptors> + <descriptor>src/main/assembly/assembly.xml</descriptor> + </descriptors> + <archive> + <manifest> + <mainClass>org.apache.oodt.cas.protocol.system.CLProtocolManager</mainClass> + </manifest> + </archive> + </configuration> + <executions> + <execution> + <goals> + <goal>single</goal> + </goals> + <phase>package</phase> + </execution> + </executions> + </plugin> + </plugins> + </build> + <profiles> + <profile> + <id>audit</id> + <activation> + <activeByDefault>false</activeByDefault> + </activation> + <build> + <plugins> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>rat-maven-plugin</artifactId> + <configuration> + <excludes> + <exclude>**/resources/examples/**/*</exclude> + </excludes> + </configuration> + <executions> + <execution> + <goals> + <goal>check</goal> + </goals> + <phase>verify</phase> + </execution> + </executions> + </plugin> + </plugins> + </build> + </profile> + </profiles> </project> Modified: oodt/branches/dependency-update/protocol/ftp/pom.xml URL: http://svn.apache.org/viewvc/oodt/branches/dependency-update/protocol/ftp/pom.xml?rev=1705302&r1=1705301&r2=1705302&view=diff ============================================================================== --- oodt/branches/dependency-update/protocol/ftp/pom.xml (original) +++ oodt/branches/dependency-update/protocol/ftp/pom.xml Fri Sep 25 13:35:50 2015 @@ -11,44 +11,61 @@ 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>cas-protocol-ftp</artifactId> - <name>CAS Protocol FTP Implementation</name> - <profiles> - <profile> - <id>audit</id> - <activation> - <activeByDefault>false</activeByDefault> - </activation> - <build> - <plugins> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>rat-maven-plugin</artifactId> - <configuration> - <excludes> - <exclude>**/resources/examples/**/*</exclude> - </excludes> - </configuration> - <executions> - <execution> - <phase>verify</phase> - <goals> - <goal>check</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - </build> - </profile> - </profiles> + <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>cas-protocol-ftp</artifactId> + <name>CAS Protocol FTP Implementation</name> + <dependencies> + <dependency> + <groupId>commons-net</groupId> + <artifactId>commons-net</artifactId> + <version>1.4.0</version> + </dependency> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>3.8.2</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.ftpserver</groupId> + <artifactId>ftpserver-core</artifactId> + <version>1.0.5</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.oodt</groupId> + <artifactId>cas-protocol-api</artifactId> + <version>${project.parent.version}</version> + </dependency> + <dependency> + <groupId>org.jglobus</groupId> + <artifactId>gss</artifactId> + <version>2.0.6</version> + </dependency> + <dependency> + <groupId>org.jglobus</groupId> + <artifactId>JGlobus-GridFTP</artifactId> + <version>2.0.0</version> + </dependency> + <dependency> + <groupId>org.mockito</groupId> + <artifactId>mockito-all</artifactId> + <version>1.9.5</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + <version>1.5.2</version> + <scope>test</scope> + </dependency> + </dependencies> <build> <resources> <resource> @@ -60,50 +77,33 @@ </resource> </resources> </build> - <dependencies> - <dependency> - <groupId>org.apache.oodt</groupId> - <artifactId>cas-protocol-api</artifactId> - <version>${project.parent.version}</version> - </dependency> - <dependency> - <groupId>org.jglobus</groupId> - <artifactId>JGlobus-GridFTP</artifactId> - <version>2.0.0</version> - </dependency> - <dependency> - <groupId>org.jglobus</groupId> - <artifactId>gss</artifactId> - <version>2.0.6</version> - </dependency> - <dependency> - <groupId>commons-net</groupId> - <artifactId>commons-net</artifactId> - <version>1.4.0</version> - </dependency> - <dependency> - <groupId>org.apache.ftpserver</groupId> - <artifactId>ftpserver-core</artifactId> - <version>1.0.5</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - <version>1.5.2</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>3.8.2</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.mockito</groupId> - <artifactId>mockito-all</artifactId> - <version>1.9.5</version> - <scope>test</scope> - </dependency> - </dependencies> + <profiles> + <profile> + <id>audit</id> + <activation> + <activeByDefault>false</activeByDefault> + </activation> + <build> + <plugins> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>rat-maven-plugin</artifactId> + <configuration> + <excludes> + <exclude>**/resources/examples/**/*</exclude> + </excludes> + </configuration> + <executions> + <execution> + <goals> + <goal>check</goal> + </goals> + <phase>verify</phase> + </execution> + </executions> + </plugin> + </plugins> + </build> + </profile> + </profiles> </project> Modified: oodt/branches/dependency-update/protocol/http/pom.xml URL: http://svn.apache.org/viewvc/oodt/branches/dependency-update/protocol/http/pom.xml?rev=1705302&r1=1705301&r2=1705302&view=diff ============================================================================== --- oodt/branches/dependency-update/protocol/http/pom.xml (original) +++ oodt/branches/dependency-update/protocol/http/pom.xml Fri Sep 25 13:35:50 2015 @@ -11,80 +11,80 @@ 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>cas-protocol-http</artifactId> - <name>CAS Protocol HTTP Implementation</name> - <profiles> - <profile> - <id>audit</id> - <activation> - <activeByDefault>false</activeByDefault> - </activation> - <build> - <plugins> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>rat-maven-plugin</artifactId> - <configuration> - <excludes> - <exclude>**/resources/examples/**/*</exclude> - </excludes> - </configuration> - <executions> - <execution> - <phase>verify</phase> - <goals> - <goal>check</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - </build> - </profile> - </profiles> - <build> - <resources> - <resource> - <targetPath>org/apache/oodt/cas/protocol/http</targetPath> - <directory>${basedir}/src/main/resources/policy</directory> - <includes> - <include>http-protocol-config.xml</include> - </includes> - </resource> - </resources> - </build> - <dependencies> - <dependency> - <groupId>org.apache.oodt</groupId> - <artifactId>cas-protocol-api</artifactId> - <version>${project.parent.version}</version> - </dependency> - <dependency> - <groupId>commons-httpclient</groupId> - <artifactId>commons-httpclient</artifactId> - <version>3.0</version> - </dependency> - <dependency> - <groupId>nekohtml</groupId> - <artifactId>nekohtml</artifactId> - <version>1.9.6.2</version> - </dependency> - <dependency> - <groupId>org.apache.tika</groupId> - <artifactId>tika-parsers</artifactId> - </dependency> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>3.8.2</version> - <scope>test</scope> - </dependency> - </dependencies> + <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>cas-protocol-http</artifactId> + <name>CAS Protocol HTTP Implementation</name> + <dependencies> + <dependency> + <groupId>commons-httpclient</groupId> + <artifactId>commons-httpclient</artifactId> + <version>3.0</version> + </dependency> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>3.8.2</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>nekohtml</groupId> + <artifactId>nekohtml</artifactId> + <version>1.9.6.2</version> + </dependency> + <dependency> + <groupId>org.apache.oodt</groupId> + <artifactId>cas-protocol-api</artifactId> + <version>${project.parent.version}</version> + </dependency> + <dependency> + <groupId>org.apache.tika</groupId> + <artifactId>tika-parsers</artifactId> + </dependency> + </dependencies> + <build> + <resources> + <resource> + <targetPath>org/apache/oodt/cas/protocol/http</targetPath> + <directory>${basedir}/src/main/resources/policy</directory> + <includes> + <include>http-protocol-config.xml</include> + </includes> + </resource> + </resources> + </build> + <profiles> + <profile> + <id>audit</id> + <activation> + <activeByDefault>false</activeByDefault> + </activation> + <build> + <plugins> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>rat-maven-plugin</artifactId> + <configuration> + <excludes> + <exclude>**/resources/examples/**/*</exclude> + </excludes> + </configuration> + <executions> + <execution> + <goals> + <goal>check</goal> + </goals> + <phase>verify</phase> + </execution> + </executions> + </plugin> + </plugins> + </build> + </profile> + </profiles> </project> Modified: oodt/branches/dependency-update/protocol/imaps/pom.xml URL: http://svn.apache.org/viewvc/oodt/branches/dependency-update/protocol/imaps/pom.xml?rev=1705302&r1=1705301&r2=1705302&view=diff ============================================================================== --- oodt/branches/dependency-update/protocol/imaps/pom.xml (original) +++ oodt/branches/dependency-update/protocol/imaps/pom.xml Fri Sep 25 13:35:50 2015 @@ -11,44 +11,53 @@ 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>cas-protocol-imaps</artifactId> - <name>CAS Protocol IMAPS Implementation</name> - <profiles> - <profile> - <id>audit</id> - <activation> - <activeByDefault>false</activeByDefault> - </activation> - <build> - <plugins> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>rat-maven-plugin</artifactId> - <configuration> - <excludes> - <exclude>**/resources/examples/**/*</exclude> - </excludes> - </configuration> - <executions> - <execution> - <phase>verify</phase> - <goals> - <goal>check</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - </build> - </profile> - </profiles> + <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>cas-protocol-imaps</artifactId> + <name>CAS Protocol IMAPS Implementation</name> + <dependencies> + <dependency> + <groupId>com.icegreen</groupId> + <artifactId>greenmail</artifactId> + <version>1.3.1b</version> + <scope>test</scope> + </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.oodt</groupId> + <artifactId>cas-protocol-api</artifactId> + <version>${project.parent.version}</version> + </dependency> + <dependency> + <groupId>org.apache.tika</groupId> + <artifactId>tika-parsers</artifactId> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-simple</artifactId> + <version>1.3.1</version> + </dependency> + </dependencies> <build> <resources> <resource> @@ -60,42 +69,33 @@ </resource> </resources> </build> - <dependencies> - <dependency> - <groupId>org.apache.oodt</groupId> - <artifactId>cas-protocol-api</artifactId> - <version>${project.parent.version}</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>org.apache.tika</groupId> - <artifactId>tika-parsers</artifactId> - </dependency> - <dependency> - <groupId>com.icegreen</groupId> - <artifactId>greenmail</artifactId> - <version>1.3.1b</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-simple</artifactId> - <version>1.3.1</version> - </dependency> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>3.8.2</version> - <scope>test</scope> - </dependency> - </dependencies> + <profiles> + <profile> + <id>audit</id> + <activation> + <activeByDefault>false</activeByDefault> + </activation> + <build> + <plugins> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>rat-maven-plugin</artifactId> + <configuration> + <excludes> + <exclude>**/resources/examples/**/*</exclude> + </excludes> + </configuration> + <executions> + <execution> + <goals> + <goal>check</goal> + </goals> + <phase>verify</phase> + </execution> + </executions> + </plugin> + </plugins> + </build> + </profile> + </profiles> </project> Modified: oodt/branches/dependency-update/protocol/sftp/pom.xml URL: http://svn.apache.org/viewvc/oodt/branches/dependency-update/protocol/sftp/pom.xml?rev=1705302&r1=1705301&r2=1705302&view=diff ============================================================================== --- oodt/branches/dependency-update/protocol/sftp/pom.xml (original) +++ oodt/branches/dependency-update/protocol/sftp/pom.xml Fri Sep 25 13:35:50 2015 @@ -11,112 +11,111 @@ 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>cas-protocol-sftp</artifactId> - <name>CAS Protocol SFTP Implementation</name> - <profiles> - <profile> - <id>audit</id> - <activation> - <activeByDefault>false</activeByDefault> - </activation> - <build> - <plugins> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>rat-maven-plugin</artifactId> - <configuration> - <excludes> - <exclude>**/resources/examples/**/*</exclude> - </excludes> - <numUnapprovedLicenses>3</numUnapprovedLicenses> - </configuration> - <executions> - <execution> - <phase>verify</phase> - <goals> - <goal>check</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - </build> - </profile> - </profiles> - <build> - <resources> - <resource> - <targetPath>org/apache/oodt/cas/protocol/sftp</targetPath> - <directory>${basedir}/src/main/resources/policy</directory> - <includes> - <include>sftp-protocol-config.xml</include> - </includes> - </resource> - </resources> - </build> - <dependencies> - <dependency> - <groupId>org.apache.oodt</groupId> - <artifactId>cas-protocol-api</artifactId> - <version>${project.parent.version}</version> - </dependency> - <dependency> - <groupId>com.jcraft</groupId> - <artifactId>jsch</artifactId> - <version>0.1.42</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> + <artifactId>cas-protocol-sftp</artifactId> + <name>CAS Protocol SFTP Implementation</name> + <dependencies> <dependency> - <groupId>sshtools</groupId> - <artifactId>j2ssh-core</artifactId> - <version>0.2.9</version> - <scope>test</scope> + <groupId>com.jcraft</groupId> + <artifactId>jsch</artifactId> + <version>0.1.42</version> </dependency> - <dependency> - <groupId>sshtools</groupId> - <artifactId>j2ssh-daemon</artifactId> - <version>0.2.9</version> - <scope>test</scope> - </dependency> - <dependency> + <dependency> <groupId>commons-io</groupId> <artifactId>commons-io</artifactId> </dependency> - <dependency> + <dependency> <groupId>commons-logging</groupId> <artifactId>commons-logging</artifactId> <version>1.0.3</version> </dependency> <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>3.8.2</version> + <scope>test</scope> + </dependency> + <dependency> <groupId>org.apache.mina</groupId> <artifactId>mina-core</artifactId> <version>2.0.4</version> </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-protocol-api</artifactId> + <version>${project.parent.version}</version> + </dependency> + <dependency> + <groupId>org.hamcrest</groupId> + <artifactId>hamcrest-all</artifactId> + <version>1.3</version> + <scope>test</scope> + </dependency> + <dependency> <groupId>org.mockito</groupId> <artifactId>mockito-all</artifactId> <version>1.9.5</version> <scope>test</scope> - </dependency> - <dependency> - <groupId>org.hamcrest</groupId> - <artifactId>hamcrest-all</artifactId> - <version>1.3</version> + </dependency> + <dependency> + <groupId>sshtools</groupId> + <artifactId>j2ssh-core</artifactId> + <version>0.2.9</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>sshtools</groupId> + <artifactId>j2ssh-daemon</artifactId> + <version>0.2.9</version> <scope>test</scope> </dependency> - - </dependencies> + </dependencies> + <build> + <resources> + <resource> + <targetPath>org/apache/oodt/cas/protocol/sftp</targetPath> + <directory>${basedir}/src/main/resources/policy</directory> + <includes> + <include>sftp-protocol-config.xml</include> + </includes> + </resource> + </resources> + </build> + <profiles> + <profile> + <id>audit</id> + <activation> + <activeByDefault>false</activeByDefault> + </activation> + <build> + <plugins> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>rat-maven-plugin</artifactId> + <configuration> + <excludes> + <exclude>**/resources/examples/**/*</exclude> + </excludes> + <numUnapprovedLicenses>3</numUnapprovedLicenses> + </configuration> + <executions> + <execution> + <goals> + <goal>check</goal> + </goals> + <phase>verify</phase> + </execution> + </executions> + </plugin> + </plugins> + </build> + </profile> + </profiles> </project> Modified: oodt/branches/dependency-update/pushpull/pom.xml URL: http://svn.apache.org/viewvc/oodt/branches/dependency-update/pushpull/pom.xml?rev=1705302&r1=1705301&r2=1705302&view=diff ============================================================================== --- oodt/branches/dependency-update/pushpull/pom.xml (original) +++ oodt/branches/dependency-update/pushpull/pom.xml Fri Sep 25 13:35:50 2015 @@ -16,23 +16,88 @@ 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> + </parent> <artifactId>cas-pushpull</artifactId> <name>CAS Push-Pull-Framework</name> - <scm> - <connection>scm:svn:https://svn.apache.org/repos/asf/oodt/trunk/pushpull</connection> - <developerConnection>scm:svn:https://svn.apache.org/repos/asf/oodt/trunk/pushpull</developerConnection> - <url>http://svn.apache.org/viewvc/oodt/trunk/pushpull</url> - </scm> + <dependencies> + <dependency> + <groupId>com.google.guava</groupId> + <artifactId>guava</artifactId> + <version>10.0.1</version> + </dependency> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>4.8.1</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.oodt</groupId> + <artifactId>cas-filemgr</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-protocol-api</artifactId> + <version>${project.parent.version}</version> + </dependency> + <dependency> + <groupId>org.apache.oodt</groupId> + <artifactId>cas-protocol-ftp</artifactId> + <version>${project.parent.version}</version> + </dependency> + <dependency> + <groupId>org.apache.oodt</groupId> + <artifactId>cas-protocol-http</artifactId> + <version>${project.parent.version}</version> + </dependency> + <dependency> + <groupId>org.apache.oodt</groupId> + <artifactId>cas-protocol-imaps</artifactId> + <version>${project.parent.version}</version> + </dependency> + <dependency> + <groupId>org.apache.oodt</groupId> + <artifactId>cas-protocol-sftp</artifactId> + <version>${project.parent.version}</version> + </dependency> + <dependency> + <groupId>org.hamcrest</groupId> + <artifactId>hamcrest-all</artifactId> + <version>1.3</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.mockito</groupId> + <artifactId>mockito-all</artifactId> + <version>1.9.5</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>oro</groupId> + <artifactId>oro</artifactId> + <version>2.0.8</version> + </dependency> + <dependency> + <groupId>xmlrpc</groupId> + <artifactId>xmlrpc</artifactId> + <version>2.0.1</version> + </dependency> + </dependencies> - <build> + <build> <plugins> <plugin> <groupId>org.apache.maven.plugins</groupId> @@ -50,15 +115,20 @@ </configuration> <executions> <execution> - <phase>package</phase> <goals> <goal>single</goal> </goals> + <phase>package</phase> </execution> </executions> - </plugin> + </plugin> </plugins> - </build> + </build> + <scm> + <connection>scm:svn:https://svn.apache.org/repos/asf/oodt/trunk/pushpull</connection> + <developerConnection>scm:svn:https://svn.apache.org/repos/asf/oodt/trunk/pushpull</developerConnection> + <url>http://svn.apache.org/viewvc/oodt/trunk/pushpull</url> + </scm> <profiles> <profile> <id>audit</id> @@ -77,10 +147,10 @@ </configuration> <executions> <execution> - <phase>verify</phase> <goals> <goal>check</goal> </goals> + <phase>verify</phase> </execution> </executions> </plugin> @@ -88,74 +158,4 @@ </build> </profile> </profiles> - <dependencies> - <dependency> - <groupId>org.apache.oodt</groupId> - <artifactId>cas-filemgr</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-protocol-api</artifactId> - <version>${project.parent.version}</version> - </dependency> - <dependency> - <groupId>org.apache.oodt</groupId> - <artifactId>cas-protocol-ftp</artifactId> - <version>${project.parent.version}</version> - </dependency> - <dependency> - <groupId>org.apache.oodt</groupId> - <artifactId>cas-protocol-http</artifactId> - <version>${project.parent.version}</version> - </dependency> - <dependency> - <groupId>org.apache.oodt</groupId> - <artifactId>cas-protocol-imaps</artifactId> - <version>${project.parent.version}</version> - </dependency> - <dependency> - <groupId>org.apache.oodt</groupId> - <artifactId>cas-protocol-sftp</artifactId> - <version>${project.parent.version}</version> - </dependency> - <dependency> - <groupId>xmlrpc</groupId> - <artifactId>xmlrpc</artifactId> - <version>2.0.1</version> - </dependency> - <dependency> - <groupId>oro</groupId> - <artifactId>oro</artifactId> - <version>2.0.8</version> - </dependency> - <dependency> - <groupId>com.google.guava</groupId> - <artifactId>guava</artifactId> - <version>10.0.1</version> - </dependency> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>4.8.1</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.mockito</groupId> - <artifactId>mockito-all</artifactId> - <version>1.9.5</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.hamcrest</groupId> - <artifactId>hamcrest-all</artifactId> - <version>1.3</version> - <scope>test</scope> - </dependency> - </dependencies> </project> Modified: oodt/branches/dependency-update/resource/pom.xml URL: http://svn.apache.org/viewvc/oodt/branches/dependency-update/resource/pom.xml?rev=1705302&r1=1705301&r2=1705302&view=diff ============================================================================== --- oodt/branches/dependency-update/resource/pom.xml (original) +++ oodt/branches/dependency-update/resource/pom.xml Fri Sep 25 13:35:50 2015 @@ -28,72 +28,33 @@ the License. <description>The resource management component of a Catalog and Archive Service. This component provides job management, and management of the underlying software system hardware and resources, such as disk space, computational resources, and shared identity.</description> - <scm> - <connection>scm:svn:https://svn.apache.org/repos/asf/oodt/trunk/resource</connection> - <developerConnection>scm:svn:https://svn.apache.org/repos/asf/oodt/trunk/resource</developerConnection> - <url>http://svn.apache.org/viewvc/oodt/trunk/resource</url> - </scm> - <build> - <plugins> - <plugin> - <artifactId>maven-surefire-plugin</artifactId> - <version>2.4</version> - <configuration> - <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> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-assembly-plugin</artifactId> - <version>2.2-beta-2</version> - <configuration> - <descriptors> - <descriptor>src/main/assembly/assembly.xml</descriptor> - </descriptors> - <archive> - <manifest> - <mainClass>org.apache.oodt.cas.resource.system.XmlRpcResourceManagerClient</mainClass> - </manifest> - </archive> - </configuration> - <executions> - <execution> - <phase>package</phase> - <goals> - <goal>single</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - </build> <dependencies> <dependency> - <groupId>org.apache.oodt</groupId> - <artifactId>cas-metadata</artifactId> - <version>${project.parent.version}</version> + <groupId>com.thoughtworks.xstream</groupId> + <artifactId>xstream</artifactId> + <version>1.3.1</version> + <exclusions> + <exclusion> + <!-- xom is an optional dependency of xstream. Its also an Apache incompatible license --> + <groupId>xom</groupId> + <artifactId>xom</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> - <groupId>org.apache.oodt</groupId> - <artifactId>cas-cli</artifactId> - <version>${project.parent.version}</version> + <groupId>commons-codec</groupId> + <artifactId>commons-codec</artifactId> + <version>1.3</version> </dependency> <dependency> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> - <version>1.0.3</version> + <groupId>commons-collections</groupId> + <artifactId>commons-collections</artifactId> + <version>3.2.1</version> + </dependency> + <dependency> + <groupId>commons-dbcp</groupId> + <artifactId>commons-dbcp</artifactId> + <version>1.2.1</version> </dependency> <dependency> <groupId>commons-httpclient</groupId> @@ -105,19 +66,9 @@ the License. <artifactId>commons-io</artifactId> </dependency> <dependency> - <groupId>commons-codec</groupId> - <artifactId>commons-codec</artifactId> - <version>1.3</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>3.2.1</version> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + <version>1.0.3</version> </dependency> <dependency> <groupId>commons-pool</groupId> @@ -125,6 +76,12 @@ the License. <version>1.2</version> </dependency> <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>3.8.2</version> + <scope>test</scope> + </dependency> + <dependency> <groupId>org.apache.httpcomponents</groupId> <artifactId>httpclient</artifactId> <version>4.2.1</version> @@ -135,6 +92,16 @@ the License. <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.safehaus.jug</groupId> <artifactId>jug</artifactId> <version>2.0.0</version> @@ -145,23 +112,56 @@ the License. <artifactId>xmlrpc</artifactId> <version>2.0.1</version> </dependency> - <dependency> - <groupId>com.thoughtworks.xstream</groupId> - <artifactId>xstream</artifactId> - <version>1.3.1</version> - <exclusions> - <exclusion> - <!-- xom is an optional dependency of xstream. Its also an Apache incompatible license --> - <groupId>xom</groupId> - <artifactId>xom</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>3.8.2</version> - <scope>test</scope> - </dependency> </dependencies> + <build> + <plugins> + <plugin> + <artifactId>maven-surefire-plugin</artifactId> + <version>2.4</version> + <configuration> + <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> + </configuration> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-assembly-plugin</artifactId> + <version>2.2-beta-2</version> + <configuration> + <descriptors> + <descriptor>src/main/assembly/assembly.xml</descriptor> + </descriptors> + <archive> + <manifest> + <mainClass>org.apache.oodt.cas.resource.system.XmlRpcResourceManagerClient</mainClass> + </manifest> + </archive> + </configuration> + <executions> + <execution> + <goals> + <goal>single</goal> + </goals> + <phase>package</phase> + </execution> + </executions> + </plugin> + </plugins> + </build> + <scm> + <connection>scm:svn:https://svn.apache.org/repos/asf/oodt/trunk/resource</connection> + <developerConnection>scm:svn:https://svn.apache.org/repos/asf/oodt/trunk/resource</developerConnection> + <url>http://svn.apache.org/viewvc/oodt/trunk/resource</url> + </scm> </project> Modified: oodt/branches/dependency-update/sso/pom.xml URL: http://svn.apache.org/viewvc/oodt/branches/dependency-update/sso/pom.xml?rev=1705302&r1=1705301&r2=1705302&view=diff ============================================================================== --- oodt/branches/dependency-update/sso/pom.xml (original) +++ oodt/branches/dependency-update/sso/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 @@ -24,33 +24,33 @@ the License. <relativePath>../core/pom.xml</relativePath> </parent> <artifactId>oodt-sso</artifactId> - <name>OODT Single Sign On Security Package</name> <packaging>jar</packaging> - <properties /> - <build> - <plugins /> - </build> + <name>OODT Single Sign On Security Package</name> + <properties></properties> <dependencies> <dependency> - <groupId>org.apache.oodt</groupId> - <artifactId>cas-metadata</artifactId> - <version>${project.parent.version}</version> + <groupId>commons-codec</groupId> + <artifactId>commons-codec</artifactId> + <version>1.3</version> </dependency> <dependency> <groupId>commons-httpclient</groupId> <artifactId>commons-httpclient</artifactId> <version>3.0</version> - </dependency> + </dependency> <dependency> <groupId>javax.servlet</groupId> <artifactId>servlet-api</artifactId> <version>2.4</version> </dependency> <dependency> - <groupId>commons-codec</groupId> - <artifactId>commons-codec</artifactId> - <version>1.3</version> - </dependency> + <groupId>org.apache.oodt</groupId> + <artifactId>cas-metadata</artifactId> + <version>${project.parent.version}</version> + </dependency> </dependencies> - <distributionManagement /> + <build> + <plugins></plugins> + </build> + <distributionManagement></distributionManagement> </project> Modified: oodt/branches/dependency-update/webapp/components/pom.xml URL: http://svn.apache.org/viewvc/oodt/branches/dependency-update/webapp/components/pom.xml?rev=1705302&r1=1705301&r2=1705302&view=diff ============================================================================== --- oodt/branches/dependency-update/webapp/components/pom.xml (original) +++ oodt/branches/dependency-update/webapp/components/pom.xml Fri Sep 25 13:35:50 2015 @@ -16,148 +16,148 @@ 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> - <artifactId>oodt-webapp-components</artifactId> - <packaging>jar</packaging> - <name>OODT Wicket Web Components</name> - <dependencies> - <dependency> - <groupId>org.apache.wicket</groupId> - <artifactId>wicket</artifactId> - <version>1.4.16</version> - </dependency> - <dependency> - <groupId>org.apache.oodt</groupId> - <artifactId>cas-filemgr</artifactId> - <version>0.11-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>org.apache.oodt</groupId> - <artifactId>cas-workflow</artifactId> - <version>0.11-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>org.apache.oodt</groupId> - <artifactId>pcs-core</artifactId> - <version>${project.parent.version}</version> - </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - <version>1.5.8</version> - </dependency> - <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - <version>1.2.14</version> - </dependency> - <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.8.1</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.reflections</groupId> - <artifactId>reflections</artifactId> - <version>0.9.9-RC1</version> - </dependency> - </dependencies> - <profiles> - <profile> - <id>audit</id> - <activation> - <activeByDefault>false</activeByDefault> - </activation> - <build> - <plugins> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>rat-maven-plugin</artifactId> - <executions> - <execution> - <phase>verify</phase> - <goals> - <goal>check</goal> - </goals> - </execution> - </executions> - <configuration> - <numUnapprovedLicenses>2</numUnapprovedLicenses> - <excludes> - <exclude>webapp/components/src/main/java/org/apache/oodt/cas/webcomponents/workflow/instance/prototype.js</exclude> - <exclude>webapp/components/src/main/java/org/apache/oodt/cas/webcomponents/workflow/instance/progress.js</exclude> - <exclude>webapp/components/src/main/java/org/apache/oodt/cas/webcomponents/curation/**/jquery*</exclude> - <exclude>webapp/components/src/main/java/org/apache/oodt/cas/webcomponents/curation/**/jquery/*</exclude> - <exclude>webapp/components/src/main/java/org/apache/oodt/cas/webcomponents/curation/**/src/jquery*</exclude> - <exclude>webapp/components/src/main/java/org/apache/oodt/cas/webcomponents/curation/**/jquery-treeview/*</exclude> - <exclude>webapp/components/src/main/java/org/apache/oodt/cas/webcomponents/curation/**/jquery-treeview/demo/*</exclude> - <exclude>webapp/components/src/main/java/org/apache/oodt/cas/webcomponents/curation/**/jquery-treeview/lib/*</exclude> - <exclude>webapp/components/src/main/java/org/apache/oodt/cas/webcomponents/curation/**/jquery-ui/*</exclude> - <exclude>webapp/components/src/main/java/org/apache/oodt/cas/webcomponents/curation/**/jquery-ui/css/smoothness/jquery-ui-1.7.2.custom.css</exclude> - <exclude>webapp/components/src/main/java/org/apache/oodt/cas/webcomponents/curation/**/src/MIT-License.txt</exclude> - <exclude>webapp/components/src/main/java/org/apache/oodt/cas/webcomponents/curation/**/media/Bach-SuiteNo2.mp3</exclude> - </excludes> - </configuration> - </plugin> - </plugins> - </build> - </profile> - </profiles> - <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> + + <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-webapp-components</artifactId> + <packaging>jar</packaging> + <name>OODT Wicket Web Components</name> + <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.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>cas-filemgr</artifactId> + <version>0.11-SNAPSHOT</version> + </dependency> + <dependency> + <groupId>org.apache.oodt</groupId> + <artifactId>cas-workflow</artifactId> + <version>0.11-SNAPSHOT</version> + </dependency> + <dependency> + <groupId>org.apache.oodt</groupId> + <artifactId>pcs-core</artifactId> + <version>${project.parent.version}</version> + </dependency> + <dependency> + <groupId>org.apache.wicket</groupId> + <artifactId>wicket</artifactId> + <version>1.4.16</version> + </dependency> + <dependency> + <groupId>org.reflections</groupId> + <artifactId>reflections</artifactId> + <version>0.9.9-RC1</version> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + <version>1.5.8</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> + <profiles> + <profile> + <id>audit</id> + <activation> + <activeByDefault>false</activeByDefault> + </activation> + <build> + <plugins> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>rat-maven-plugin</artifactId> + <configuration> + <numUnapprovedLicenses>2</numUnapprovedLicenses> + <excludes> + <exclude>webapp/components/src/main/java/org/apache/oodt/cas/webcomponents/workflow/instance/prototype.js</exclude> + <exclude>webapp/components/src/main/java/org/apache/oodt/cas/webcomponents/workflow/instance/progress.js</exclude> + <exclude>webapp/components/src/main/java/org/apache/oodt/cas/webcomponents/curation/**/jquery*</exclude> + <exclude>webapp/components/src/main/java/org/apache/oodt/cas/webcomponents/curation/**/jquery/*</exclude> + <exclude>webapp/components/src/main/java/org/apache/oodt/cas/webcomponents/curation/**/src/jquery*</exclude> + <exclude>webapp/components/src/main/java/org/apache/oodt/cas/webcomponents/curation/**/jquery-treeview/*</exclude> + <exclude>webapp/components/src/main/java/org/apache/oodt/cas/webcomponents/curation/**/jquery-treeview/demo/*</exclude> + <exclude>webapp/components/src/main/java/org/apache/oodt/cas/webcomponents/curation/**/jquery-treeview/lib/*</exclude> + <exclude>webapp/components/src/main/java/org/apache/oodt/cas/webcomponents/curation/**/jquery-ui/*</exclude> + <exclude>webapp/components/src/main/java/org/apache/oodt/cas/webcomponents/curation/**/jquery-ui/css/smoothness/jquery-ui-1.7.2.custom.css</exclude> + <exclude>webapp/components/src/main/java/org/apache/oodt/cas/webcomponents/curation/**/src/MIT-License.txt</exclude> + <exclude>webapp/components/src/main/java/org/apache/oodt/cas/webcomponents/curation/**/media/Bach-SuiteNo2.mp3</exclude> + </excludes> + </configuration> + <executions> + <execution> + <goals> + <goal>check</goal> + </goals> + <phase>verify</phase> + </execution> + </executions> + </plugin> + </plugins> + </build> + </profile> + </profiles> +</project> Modified: oodt/branches/dependency-update/webapp/fmbrowser/pom.xml URL: http://svn.apache.org/viewvc/oodt/branches/dependency-update/webapp/fmbrowser/pom.xml?rev=1705302&r1=1705301&r2=1705302&view=diff ============================================================================== --- oodt/branches/dependency-update/webapp/fmbrowser/pom.xml (original) +++ oodt/branches/dependency-update/webapp/fmbrowser/pom.xml Fri Sep 25 13:35:50 2015 @@ -16,123 +16,123 @@ 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>fmbrowser</artifactId> - <packaging>war</packaging> - <version>0.11-SNAPSHOT</version> - <name>CAS File Manager Browser 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/fmbrowser</connection> - <developerConnection>scm:svn:https://svn.apache.org/repos/asf/oodt/trunk/webapp/fmbrowser</developerConnection> - <url>http://svn.apache.org/viewvc/oodt/trunk/webapp/fmbrowser</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> - </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>fmbrowser</artifactId> + <version>0.11-SNAPSHOT</version> + <packaging>war</packaging> + <name>CAS File Manager Browser 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> + <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> + </dependency> + <dependency> + <groupId>org.apache.wicket</groupId> + <artifactId>wicket</artifactId> + <version>${wicket.version}</version> + </dependency> - <!-- JUNIT DEPENDENCY FOR TESTING --> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>4.8.1</version> - <scope>test</scope> - </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-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> - <!-- 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> + <!-- 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/fmbrowser</connection> + <developerConnection>scm:svn:https://svn.apache.org/repos/asf/oodt/trunk/webapp/fmbrowser</developerConnection> + <url>http://svn.apache.org/viewvc/oodt/trunk/webapp/fmbrowser</url> + </scm> +</project>
