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 2017/03/09 15:03:33 UTC
[1/3] oodt git commit: remove invalid tags
Repository: oodt
Updated Branches:
refs/heads/master b1c5560d9 -> 1ae92425e
remove invalid tags
Project: http://git-wip-us.apache.org/repos/asf/oodt/repo
Commit: http://git-wip-us.apache.org/repos/asf/oodt/commit/c1af9b0a
Tree: http://git-wip-us.apache.org/repos/asf/oodt/tree/c1af9b0a
Diff: http://git-wip-us.apache.org/repos/asf/oodt/diff/c1af9b0a
Branch: refs/heads/master
Commit: c1af9b0a71b4ab987314e66e2e1a644d36ae1567
Parents: b1c5560
Author: Tom Barber <to...@analytical-labs.com>
Authored: Thu Nov 10 15:46:21 2016 +0000
Committer: Tom Barber <to...@analytical-labs.com>
Committed: Thu Nov 10 15:46:21 2016 +0000
----------------------------------------------------------------------
core/pom.xml | 3 ---
1 file changed, 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/oodt/blob/c1af9b0a/core/pom.xml
----------------------------------------------------------------------
diff --git a/core/pom.xml b/core/pom.xml
index ad4c77f..019eee2 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -612,7 +612,6 @@ mm
<artifactId>maven-javadoc-plugin</artifactId>
<version>2.9</version>
<configuration>
- <outputEncoding>UTF-8</outputEncoding>
<charset>UTF-8</charset>
<docencoding>UTF-8</docencoding>
<encoding>UTF-8</encoding>
@@ -655,7 +654,6 @@ mm
<artifactId>maven-javadoc-plugin</artifactId>
<version>2.10.4</version>
<configuration>
- <outputEncoding>UTF-8</outputEncoding>
<charset>UTF-8</charset>
<docencoding>UTF-8</docencoding>
<encoding>UTF-8</encoding>
@@ -965,7 +963,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>
[2/3] oodt git commit: update Dockerfile with patch from OODT-948
Posted by ma...@apache.org.
update Dockerfile with patch from OODT-948
Project: http://git-wip-us.apache.org/repos/asf/oodt/repo
Commit: http://git-wip-us.apache.org/repos/asf/oodt/commit/3ea6d517
Tree: http://git-wip-us.apache.org/repos/asf/oodt/tree/3ea6d517
Diff: http://git-wip-us.apache.org/repos/asf/oodt/diff/3ea6d517
Branch: refs/heads/master
Commit: 3ea6d5171101d07c66b163e7e0c27205dacd5b74
Parents: c1af9b0
Author: Tom Barber <to...@analytical-labs.com>
Authored: Thu Mar 9 15:02:43 2017 +0000
Committer: Tom Barber <to...@analytical-labs.com>
Committed: Thu Mar 9 15:02:43 2017 +0000
----------------------------------------------------------------------
docker/Dockerfile | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/oodt/blob/3ea6d517/docker/Dockerfile
----------------------------------------------------------------------
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 708e9bc..3180f57 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -1,10 +1,10 @@
FROM ubuntu:latest
MAINTAINER Tom Barber
-ENV JAVA_HOME /usr/lib/jvm/java-7-openjdk-amd64/
+ENV JAVA_HOME /usr/lib/jvm/java-8-openjdk-amd64/
-RUN sudo apt-get update
-RUN sudo apt-get install -y openjdk-7-jre-headless openjdk-7-jre maven curl
+RUN apt-get update
+RUN apt-get install -y openjdk-8-jre-headless openjdk-8-jre maven curl
#RUN sudo apt-get install maven2
WORKDIR /usr/src
[3/3] oodt git commit: update Changes
Posted by ma...@apache.org.
update Changes
Project: http://git-wip-us.apache.org/repos/asf/oodt/repo
Commit: http://git-wip-us.apache.org/repos/asf/oodt/commit/1ae92425
Tree: http://git-wip-us.apache.org/repos/asf/oodt/tree/1ae92425
Diff: http://git-wip-us.apache.org/repos/asf/oodt/diff/1ae92425
Branch: refs/heads/master
Commit: 1ae92425ec3e7e0d0f026cbcc142ab17988cd071
Parents: 3ea6d51
Author: Tom Barber <to...@analytical-labs.com>
Authored: Thu Mar 9 15:03:24 2017 +0000
Committer: Tom Barber <to...@analytical-labs.com>
Committed: Thu Mar 9 15:03:24 2017 +0000
----------------------------------------------------------------------
CHANGES.txt | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/oodt/blob/1ae92425/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 9510096..ed72a94 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -3,6 +3,8 @@ Apache OODT Change Log
Release 1.1 - Current Development
+* OODT-948 Fix dockerfile (magicaltrout/R B Krishna)
+
* OODT-938 update netcdf (magicaltrout)
* OODT-943 update javadoc and site plugin versions (magicaltrout)