You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@avro.apache.org by dk...@apache.org on 2018/11/29 17:56:52 UTC
[avro] branch master updated: AVRO-2279: Fix broken java build on
windows
This is an automated email from the ASF dual-hosted git repository.
dkulp 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 226013f AVRO-2279: Fix broken java build on windows
226013f is described below
commit 226013fdc311fca600af1207e756518e1b153de8
Author: Ismaël Mejía <ie...@gmail.com>
AuthorDate: Thu Nov 29 15:43:49 2018 +0100
AVRO-2279: Fix broken java build on windows
---
.gitignore | 1 +
lang/java/grpc/pom.xml | 11 +++++++++++
lang/java/maven-plugin/pom.xml | 4 ----
lang/java/pom.xml | 13 ++++++++++++-
lang/java/protobuf/pom.xml | 1 +
lang/java/thrift/pom.xml | 1 +
lang/java/tools/pom.xml | 1 +
pom.xml | 13 ++++++++++---
8 files changed, 37 insertions(+), 8 deletions(-)
diff --git a/.gitignore b/.gitignore
index 83e7336..edb7931 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,3 +16,4 @@ test-output
/lang/java/compiler/nbactions.xml
/lang/java/compiler/nb-configuration.xml
/lang/java/compiler/nbproject/
+**/.vscode/**/*
diff --git a/lang/java/grpc/pom.xml b/lang/java/grpc/pom.xml
index a64d8cd..97dfe36 100644
--- a/lang/java/grpc/pom.xml
+++ b/lang/java/grpc/pom.xml
@@ -77,6 +77,11 @@
<dependencies>
<dependency>
<groupId>io.grpc</groupId>
+ <artifactId>grpc-core</artifactId>
+ <version>${grpc.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>io.grpc</groupId>
<artifactId>grpc-stub</artifactId>
<version>${grpc.version}</version>
</dependency>
@@ -88,6 +93,12 @@
<scope>test</scope>
</dependency>
<dependency>
+ <groupId>io.netty</groupId>
+ <artifactId>netty-codec-http2</artifactId>
+ <version>${netty-codec-http2.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>${project.groupId}</groupId>
<artifactId>avro</artifactId>
<version>${project.version}</version>
diff --git a/lang/java/maven-plugin/pom.xml b/lang/java/maven-plugin/pom.xml
index e092221..3ebba52 100644
--- a/lang/java/maven-plugin/pom.xml
+++ b/lang/java/maven-plugin/pom.xml
@@ -33,10 +33,6 @@
<name>Apache Avro Maven Plugin</name>
<description>Maven plugin for Avro IDL and Specific API Compilers</description>
- <prerequisites>
- <maven>${maven.version}</maven>
- </prerequisites>
-
<properties>
<pluginTestingVersion>1.3</pluginTestingVersion>
</properties>
diff --git a/lang/java/pom.xml b/lang/java/pom.xml
index 6a426fe..773d71c 100644
--- a/lang/java/pom.xml
+++ b/lang/java/pom.xml
@@ -62,6 +62,7 @@
<hamcrest.version>1.3</hamcrest.version>
<joda.version>2.10.1</joda.version>
<grpc.version>1.16.1</grpc.version>
+ <netty-codec-http2.version>4.1.30.Final</netty-codec-http2.version>
<findbugs-annotations.version>1.3.9-1</findbugs-annotations.version>
<zstd-jni.version>1.3.7-1</zstd-jni.version>
@@ -79,7 +80,7 @@
<surefire-plugin.version>2.22.1</surefire-plugin.version>
<file-management.version>1.2.1</file-management.version>
<shade-plugin.version>3.2.0</shade-plugin.version>
- <archetype-plugin.version>2.4</archetype-plugin.version>
+ <archetype-plugin.version>3.0.1</archetype-plugin.version>
</properties>
<modules>
@@ -515,6 +516,11 @@
</dependency>
<dependency>
<groupId>io.grpc</groupId>
+ <artifactId>grpc-core</artifactId>
+ <version>${grpc.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>io.grpc</groupId>
<artifactId>grpc-stub</artifactId>
<version>${grpc.version}</version>
</dependency>
@@ -524,6 +530,11 @@
<version>${grpc.version}</version>
</dependency>
<dependency>
+ <groupId>io.netty</groupId>
+ <artifactId>netty-codec-http2</artifactId>
+ <version>${netty-codec-http2.version}</version>
+ </dependency>
+ <dependency>
<groupId>com.github.luben</groupId>
<artifactId>zstd-jni</artifactId>
<version>${zstd-jni.version}</version>
diff --git a/lang/java/protobuf/pom.xml b/lang/java/protobuf/pom.xml
index 313ab25..8ead26e 100644
--- a/lang/java/protobuf/pom.xml
+++ b/lang/java/protobuf/pom.xml
@@ -50,6 +50,7 @@
<plugins>
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
+ <version>${antrun-plugin.version}</version>
<executions>
<execution>
<phase>generate-test-sources</phase>
diff --git a/lang/java/thrift/pom.xml b/lang/java/thrift/pom.xml
index ce3c591..f98f09e 100644
--- a/lang/java/thrift/pom.xml
+++ b/lang/java/thrift/pom.xml
@@ -50,6 +50,7 @@
<plugins>
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
+ <version>${antrun-plugin.version}</version>
<executions>
<execution>
<phase>generate-test-sources</phase>
diff --git a/lang/java/tools/pom.xml b/lang/java/tools/pom.xml
index 17e0195..d7e94e9 100644
--- a/lang/java/tools/pom.xml
+++ b/lang/java/tools/pom.xml
@@ -50,6 +50,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
+ <version>${source-plugin.version}</version>
<configuration>
<excludes>
<exclude>META-INF/LICENSE</exclude>
diff --git a/pom.xml b/pom.xml
index 0792baa..7577fbc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -20,7 +20,7 @@
<modelVersion>4.0.0</modelVersion>
<prerequisites>
- <maven>2.2.1</maven>
+ <maven>3.0.5</maven>
</prerequisites>
<parent>
@@ -51,10 +51,13 @@
<apache-rat-tasks.version>0.7</apache-rat-tasks.version>
<!-- plugin versions -->
- <antrun-plugin.version>1.7</antrun-plugin.version>
+ <antrun-plugin.version>1.8</antrun-plugin.version>
<enforcer-plugin.version>1.3.1</enforcer-plugin.version>
<rat.version>0.13</rat.version>
- <checkstyle-plugin.version>2.17</checkstyle-plugin.version>
+ <checkstyle-plugin.version>3.0.0</checkstyle-plugin.version>
+ <gpg-plugin.version>1.6</gpg-plugin.version>
+ <javadoc-plugin.version>3.0.1</javadoc-plugin.version>
+ <source-plugin.version>3.0.1</source-plugin.version>
</properties>
<modules>
@@ -132,6 +135,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
+ <version>${javadoc-plugin.version}</version>
<executions>
<execution>
<!-- build javadoc jars per jar for publishing to maven -->
@@ -157,6 +161,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
+ <version>${source-plugin.version}</version>
<executions>
<execution>
<!-- builds source jars and attaches them to the project for publishing -->
@@ -190,6 +195,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-gpg-plugin</artifactId>
+ <version>${gpg-plugin.version}</version>
<executions>
<execution>
<id>sign-artifacts</id>
@@ -272,6 +278,7 @@
<exclude>lang/c/tests/schema_tests/fail/*</exclude> <!-- C test cases -->
<exclude>lang/c/tests/schema_tests/pass/*</exclude> <!-- C test cases -->
<exclude>lang/c++/jsonschemas/*</exclude> <!-- C++ test cases -->
+ <exclude>lang/js/test/dat/**</exclude>
<!-- IDE settings and files -->
<exclude>**/.classpath</exclude>
<exclude>**/.project</exclude>