Repository: oodt Updated Branches: refs/heads/master be35c7898 -> f5ebb4288
OODT-882 remove versions from missed pom, upgrade easymock to try and fix it on jenkins Project: http://git-wip-us.apache.org/repos/asf/oodt/repo Commit: http://git-wip-us.apache.org/repos/asf/oodt/commit/f5ebb428 Tree: http://git-wip-us.apache.org/repos/asf/oodt/tree/f5ebb428 Diff: http://git-wip-us.apache.org/repos/asf/oodt/diff/f5ebb428 Branch: refs/heads/master Commit: f5ebb4288bed671e3b79779e8bd3861a13ec1f1f Parents: be35c78 Author: Tom Barber <[email protected]> Authored: Tue Oct 6 20:41:09 2015 +0100 Committer: Tom Barber <[email protected]> Committed: Tue Oct 6 20:41:09 2015 +0100 ---------------------------------------------------------------------- core/pom.xml | 94 +++++++++++++++++++++++++++++++++++++++++++++---------- pge/pom.xml | 15 --------- 2 files changed, 78 insertions(+), 31 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/oodt/blob/f5ebb428/core/pom.xml ---------------------------------------------------------------------- diff --git a/core/pom.xml b/core/pom.xml index 403b32b..f3498fc 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -105,6 +105,11 @@ the License. <version>2.1</version> </dependency> <dependency> + <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> @@ -125,6 +130,11 @@ the License. <version>2.3</version> </dependency> <dependency> + <groupId>commons-lang</groupId> + <artifactId>commons-lang</artifactId> + <version>2.6</version> + </dependency> + <dependency> <groupId>commons-logging</groupId> <artifactId>commons-logging</artifactId> <version>1.0.3</version> @@ -160,6 +170,12 @@ the License. <version>4.12</version> </dependency> <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>3.8.2</version> + <scope>test</scope> + </dependency> + <dependency> <groupId>log4j</groupId> <artifactId>log4j</artifactId> <version>1.2.14</version> @@ -180,6 +196,15 @@ the License. <version>3.2.0</version> </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> + </dependency> + <dependency> <groupId>net.sf.json-lib</groupId> <artifactId>json-lib</artifactId> <version>2.4</version> @@ -206,13 +231,9 @@ the License. <version>2.0.1</version> </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>net.sf.saxon</groupId> + <artifactId>saxon-dom</artifactId> + <version>8.7</version> </dependency> <dependency> <groupId>org.apache.cxf</groupId> @@ -278,11 +299,26 @@ the License. </dependency> <dependency> <groupId>org.apache.oodt</groupId> + <artifactId>cas-crawler</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.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-metadata</artifactId> <version>${project.parent.version}</version> </dependency> @@ -294,8 +330,8 @@ the License. <dependency> <groupId>org.apache.oodt</groupId> <artifactId>cas-product</artifactId> - <type>war</type> <version>${project.parent.version}</version> + <type>war</type> </dependency> <dependency> <groupId>org.apache.oodt</groupId> @@ -314,6 +350,11 @@ the License. </dependency> <dependency> <groupId>org.apache.oodt</groupId> + <artifactId>cas-workflow</artifactId> + <version>${project.parent.version}</version> + </dependency> + <dependency> + <groupId>org.apache.oodt</groupId> <artifactId>curator-services</artifactId> <version>${project.parent.version}</version> <type>war</type> @@ -325,6 +366,11 @@ the License. </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> </dependency> @@ -394,6 +440,11 @@ the License. <version>1.7</version> </dependency> <dependency> + <groupId>org.apache.velocity</groupId> + <artifactId>velocity</artifactId> + <version>1.7</version> + </dependency> + <dependency> <groupId>org.apache.wicket</groupId> <artifactId>wicket</artifactId> <version>${wicket.version}</version> @@ -411,6 +462,12 @@ the License. <dependency> <groupId>org.easymock</groupId> <artifactId>easymock</artifactId> + <version>3.4</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.easymock</groupId> + <artifactId>easymock</artifactId> <version>3.1</version> <scope>test</scope> </dependency> @@ -444,13 +501,13 @@ the License. </dependency> <dependency> <groupId>org.mortbay.jetty</groupId> - <artifactId>jetty-util</artifactId> + <artifactId>jetty-management</artifactId> <version>${jetty.version}</version> <scope>provided</scope> </dependency> <dependency> <groupId>org.mortbay.jetty</groupId> - <artifactId>jetty-management</artifactId> + <artifactId>jetty-util</artifactId> <version>${jetty.version}</version> <scope>provided</scope> </dependency> @@ -478,17 +535,17 @@ the License. </dependency> <dependency> <groupId>org.slf4j</groupId> - <artifactId>slf4j-simple</artifactId> + <artifactId>slf4j-log4j</artifactId> <version>1.7.12</version> </dependency> <dependency> <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j</artifactId> + <artifactId>slf4j-log4j12</artifactId> <version>1.7.12</version> </dependency> <dependency> <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> + <artifactId>slf4j-simple</artifactId> <version>1.7.12</version> </dependency> <dependency> @@ -498,18 +555,23 @@ the License. </dependency> <dependency> <groupId>org.springframework</groupId> + <artifactId>spring-beans</artifactId> + <version>2.5.4</version> + </dependency> + <dependency> + <groupId>org.springframework</groupId> <artifactId>spring-context</artifactId> <version>2.5.4</version> </dependency> <dependency> <groupId>org.springframework</groupId> - <artifactId>spring-core</artifactId> + <artifactId>spring-context</artifactId> <version>2.5.4</version> </dependency> <dependency> <groupId>org.springframework</groupId> - <artifactId>spring-hibernate3</artifactId> - <version>2.0.8</version> + <artifactId>spring-core</artifactId> + <version>2.5.4</version> </dependency> <dependency> <groupId>org.springframework</groupId> http://git-wip-us.apache.org/repos/asf/oodt/blob/f5ebb428/pge/pom.xml ---------------------------------------------------------------------- diff --git a/pge/pom.xml b/pge/pom.xml index fd9ee04..4475ff2 100644 --- a/pge/pom.xml +++ b/pge/pom.xml @@ -51,79 +51,64 @@ the License. <dependency> <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> - <version>10.0.1</version> </dependency> <dependency> <groupId>commons-collections</groupId> <artifactId>commons-collections</artifactId> - <version>3.2.1</version> </dependency> <dependency> <groupId>commons-lang</groupId> <artifactId>commons-lang</artifactId> - <version>2.6</version> </dependency> <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <version>3.8.2</version> <scope>test</scope> </dependency> <dependency> <groupId>net.sf.saxon</groupId> <artifactId>saxon-dom</artifactId> - <version>8.7</version> </dependency> <dependency> <groupId>org.apache.oodt</groupId> <artifactId>cas-crawler</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.oodt</groupId> <artifactId>cas-metadata</artifactId> - <version>${project.parent.version}</version> </dependency> <dependency> <groupId>org.apache.oodt</groupId> <artifactId>cas-workflow</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.velocity</groupId> <artifactId>velocity</artifactId> - <version>1.7</version> </dependency> <dependency> <groupId>org.easymock</groupId> <artifactId>easymock</artifactId> - <version>3.1</version> <scope>test</scope> </dependency> <dependency> <groupId>org.springframework</groupId> <artifactId>spring-beans</artifactId> - <version>2.5.4</version> </dependency> <dependency> <groupId>org.springframework</groupId> <artifactId>spring-context</artifactId> - <version>2.5.4</version> </dependency> <dependency> <groupId>org.springframework</groupId> <artifactId>spring-core</artifactId> - <version>2.5.4</version> </dependency> </dependencies> <build>
