OODT-938 fix netcdf so it uses non-fat jar
Project: http://git-wip-us.apache.org/repos/asf/oodt/repo Commit: http://git-wip-us.apache.org/repos/asf/oodt/commit/b1e39db9 Tree: http://git-wip-us.apache.org/repos/asf/oodt/tree/b1e39db9 Diff: http://git-wip-us.apache.org/repos/asf/oodt/diff/b1e39db9 Branch: refs/heads/master Commit: b1e39db96d686633c6bff7b66f44fcf7aae4fcf3 Parents: a5d6730 Author: Tom Barber <[email protected]> Authored: Thu Nov 10 15:25:07 2016 +0000 Committer: Lewis John McGibbney <[email protected]> Committed: Thu Mar 9 21:42:19 2017 -0800 ---------------------------------------------------------------------- CHANGES.txt | 4 ++++ core/pom.xml | 9 +++++++-- opendapps/pom.xml | 6 +++++- .../java/org/apache/oodt/opendapps/DatasetExtractor.java | 5 +++++ 4 files changed, 21 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/oodt/blob/b1e39db9/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index e779398..9510096 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -3,6 +3,10 @@ Apache OODT Change Log Release 1.1 - Current Development +* OODT-938 update netcdf (magicaltrout) + +* OODT-943 update javadoc and site plugin versions (magicaltrout) + * OODT-931 CAS Crawler and metadata preconditions should say what preconditions failed (mattmann) http://git-wip-us.apache.org/repos/asf/oodt/blob/b1e39db9/core/pom.xml ---------------------------------------------------------------------- diff --git a/core/pom.xml b/core/pom.xml index 55392c4..3b7b857 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -154,8 +154,13 @@ the License. </dependency> <dependency> <groupId>edu.ucar</groupId> - <artifactId>netcdf</artifactId> - <version>4.2</version> + <artifactId>netcdf4</artifactId> + <version>4.5.5</version> + </dependency> + <dependency> + <groupId>edu.ucar</groupId> + <artifactId>opendap</artifactId> + <version>2.2.2</version> </dependency> <dependency> <groupId>hsqldb</groupId> http://git-wip-us.apache.org/repos/asf/oodt/blob/b1e39db9/opendapps/pom.xml ---------------------------------------------------------------------- diff --git a/opendapps/pom.xml b/opendapps/pom.xml index 7f7f051..0d8b27c 100644 --- a/opendapps/pom.xml +++ b/opendapps/pom.xml @@ -51,7 +51,11 @@ <dependencies> <dependency> <groupId>edu.ucar</groupId> - <artifactId>netcdf</artifactId> + <artifactId>netcdf4</artifactId> + </dependency> + <dependency> + <groupId>edu.ucar</groupId> + <artifactId>opendap</artifactId> </dependency> <dependency> <groupId>org.apache.oodt</groupId> http://git-wip-us.apache.org/repos/asf/oodt/blob/b1e39db9/opendapps/src/main/java/org/apache/oodt/opendapps/DatasetExtractor.java ---------------------------------------------------------------------- diff --git a/opendapps/src/main/java/org/apache/oodt/opendapps/DatasetExtractor.java b/opendapps/src/main/java/org/apache/oodt/opendapps/DatasetExtractor.java index 192494c..ba22df8 100644 --- a/opendapps/src/main/java/org/apache/oodt/opendapps/DatasetExtractor.java +++ b/opendapps/src/main/java/org/apache/oodt/opendapps/DatasetExtractor.java @@ -107,6 +107,11 @@ public class DatasetExtractor { LOG.log(Level.WARNING, msg); } + @Override + public void setProgress(String s, int i) { + + } + }; LOG.log(Level.FINE, "catalogURL: " + this.mainCatalogURL);
