Repository: oodt Updated Branches: refs/heads/avro_rpc ab96c215d -> cbd9d0d68
update some dependencies Project: http://git-wip-us.apache.org/repos/asf/oodt/repo Commit: http://git-wip-us.apache.org/repos/asf/oodt/commit/bb6358f5 Tree: http://git-wip-us.apache.org/repos/asf/oodt/tree/bb6358f5 Diff: http://git-wip-us.apache.org/repos/asf/oodt/diff/bb6358f5 Branch: refs/heads/avro_rpc Commit: bb6358f526247f7f61d18625109bd5cdedfc6be7 Parents: ab96c21 Author: Tom Barber <[email protected]> Authored: Wed Jul 6 14:25:31 2016 +0100 Committer: Tom Barber <[email protected]> Committed: Wed Jul 6 14:25:31 2016 +0100 ---------------------------------------------------------------------- core/pom.xml | 54 +++++++++++--------- filemgr/pom.xml | 5 +- .../examples/TestTikaAutoDetectExtractor.java | 5 -- .../oodt/opendapps/util/ProfileUtils.java | 4 -- protocol/http/pom.xml | 2 +- 5 files changed, 34 insertions(+), 36 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/oodt/blob/bb6358f5/core/pom.xml ---------------------------------------------------------------------- diff --git a/core/pom.xml b/core/pom.xml index ccebd33..6fafae6 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -70,12 +70,12 @@ the License. <dependency> <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> - <version>10.0.1</version> + <version>19.0</version> </dependency> <dependency> <groupId>com.icegreen</groupId> <artifactId>greenmail</artifactId> - <version>1.3.1b</version> + <version>1.5.0</version> <scope>test</scope> </dependency> <dependency> @@ -93,32 +93,32 @@ the License. <dependency> <groupId>commons-cli</groupId> <artifactId>commons-cli</artifactId> - <version>1.2</version> + <version>1.3.1</version> </dependency> <dependency> <groupId>commons-codec</groupId> <artifactId>commons-codec</artifactId> - <version>1.3</version> + <version>1.10</version> </dependency> <dependency> <groupId>commons-collections</groupId> <artifactId>commons-collections</artifactId> - <version>3.2.1</version> + <version>3.2.2</version> </dependency> <dependency> <groupId>commons-dbcp</groupId> <artifactId>commons-dbcp</artifactId> - <version>1.2.1</version> + <version>1.4</version> </dependency> <dependency> <groupId>commons-httpclient</groupId> <artifactId>commons-httpclient</artifactId> - <version>3.0</version> + <version>3.1</version> </dependency> <dependency> <groupId>commons-io</groupId> <artifactId>commons-io</artifactId> - <version>1.4</version> + <version>2.5</version> </dependency> <dependency> <groupId>commons-lang</groupId> @@ -128,12 +128,12 @@ the License. <dependency> <groupId>commons-logging</groupId> <artifactId>commons-logging</artifactId> - <version>1.0.3</version> + <version>1.2</version> </dependency> <dependency> <groupId>commons-pool</groupId> <artifactId>commons-pool</artifactId> - <version>1.2</version> + <version>1.6</version> </dependency> <dependency> <groupId>concurrent</groupId> @@ -163,7 +163,7 @@ the License. <dependency> <groupId>joda-time</groupId> <artifactId>joda-time</artifactId> - <version>2.5</version> + <version>2.9.4</version> </dependency> <dependency> <groupId>junit</groupId> @@ -178,12 +178,12 @@ the License. <dependency> <groupId>mysql</groupId> <artifactId>mysql-connector-java</artifactId> - <version>5.1.26</version> + <version>6.0.3</version> </dependency> <dependency> - <groupId>nekohtml</groupId> + <groupId>net.sourceforge.nekohtml</groupId> <artifactId>nekohtml</artifactId> - <version>1.9.6.2</version> + <version>1.9.22</version> </dependency> <dependency> <groupId>net.alchim31.maven</groupId> @@ -197,7 +197,7 @@ the License. --> <groupId>net.lingala.zip4j</groupId> <artifactId>zip4j</artifactId> - <version>1.3.1</version> + <version>1.3.2</version> </dependency> <dependency> <groupId>net.sf.json-lib</groupId> @@ -223,7 +223,7 @@ the License. <dependency> <groupId>net.sf.jung</groupId> <artifactId>jung-visualization</artifactId> - <version>2.0.1</version> + <version>2.1</version> </dependency> <dependency> <groupId>net.sf.saxon</groupId> @@ -231,30 +231,35 @@ the License. <version>8.7</version> </dependency> <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-compress</artifactId> + <version>1.12</version> + </dependency> + <dependency> <groupId>org.apache.cxf</groupId> <artifactId>cxf-rt-frontend-jaxrs</artifactId> - <version>2.6.0</version> + <version>3.1.6</version> </dependency> <dependency> <groupId>org.apache.cxf</groupId> <artifactId>cxf-rt-rs-extension-providers</artifactId> - <version>2.6.8</version> + <version>3.1.6</version> </dependency> <dependency> <groupId>org.apache.cxf</groupId> <artifactId>cxf-rt-transports-local</artifactId> - <version>2.6.8</version> + <version>3.1.6</version> <scope>test</scope> </dependency> <dependency> <groupId>org.apache.ftpserver</groupId> <artifactId>ftpserver-core</artifactId> - <version>1.0.5</version> + <version>1.0.6</version> </dependency> <dependency> <groupId>org.apache.geronimo.javamail</groupId> <artifactId>geronimo-javamail_1.4_mail</artifactId> - <version>1.8.1</version> + <version>1.8.4</version> </dependency> <dependency> <groupId>org.apache.geronimo.specs</groupId> @@ -264,7 +269,7 @@ the License. <dependency> <groupId>org.apache.httpcomponents</groupId> <artifactId>httpclient</artifactId> - <version>4.2.5</version> + <version>4.5.2</version> </dependency> <dependency> <groupId>org.apache.jena</groupId> @@ -387,12 +392,12 @@ the License. <dependency> <groupId>org.apache.tika</groupId> <artifactId>tika-core</artifactId> - <version>1.10</version> + <version>1.13</version> </dependency> <dependency> <groupId>org.apache.tika</groupId> <artifactId>tika-parsers</artifactId> - <version>1.7</version> + <version>1.13</version> </dependency> <dependency> <groupId>org.apache.velocity</groupId> @@ -938,7 +943,6 @@ mm <artifactId>maven-javadoc-plugin</artifactId> <version>2.10.3</version> <configuration> - <outputEncoding>UTF-8</outputEncoding> <charset>UTF-8</charset> <docencoding>UTF-8</docencoding> <encoding>UTF-8</encoding> http://git-wip-us.apache.org/repos/asf/oodt/blob/bb6358f5/filemgr/pom.xml ---------------------------------------------------------------------- diff --git a/filemgr/pom.xml b/filemgr/pom.xml index daa5bf4..d4b77a7 100644 --- a/filemgr/pom.xml +++ b/filemgr/pom.xml @@ -62,7 +62,10 @@ <artifactId>avro-ipc</artifactId> <version>1.8.1</version> </dependency> - + <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-compress</artifactId> + </dependency> <dependency> <groupId>com.amazonaws</groupId> <artifactId>aws-java-sdk</artifactId> http://git-wip-us.apache.org/repos/asf/oodt/blob/bb6358f5/filemgr/src/test/java/org/apache/oodt/cas/filemgr/metadata/extractors/examples/TestTikaAutoDetectExtractor.java ---------------------------------------------------------------------- diff --git a/filemgr/src/test/java/org/apache/oodt/cas/filemgr/metadata/extractors/examples/TestTikaAutoDetectExtractor.java b/filemgr/src/test/java/org/apache/oodt/cas/filemgr/metadata/extractors/examples/TestTikaAutoDetectExtractor.java index 189f369..03011ee 100644 --- a/filemgr/src/test/java/org/apache/oodt/cas/filemgr/metadata/extractors/examples/TestTikaAutoDetectExtractor.java +++ b/filemgr/src/test/java/org/apache/oodt/cas/filemgr/metadata/extractors/examples/TestTikaAutoDetectExtractor.java @@ -17,7 +17,6 @@ package org.apache.oodt.cas.filemgr.metadata.extractors.examples; -//JDK imports import org.apache.oodt.cas.filemgr.structs.Product; import org.apache.oodt.cas.filemgr.structs.Reference; import org.apache.oodt.cas.metadata.Metadata; @@ -30,10 +29,6 @@ import java.net.URL; import static junit.framework.Assert.*; -//Junit imports -// JUnit static imports -//OODT imports - @RunWith(JUnit4.class) public class TestTikaAutoDetectExtractor { http://git-wip-us.apache.org/repos/asf/oodt/blob/bb6358f5/opendapps/src/main/java/org/apache/oodt/opendapps/util/ProfileUtils.java ---------------------------------------------------------------------- diff --git a/opendapps/src/main/java/org/apache/oodt/opendapps/util/ProfileUtils.java b/opendapps/src/main/java/org/apache/oodt/opendapps/util/ProfileUtils.java index 8ed95f9..f116800 100644 --- a/opendapps/src/main/java/org/apache/oodt/opendapps/util/ProfileUtils.java +++ b/opendapps/src/main/java/org/apache/oodt/opendapps/util/ProfileUtils.java @@ -52,10 +52,6 @@ import opendap.dap.DGrid; import static org.apache.oodt.opendapps.config.OpendapConfigMetKeys.*; -//JDK imports -//OPENDAP imports -//OODT imports - /** * * Static methods for unraveling and generating {@link ProfileElement}s, http://git-wip-us.apache.org/repos/asf/oodt/blob/bb6358f5/protocol/http/pom.xml ---------------------------------------------------------------------- diff --git a/protocol/http/pom.xml b/protocol/http/pom.xml index 22013f5..4aaf834 100644 --- a/protocol/http/pom.xml +++ b/protocol/http/pom.xml @@ -50,7 +50,7 @@ <scope>test</scope> </dependency> <dependency> - <groupId>nekohtml</groupId> + <groupId>net.sourceforge.nekohtml</groupId> <artifactId>nekohtml</artifactId> </dependency> <dependency>
