You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@oodt.apache.org by ma...@apache.org on 2016/11/10 15:25:22 UTC
oodt git commit: OODT-938 fix netcdf so it uses non-fat jar
Repository: oodt
Updated Branches:
refs/heads/master 25b243330 -> b1c5560d9
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/b1c5560d
Tree: http://git-wip-us.apache.org/repos/asf/oodt/tree/b1c5560d
Diff: http://git-wip-us.apache.org/repos/asf/oodt/diff/b1c5560d
Branch: refs/heads/master
Commit: b1c5560d9de5c17037b5f1803a91578bcc834dad
Parents: 25b2433
Author: Tom Barber <to...@analytical-labs.com>
Authored: Thu Nov 10 15:25:07 2016 +0000
Committer: Tom Barber <to...@analytical-labs.com>
Committed: Thu Nov 10 15:25:07 2016 +0000
----------------------------------------------------------------------
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/b1c5560d/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/b1c5560d/core/pom.xml
----------------------------------------------------------------------
diff --git a/core/pom.xml b/core/pom.xml
index 89f0308..ad4c77f 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/b1c5560d/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/b1c5560d/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);