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 b2f4790 Cleanup poms a bit
b2f4790 is described below
commit b2f4790ab20537907d9bc29050e9eb31f711f671
Author: Daniel Kulp <[email protected]>
AuthorDate: Thu Mar 28 09:54:00 2019 -0400
Cleanup poms a bit
---
.../avro/compiler/specific/SpecificCompiler.java | 29 +++++++++++-----------
lang/java/grpc/pom.xml | 4 ---
lang/java/mapred/pom.xml | 2 --
lang/java/maven-plugin/pom.xml | 1 -
lang/java/pom.xml | 13 ++++++++++
lang/java/tools/pom.xml | 1 -
lang/java/trevni/avro/pom.xml | 1 -
lang/java/trevni/doc/pom.xml | 1 -
pom.xml | 2 --
9 files changed, 28 insertions(+), 26 deletions(-)
diff --git
a/lang/java/compiler/src/main/java/org/apache/avro/compiler/specific/SpecificCompiler.java
b/lang/java/compiler/src/main/java/org/apache/avro/compiler/specific/SpecificCompiler.java
index a3ad363..e44879d 100644
---
a/lang/java/compiler/src/main/java/org/apache/avro/compiler/specific/SpecificCompiler.java
+++
b/lang/java/compiler/src/main/java/org/apache/avro/compiler/specific/SpecificCompiler.java
@@ -111,6 +111,7 @@ public class SpecificCompiler {
specificData.addLogicalTypeConversion(new
Jsr310TimeConversions.DateConversion());
specificData.addLogicalTypeConversion(new
Jsr310TimeConversions.TimeMillisConversion());
specificData.addLogicalTypeConversion(new
Jsr310TimeConversions.TimestampMillisConversion());
+ specificData.addLogicalTypeConversion(new
Jsr310TimeConversions.TimestampMicrosConversion());
}
};
@@ -431,7 +432,7 @@ public class SpecificCompiler {
/**
* Generates Java interface and classes for a protocol.
- *
+ *
* @param src the source Avro protocol file
* @param dest the directory to place generated files in
*/
@@ -441,7 +442,7 @@ public class SpecificCompiler {
/**
* Generates Java interface and classes for a number of protocol files.
- *
+ *
* @param srcFiles the source Avro protocol files
* @param dest the directory to place generated files in
*/
@@ -819,7 +820,7 @@ public class SpecificCompiler {
/**
* Utility for template use. Returns the unboxed java type for a Schema.
- *
+ *
* @Deprecated use javaUnbox(Schema, boolean), kept for backward
compatibiliby
* of custom templates
*/
@@ -967,7 +968,7 @@ public class SpecificCompiler {
/**
* Utility for template use. Takes a (potentially overly long) string and
splits
* it into a quoted, comma-separted sequence of escaped strings.
- *
+ *
* @param s The string to split
* @return A sequence of quoted, comma-separated, escaped strings
*/
@@ -1037,7 +1038,7 @@ public class SpecificCompiler {
/**
* Generates the name of a field accessor method.
- *
+ *
* @param schema the schema in which the field is defined.
* @param field the field for which to generate the accessor name.
* @return the name of the accessor method for the given field.
@@ -1048,7 +1049,7 @@ public class SpecificCompiler {
/**
* Generates the name of a field accessor method that returns a Java 8
Optional.
- *
+ *
* @param schema the schema in which the field is defined.
* @param field the field for which to generate the accessor name.
* @return the name of the accessor method for the given field.
@@ -1059,7 +1060,7 @@ public class SpecificCompiler {
/**
* Generates the name of a field mutator method.
- *
+ *
* @param schema the schema in which the field is defined.
* @param field the field for which to generate the mutator name.
* @return the name of the mutator method for the given field.
@@ -1070,7 +1071,7 @@ public class SpecificCompiler {
/**
* Generates the name of a field "has" method.
- *
+ *
* @param schema the schema in which the field is defined.
* @param field the field for which to generate the "has" method name.
* @return the name of the has method for the given field.
@@ -1081,7 +1082,7 @@ public class SpecificCompiler {
/**
* Generates the name of a field "clear" method.
- *
+ *
* @param schema the schema in which the field is defined.
* @param field the field for which to generate the accessor name.
* @return the name of the has method for the given field.
@@ -1110,7 +1111,7 @@ public class SpecificCompiler {
/**
* Generates the name of a field Builder accessor method.
- *
+ *
* @param schema the schema in which the field is defined.
* @param field the field for which to generate the Builder accessor name.
* @return the name of the Builder accessor method for the given field.
@@ -1121,7 +1122,7 @@ public class SpecificCompiler {
/**
* Generates the name of a field Builder mutator method.
- *
+ *
* @param schema the schema in which the field is defined.
* @param field the field for which to generate the Builder mutator name.
* @return the name of the Builder mutator method for the given field.
@@ -1132,7 +1133,7 @@ public class SpecificCompiler {
/**
* Generates the name of a field Builder "has" method.
- *
+ *
* @param schema the schema in which the field is defined.
* @param field the field for which to generate the "has" Builder method
name.
* @return the name of the "has" Builder method for the given field.
@@ -1143,7 +1144,7 @@ public class SpecificCompiler {
/**
* Generates a method name from a field name.
- *
+ *
* @param schema the schema in which the field is defined.
* @param field the field for which to generate the accessor name.
* @param prefix method name prefix, e.g. "get" or "set".
@@ -1209,7 +1210,7 @@ public class SpecificCompiler {
/**
* Sets character encoding for generated java file
- *
+ *
* @param outputCharacterEncoding Character encoding for output files
(defaults
* to system encoding)
*/
diff --git a/lang/java/grpc/pom.xml b/lang/java/grpc/pom.xml
index 6bef4e9..ea99810 100644
--- a/lang/java/grpc/pom.xml
+++ b/lang/java/grpc/pom.xml
@@ -101,7 +101,6 @@
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-core</artifactId>
- <version>${grpc.version}</version>
<exclusions>
<exclusion> <!-- GPL -->
<groupId>com.google.code.findbugs</groupId>
@@ -112,19 +111,16 @@
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-stub</artifactId>
- <version>${grpc.version}</version>
</dependency>
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-netty</artifactId>
- <version>${grpc.version}</version>
<!-- use netty only for tests as user can use grpc transports other than
Netty -->
<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>
diff --git a/lang/java/mapred/pom.xml b/lang/java/mapred/pom.xml
index 03f3fc9..c97f9c3 100644
--- a/lang/java/mapred/pom.xml
+++ b/lang/java/mapred/pom.xml
@@ -52,7 +52,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
- <version>${jar-plugin.version}</version>
<executions>
<execution>
<goals>
@@ -171,7 +170,6 @@
<dependency>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest-library</artifactId>
- <version>${hamcrest.version}</version>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/lang/java/maven-plugin/pom.xml b/lang/java/maven-plugin/pom.xml
index 426ef85..0da5412 100644
--- a/lang/java/maven-plugin/pom.xml
+++ b/lang/java/maven-plugin/pom.xml
@@ -43,7 +43,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-plugin-plugin</artifactId>
- <version>${plugin-plugin.version}</version>
<executions>
<execution>
<id>generated-helpmojo</id>
diff --git a/lang/java/pom.xml b/lang/java/pom.xml
index 37793ae..15815ad 100644
--- a/lang/java/pom.xml
+++ b/lang/java/pom.xml
@@ -354,6 +354,19 @@
<pluginExecutions>
<pluginExecution>
<pluginExecutionFilter>
+ <groupId>com.diffplug.spotless</groupId>
+ <artifactId>spotless-maven-plugin</artifactId>
+ <versionRange>[1.20.0,)</versionRange>
+ <goals>
+ <goal>check</goal>
+ </goals>
+ </pluginExecutionFilter>
+ <action>
+ <ignore></ignore>
+ </action>
+ </pluginExecution>
+ <pluginExecution>
+ <pluginExecutionFilter>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-plugin-plugin</artifactId>
<versionRange>[${plugin-plugin.version},)</versionRange>
diff --git a/lang/java/tools/pom.xml b/lang/java/tools/pom.xml
index c326d9a..11fba1d 100644
--- a/lang/java/tools/pom.xml
+++ b/lang/java/tools/pom.xml
@@ -154,7 +154,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>${surefire-plugin.version}</version>
<configuration>
<!-- some tests hang if not run in a separate JVM -->
<forkCount>1</forkCount>
diff --git a/lang/java/trevni/avro/pom.xml b/lang/java/trevni/avro/pom.xml
index 95d21fc..173eb83 100644
--- a/lang/java/trevni/avro/pom.xml
+++ b/lang/java/trevni/avro/pom.xml
@@ -78,7 +78,6 @@
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-client</artifactId>
- <version>${hadoop2.version}</version>
<!-- hadoop's execution environment provides its own jars, usurping any
others.
So we should not include it here -->
<scope>provided</scope>
diff --git a/lang/java/trevni/doc/pom.xml b/lang/java/trevni/doc/pom.xml
index 3a7bc1a..5d33c30 100644
--- a/lang/java/trevni/doc/pom.xml
+++ b/lang/java/trevni/doc/pom.xml
@@ -27,7 +27,6 @@
</parent>
<artifactId>trevni-doc</artifactId>
- <version>1.9.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Trevni Specification</name>
diff --git a/pom.xml b/pom.xml
index 347eade..2ce484f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -104,7 +104,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
- <version>${enforcer-plugin.version}</version>
<executions>
<execution>
<id>enforce</id>
@@ -252,7 +251,6 @@
<plugin>
<groupId>org.apache.rat</groupId>
<artifactId>apache-rat-plugin</artifactId>
- <version>${rat.version}</version>
<inherited>false</inherited>
<executions>
<execution>
