You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@avro.apache.org by fo...@apache.org on 2019/05/27 12:36:32 UTC
[avro] branch master updated: AVRO-2405 Make Travis green again
(#527)
This is an automated email from the ASF dual-hosted git repository.
fokko pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/avro.git
The following commit(s) were added to refs/heads/master by this push:
new 48e518f AVRO-2405 Make Travis green again (#527)
48e518f is described below
commit 48e518f5e7ad0e1bd456537e6ae0e640d5a46ef2
Author: Fokko Driesprong <fo...@apache.org>
AuthorDate: Mon May 27 14:36:27 2019 +0200
AVRO-2405 Make Travis green again (#527)
* AVRO-2405 Make Travis green again
* Disable Forest for JDK11
* Remove Apache Forrest from the Dockerfile
* Remove Forrest references
---
.travis.yml | 4 ++--
.../maven-plugin/src/test/resources/unit/idl/pom-joda.xml | 2 +-
.../src/test/resources/unit/idl/pom-jsr310.xml | 2 +-
.../src/test/resources/unit/protocol/pom-joda.xml | 2 +-
.../src/test/resources/unit/protocol/pom-jsr310.xml | 2 +-
.../src/test/resources/unit/schema/pom-joda.xml | 2 +-
.../src/test/resources/unit/schema/pom-jsr310.xml | 2 +-
share/VERSION.txt | 2 +-
share/docker/Dockerfile | 15 ---------------
9 files changed, 9 insertions(+), 24 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index c4b3cbb..8249b6a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -36,5 +36,5 @@ before_install:
- curl -L https://www-us.apache.org/dist/yetus/0.8.0/yetus-0.8.0-bin.tar.gz | tar xvz -C /tmp/
script:
- - sed 's/java:8-jdk/java:'${JAVA}'-jdk/' share/docker/Dockerfile
- - /tmp/yetus-0.8.0/bin/test-patch --plugins=buildtest --user-plugins=share/precommit/ --run-tests --empty-patch --docker --dockerfile=share/docker/Dockerfile --dirty-workspace --verbose=true
+ - sed -i.bak 's/openjdk:8/openjdk:'${JAVA}'/' share/docker/Dockerfile
+ - /tmp/yetus-0.8.0/bin/test-patch --plugins=buildtest --java-home=/usr/local/openjdk-${JAVA} --user-plugins=share/precommit/ --run-tests --empty-patch --docker --dockerfile=share/docker/Dockerfile --dirty-workspace --verbose=true
diff --git a/lang/java/maven-plugin/src/test/resources/unit/idl/pom-joda.xml b/lang/java/maven-plugin/src/test/resources/unit/idl/pom-joda.xml
index c011303..3ba9ea6 100644
--- a/lang/java/maven-plugin/src/test/resources/unit/idl/pom-joda.xml
+++ b/lang/java/maven-plugin/src/test/resources/unit/idl/pom-joda.xml
@@ -22,7 +22,7 @@
<parent>
<artifactId>avro-parent</artifactId>
<groupId>org.apache.avro</groupId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<relativePath>../../../../../../../../../pom.xml</relativePath>
</parent>
diff --git a/lang/java/maven-plugin/src/test/resources/unit/idl/pom-jsr310.xml b/lang/java/maven-plugin/src/test/resources/unit/idl/pom-jsr310.xml
index ae9266a..1193e24 100644
--- a/lang/java/maven-plugin/src/test/resources/unit/idl/pom-jsr310.xml
+++ b/lang/java/maven-plugin/src/test/resources/unit/idl/pom-jsr310.xml
@@ -22,7 +22,7 @@
<parent>
<artifactId>avro-parent</artifactId>
<groupId>org.apache.avro</groupId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<relativePath>../../../../../../../../../pom.xml</relativePath>
</parent>
diff --git a/lang/java/maven-plugin/src/test/resources/unit/protocol/pom-joda.xml b/lang/java/maven-plugin/src/test/resources/unit/protocol/pom-joda.xml
index e10462e..2904bb6 100644
--- a/lang/java/maven-plugin/src/test/resources/unit/protocol/pom-joda.xml
+++ b/lang/java/maven-plugin/src/test/resources/unit/protocol/pom-joda.xml
@@ -22,7 +22,7 @@
<parent>
<artifactId>avro-parent</artifactId>
<groupId>org.apache.avro</groupId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<relativePath>../../../../../../../../../pom.xml</relativePath>
</parent>
diff --git a/lang/java/maven-plugin/src/test/resources/unit/protocol/pom-jsr310.xml b/lang/java/maven-plugin/src/test/resources/unit/protocol/pom-jsr310.xml
index 969970a..2140d00 100644
--- a/lang/java/maven-plugin/src/test/resources/unit/protocol/pom-jsr310.xml
+++ b/lang/java/maven-plugin/src/test/resources/unit/protocol/pom-jsr310.xml
@@ -22,7 +22,7 @@
<parent>
<artifactId>avro-parent</artifactId>
<groupId>org.apache.avro</groupId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<relativePath>../../../../../../../../../pom.xml</relativePath>
</parent>
diff --git a/lang/java/maven-plugin/src/test/resources/unit/schema/pom-joda.xml b/lang/java/maven-plugin/src/test/resources/unit/schema/pom-joda.xml
index 621b6bb..6a944c9 100644
--- a/lang/java/maven-plugin/src/test/resources/unit/schema/pom-joda.xml
+++ b/lang/java/maven-plugin/src/test/resources/unit/schema/pom-joda.xml
@@ -22,7 +22,7 @@
<parent>
<artifactId>avro-parent</artifactId>
<groupId>org.apache.avro</groupId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<relativePath>../../../../../../../../../pom.xml</relativePath>
</parent>
diff --git a/lang/java/maven-plugin/src/test/resources/unit/schema/pom-jsr310.xml b/lang/java/maven-plugin/src/test/resources/unit/schema/pom-jsr310.xml
index 62cf887..40c8f89 100644
--- a/lang/java/maven-plugin/src/test/resources/unit/schema/pom-jsr310.xml
+++ b/lang/java/maven-plugin/src/test/resources/unit/schema/pom-jsr310.xml
@@ -22,7 +22,7 @@
<parent>
<artifactId>avro-parent</artifactId>
<groupId>org.apache.avro</groupId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<relativePath>../../../../../../../../../pom.xml</relativePath>
</parent>
diff --git a/share/VERSION.txt b/share/VERSION.txt
index 06898e3..8c29cb4 100644
--- a/share/VERSION.txt
+++ b/share/VERSION.txt
@@ -1 +1 @@
-1.9.0-SNAPSHOT
\ No newline at end of file
+1.10.0-SNAPSHOT
diff --git a/share/docker/Dockerfile b/share/docker/Dockerfile
index 4147c46..b350480 100644
--- a/share/docker/Dockerfile
+++ b/share/docker/Dockerfile
@@ -78,21 +78,6 @@ RUN apt-get -qq update && \
apt-get -qq clean && \
rm -rf /var/lib/apt/lists/*
-# Install Forrest in /usr/local/apache-forrest
-RUN curl -L -s "http://www.apache.org/dyn/closer.lua?action=download&filename=/forrest/apache-forrest-0.9-sources.tar.gz" | tar -xzf - -C /usr/local/ && \
- curl -L -s "http://www.apache.org/dyn/closer.lua?action=download&filename=/forrest/apache-forrest-0.9-dependencies.tar.gz" | tar -xzf - -C /usr/local/ && \
- mv /usr/local/apache-forrest-0.9 /usr/local/apache-forrest && \
- cd /usr/local/apache-forrest/main && \
- ./build.sh
-
-# The solution for https://issues.apache.org/jira/browse/PIG-3906
-# Configure where forrest can be found
-RUN mkdir -p /usr/local/apache-forrest/plugins && chmod a+rwX -R /usr/local/apache-forrest/plugins && \
- mkdir -p /usr/local/apache-forrest/build/plugins && chmod a+rwX -R /usr/local/apache-forrest/build/plugins && \
- echo 'forrest.home=/usr/local/apache-forrest' > build.properties
-
-ENV FORREST_HOME /usr/local/apache-forrest
-
# Install Perl modules
RUN curl -L http://cpanmin.us | perl - --self-upgrade && \
cpanm install Module::Install Module::Install::ReadmeFromPod \