This is an automated email from the ASF dual-hosted git repository.
lcwik pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/beam.git
The following commit(s) were added to refs/heads/master by this push:
new bcb8870 [BEAM-3427] Update build to Java 8 (before clean out) (#4424)
bcb8870 is described below
commit bcb8870d2e91c8d3e83a0647db7a83cb64a064f7
Author: Jean-Baptiste Onofré <[email protected]>
AuthorDate: Mon Jan 22 17:01:50 2018 +0100
[BEAM-3427] Update build to Java 8 (before clean out) (#4424)
* [BEAM-3427] Update build to Java 8 (before clean out)
* [BEAM-3427] Cleanup on the main pom.xml and missing cast on Flink and
Spark runners
* [BEAM-3427] Apply 1.8 Java nature by default in gradle
* [BEAM-3427] Update to Java 1.8 in SQL extension and archetype
* [BEAM-3427] Fix gradle build to give time to double check
applyJavaNature()
* [BEAM-3427] Fix start archetype test
* [BEAM-3427] Fix compilation issue on SQL extension
* [BEAM-3427] Use default Java 1.8 nature in gradle
* [BEAM-3427] Fix SQL extension build
* [BEAM-3427] Remove javaVersion in harness gradle script
---
build_rules.gradle | 2 +-
pom.xml | 97 +---------------------
.../apache/beam/runners/core/SideInputHandler.java | 3 +-
.../beam/runners/direct/SideInputContainer.java | 2 +-
.../functions/SideInputInitializer.java | 19 +++--
runners/gearpump/build.gradle | 2 +-
runners/gearpump/pom.xml | 23 -----
runners/java-fn-execution/build.gradle | 2 +-
runners/spark/pom.xml | 24 ------
.../runners/spark/util/SparkSideInputReader.java | 2 +-
sdks/java/extensions/sql/pom.xml | 4 +-
.../operator/BeamSqlCastExpression.java | 16 ++--
.../BeamSqlTimestampMinusIntervalExpression.java | 2 +-
.../BeamSqlTimestampMinusTimestampExpression.java | 4 +-
sdks/java/fn-execution/build.gradle | 2 +-
sdks/java/harness/build.gradle | 2 +-
.../elasticsearch-tests-5/pom.xml | 36 --------
sdks/java/io/hadoop/jdk1.8-tests/build.gradle | 2 +-
sdks/java/io/hadoop/jdk1.8-tests/pom.xml | 35 --------
sdks/java/io/tika/build.gradle | 2 +-
sdks/java/java8tests/build.gradle | 2 +-
.../maven-archetypes/examples-java8/build.gradle | 2 +-
sdks/java/maven-archetypes/examples-java8/pom.xml | 23 -----
.../META-INF/maven/archetype-metadata.xml | 2 +-
.../resources/projects/basic/archetype.properties | 2 +-
.../META-INF/maven/archetype-metadata.xml | 2 +-
.../resources/projects/basic/archetype.properties | 2 +-
.../resources/projects/basic/reference/pom.xml | 4 +-
28 files changed, 47 insertions(+), 273 deletions(-)
diff --git a/build_rules.gradle b/build_rules.gradle
index 9512a37..64676f2 100644
--- a/build_rules.gradle
+++ b/build_rules.gradle
@@ -120,7 +120,7 @@ ext.getJavaRelocatedPath = { String suffix ->
// A class defining the set of configurable properties accepted by
applyJavaNature
class JavaNatureConfiguration {
- double javaVersion = 1.7 // Controls the JDK source language and
target compatibility
+ double javaVersion = 1.8 // Controls the JDK source language and
target compatibility
boolean enableFindbugs = true // Controls whether the findbugs plugin is
enabled and configured
boolean enableShadow = true // Controls whether the shadow plugin is
enabled and configured
}
diff --git a/pom.xml b/pom.xml
index 5c5d7f9..fd65b2d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -290,52 +290,6 @@
</profile>
<profile>
- <id>java8-enable-like-dependencies</id>
- <activation>
- <jdk>[1.8,)</jdk>
- </activation>
- <build>
- <plugins>
- <!-- Override Beam parent to allow Java8 dependencies -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-enforcer-plugin</artifactId>
- <version>${maven-enforcer-plugin.version}</version>
- <executions>
- <execution>
- <id>enforce</id>
- <goals>
- <goal>enforce</goal>
- </goals>
- <configuration>
- <rules>
- <enforceBytecodeVersion>
- <maxJdkVersion>1.8</maxJdkVersion>
- <excludes>
- <!--
- Supplied by the user JDK and compiled with matching
- version. Is not shaded, so safe to ignore.
- -->
- <exclude>jdk.tools:jdk.tools</exclude>
- </excludes>
- </enforceBytecodeVersion>
- <requireJavaVersion>
- <version>[1.7,)</version>
- </requireJavaVersion>
- <requireMavenVersion>
- <!-- Keep aligned with preqrequisite section below. -->
- <version>[3.2,)</version>
- </requireMavenVersion>
- </rules>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
-
- <profile>
<id>doclint-java8-disable</id>
<activation>
<jdk>[1.8,)</jdk>
@@ -346,49 +300,6 @@
</profile>
<profile>
- <id>java7-packageinfo</id>
- <activation>
- <jdk>1.7</jdk>
- </activation>
- <properties>
- <!--
- Exclude package-info.java from main compilation to work around
- https://jira.codehaus.org/browse/MCOMPILER-205
- -->
-
<compiler.default.pkginfo.flag>-Xpkginfo:legacy</compiler.default.pkginfo.flag>
-
<compiler.default.exclude>**/package-info.java</compiler.default.exclude>
- </properties>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <executions>
- <!--
- Compile just package-info.java to avoid
- https://bugs.openjdk.java.net/browse/JDK-8022161
- -->
- <execution>
- <id>compile-package-info</id>
- <goals>
- <goal>compile</goal>
- </goals>
- <phase>compile</phase>
- <configuration>
- <compilerArgs>
- <arg>-Xpkginfo:always</arg>
- </compilerArgs>
- <includes>
- <include>**/package-info.java</include>
- </includes>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
-
- <profile>
<id>eclipse-jdt</id>
<properties>
<!-- Tycho doesn't support -Werror -->
@@ -1509,8 +1420,8 @@
<artifactId>maven-compiler-plugin</artifactId>
<version>${maven-compiler-plugin.version}</version>
<configuration>
- <source>1.7</source>
- <target>1.7</target>
+ <source>1.8</source>
+ <target>1.8</target>
<compilerArgs>
<arg>-Xlint:all</arg>
<arg>${compiler.error.flag}</arg>
@@ -2053,7 +1964,7 @@
<configuration>
<rules>
<enforceBytecodeVersion>
- <maxJdkVersion>1.7</maxJdkVersion>
+ <maxJdkVersion>1.8</maxJdkVersion>
<excludes>
<!--
Supplied by the user JDK and compiled with matching
@@ -2064,7 +1975,7 @@
</excludes>
</enforceBytecodeVersion>
<requireJavaVersion>
- <version>[1.7,)</version>
+ <version>[1.8,)</version>
</requireJavaVersion>
<requireMavenVersion>
<!-- Keep aligned with preqrequisite section below. -->
diff --git
a/runners/core-java/src/main/java/org/apache/beam/runners/core/SideInputHandler.java
b/runners/core-java/src/main/java/org/apache/beam/runners/core/SideInputHandler.java
index 3ff4c94..0da35c6 100644
---
a/runners/core-java/src/main/java/org/apache/beam/runners/core/SideInputHandler.java
+++
b/runners/core-java/src/main/java/org/apache/beam/runners/core/SideInputHandler.java
@@ -191,7 +191,8 @@ public class SideInputHandler implements
ReadyCheckingSideInputReader {
ViewFn<MultimapView, T> viewFn = (ViewFn<MultimapView, T>)
view.getViewFn();
Coder<?> keyCoder = ((KvCoder<?, ?>)
view.getCoderInternal()).getKeyCoder();
- return viewFn.apply(InMemoryMultimapSideInputView.fromIterable(keyCoder,
(Iterable) elements));
+ return (T)
+ viewFn.apply(InMemoryMultimapSideInputView.fromIterable(keyCoder,
(Iterable) elements));
}
@Override
diff --git
a/runners/direct-java/src/main/java/org/apache/beam/runners/direct/SideInputContainer.java
b/runners/direct-java/src/main/java/org/apache/beam/runners/direct/SideInputContainer.java
index ea8f168..1597bf4 100644
---
a/runners/direct-java/src/main/java/org/apache/beam/runners/direct/SideInputContainer.java
+++
b/runners/direct-java/src/main/java/org/apache/beam/runners/direct/SideInputContainer.java
@@ -270,7 +270,7 @@ class SideInputContainer {
ViewFn<MultimapView, T> viewFn = (ViewFn<MultimapView, T>)
view.getViewFn();
Coder<?> keyCoder = ((KvCoder<?, ?>)
view.getCoderInternal()).getKeyCoder();
- return viewFn.apply(
+ return (T) viewFn.apply(
InMemoryMultimapSideInputView.fromIterable(keyCoder, (Iterable)
elements));
}
diff --git
a/runners/flink/src/main/java/org/apache/beam/runners/flink/translation/functions/SideInputInitializer.java
b/runners/flink/src/main/java/org/apache/beam/runners/flink/translation/functions/SideInputInitializer.java
index 782f72a..33c3cf3 100644
---
a/runners/flink/src/main/java/org/apache/beam/runners/flink/translation/functions/SideInputInitializer.java
+++
b/runners/flink/src/main/java/org/apache/beam/runners/flink/translation/functions/SideInputInitializer.java
@@ -83,15 +83,16 @@ public class SideInputInitializer<ViewT>
ViewFn<MultimapView, ViewT> viewFn = (ViewFn<MultimapView, ViewT>)
view.getViewFn();
Coder keyCoder = ((KvCoder<?, ?>) view.getCoderInternal()).getKeyCoder();
- resultMap.put(elements.getKey(),
viewFn.apply(InMemoryMultimapSideInputView.fromIterable(
- keyCoder,
- (Iterable) Iterables.transform(elements.getValue(),
- new Function<WindowedValue<KV<?, ?>>, KV<?, ?>>() {
- @Override
- public KV<?, ?> apply(WindowedValue<KV<?, ?>> windowedValue) {
- return windowedValue.getValue();
- }
- }))));
+ resultMap.put(elements.getKey(),
+ (ViewT) viewFn.apply(InMemoryMultimapSideInputView.fromIterable(
+ keyCoder,
+ (Iterable) Iterables.transform(elements.getValue(),
+ new Function<WindowedValue<KV<?, ?>>, KV<?, ?>>() {
+ @Override
+ public KV<?, ?> apply(WindowedValue<KV<?, ?>>
windowedValue) {
+ return windowedValue.getValue();
+ }
+ }))));
}
return resultMap;
diff --git a/runners/gearpump/build.gradle b/runners/gearpump/build.gradle
index cb52b77..2ed903e 100644
--- a/runners/gearpump/build.gradle
+++ b/runners/gearpump/build.gradle
@@ -17,7 +17,7 @@
*/
apply from: project(":").file("build_rules.gradle")
-applyJavaNature(javaVersion: 1.8)
+applyJavaNature()
description = "Apache Beam :: Runners :: Gearpump"
diff --git a/runners/gearpump/pom.xml b/runners/gearpump/pom.xml
index dce0c5e..00d060b 100644
--- a/runners/gearpump/pom.xml
+++ b/runners/gearpump/pom.xml
@@ -237,29 +237,6 @@
</configuration>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-enforcer-plugin</artifactId>
- <executions>
- <execution>
- <id>enforce</id>
- <goals>
- <goal>enforce</goal>
- </goals>
- <configuration>
- <rules>
- <enforceBytecodeVersion>
- <maxJdkVersion>1.8</maxJdkVersion>
- </enforceBytecodeVersion>
- <requireJavaVersion>
- <version>[1.8,)</version>
- </requireJavaVersion>
- </rules>
- </configuration>
- </execution>
- </executions>
- </plugin>
-
<!-- uber jar -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
diff --git a/runners/java-fn-execution/build.gradle
b/runners/java-fn-execution/build.gradle
index 18b80e5..2ed30d5 100644
--- a/runners/java-fn-execution/build.gradle
+++ b/runners/java-fn-execution/build.gradle
@@ -16,7 +16,7 @@
*/
apply from: project(":").file("build_rules.gradle")
-applyJavaNature(javaVersion: 1.8)
+applyJavaNature()
description = "Apache Beam :: Runners :: Java Fn Execution"
diff --git a/runners/spark/pom.xml b/runners/spark/pom.xml
index f61863b6..4cb99fc 100644
--- a/runners/spark/pom.xml
+++ b/runners/spark/pom.xml
@@ -460,29 +460,5 @@
</plugin>
</plugins>
</pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-enforcer-plugin</artifactId>
- <executions>
- <execution>
- <id>enforce</id>
- <goals>
- <goal>enforce</goal>
- </goals>
- <configuration>
- <rules>
- <enforceBytecodeVersion>
- <maxJdkVersion>1.8</maxJdkVersion>
- </enforceBytecodeVersion>
- <requireJavaVersion>
- <version>[1.8,)</version>
- </requireJavaVersion>
- </rules>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
</build>
</project>
diff --git
a/runners/spark/src/main/java/org/apache/beam/runners/spark/util/SparkSideInputReader.java
b/runners/spark/src/main/java/org/apache/beam/runners/spark/util/SparkSideInputReader.java
index 932ccd6..054665d 100644
---
a/runners/spark/src/main/java/org/apache/beam/runners/spark/util/SparkSideInputReader.java
+++
b/runners/spark/src/main/java/org/apache/beam/runners/spark/util/SparkSideInputReader.java
@@ -88,7 +88,7 @@ public class SparkSideInputReader implements SideInputReader {
ViewFn<MultimapView, T> viewFn = (ViewFn<MultimapView, T>)
view.getViewFn();
Coder keyCoder = ((KvCoder<?, ?>) view.getCoderInternal()).getKeyCoder();
- return viewFn.apply(
+ return (T) viewFn.apply(
InMemoryMultimapSideInputView.fromIterable(keyCoder, (Iterable)
sideInputForWindow));
}
diff --git a/sdks/java/extensions/sql/pom.xml b/sdks/java/extensions/sql/pom.xml
index caffaaf..983611e 100644
--- a/sdks/java/extensions/sql/pom.xml
+++ b/sdks/java/extensions/sql/pom.xml
@@ -87,8 +87,8 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
- <source>1.7</source>
- <target>1.7</target>
+ <source>1.8</source>
+ <target>1.8</target>
<useIncrementalCompilation>false</useIncrementalCompilation>
<compilerArgs>
<!-- Generated calcite code has some deprecation warning -->
diff --git
a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/BeamSqlCastExpression.java
b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/BeamSqlCastExpression.java
index 9ea66c1..5ca7a69 100644
---
a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/BeamSqlCastExpression.java
+++
b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/BeamSqlCastExpression.java
@@ -77,25 +77,27 @@ public class BeamSqlCastExpression extends
BeamSqlExpression {
switch (castOutputType) {
case INTEGER:
return BeamSqlPrimitive
- .of(SqlTypeName.INTEGER,
SqlFunctions.toInt(opValueEvaluated(index, inputRow, window)));
+ .of(SqlTypeName.INTEGER,
+ SqlFunctions.toInt((Object) opValueEvaluated(index,
inputRow, window)));
case DOUBLE:
return BeamSqlPrimitive.of(SqlTypeName.DOUBLE,
- SqlFunctions.toDouble(opValueEvaluated(index, inputRow, window)));
+ SqlFunctions.toDouble((Object) opValueEvaluated(index, inputRow,
window)));
case SMALLINT:
return BeamSqlPrimitive.of(SqlTypeName.SMALLINT,
- SqlFunctions.toShort(opValueEvaluated(index, inputRow, window)));
+ SqlFunctions.toShort((Object) opValueEvaluated(index, inputRow,
window)));
case TINYINT:
return BeamSqlPrimitive.of(SqlTypeName.TINYINT,
SqlFunctions.toByte(opValueEvaluated(index, inputRow, window)));
case BIGINT:
return BeamSqlPrimitive
- .of(SqlTypeName.BIGINT,
SqlFunctions.toLong(opValueEvaluated(index, inputRow, window)));
+ .of(SqlTypeName.BIGINT,
+ SqlFunctions.toLong((Object) opValueEvaluated(index,
inputRow, window)));
case DECIMAL:
return BeamSqlPrimitive.of(SqlTypeName.DECIMAL,
- SqlFunctions.toBigDecimal(opValueEvaluated(index, inputRow,
window)));
+ SqlFunctions.toBigDecimal((Object) opValueEvaluated(index,
inputRow, window)));
case FLOAT:
- return BeamSqlPrimitive
- .of(SqlTypeName.FLOAT,
SqlFunctions.toFloat(opValueEvaluated(index, inputRow, window)));
+ return BeamSqlPrimitive.of(SqlTypeName.FLOAT,
+ SqlFunctions.toFloat((Object) opValueEvaluated(index,
inputRow, window)));
case CHAR:
case VARCHAR:
return BeamSqlPrimitive
diff --git
a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/date/BeamSqlTimestampMinusIntervalExpression.java
b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/date/BeamSqlTimestampMinusIntervalExpression.java
index 236d148..43b2d5a 100644
---
a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/date/BeamSqlTimestampMinusIntervalExpression.java
+++
b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/date/BeamSqlTimestampMinusIntervalExpression.java
@@ -59,7 +59,7 @@ public class BeamSqlTimestampMinusIntervalExpression extends
BeamSqlExpression {
@Override
public BeamSqlPrimitive evaluate(BeamRecord row, BoundedWindow window) {
- DateTime date = new DateTime(opValueEvaluated(0, row, window));
+ DateTime date = new DateTime((Object) opValueEvaluated(0, row, window));
Period period = intervalToPeriod(op(1).evaluate(row, window));
Date subtractionResult = date.minus(period).toDate();
diff --git
a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/date/BeamSqlTimestampMinusTimestampExpression.java
b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/date/BeamSqlTimestampMinusTimestampExpression.java
index 64ac9c8..bcdfa92 100644
---
a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/date/BeamSqlTimestampMinusTimestampExpression.java
+++
b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/date/BeamSqlTimestampMinusTimestampExpression.java
@@ -71,8 +71,8 @@ public class BeamSqlTimestampMinusTimestampExpression extends
BeamSqlExpression
* multiplied by the corresponding TimeUnit.multiplier
*/
public BeamSqlPrimitive evaluate(BeamRecord inputRow, BoundedWindow window) {
- DateTime timestampStart = new DateTime(opValueEvaluated(1, inputRow,
window));
- DateTime timestampEnd = new DateTime(opValueEvaluated(0, inputRow,
window));
+ DateTime timestampStart = new DateTime((Object) opValueEvaluated(1,
inputRow, window));
+ DateTime timestampEnd = new DateTime((Object) opValueEvaluated(0,
inputRow, window));
long numberOfIntervals = numberOfIntervalsBetweenDates(timestampStart,
timestampEnd);
long multiplier =
TimeUnitUtils.timeUnitInternalMultiplier(intervalType).longValue();
diff --git a/sdks/java/fn-execution/build.gradle
b/sdks/java/fn-execution/build.gradle
index 0dbae6a..82807ff 100644
--- a/sdks/java/fn-execution/build.gradle
+++ b/sdks/java/fn-execution/build.gradle
@@ -17,7 +17,7 @@
*/
apply from: project(":").file("build_rules.gradle")
-applyJavaNature(javaVersion: 1.8)
+applyJavaNature()
description = "Apache Beam :: SDKs :: Java :: Fn Execution"
diff --git a/sdks/java/harness/build.gradle b/sdks/java/harness/build.gradle
index f999234..cc7ea8c 100644
--- a/sdks/java/harness/build.gradle
+++ b/sdks/java/harness/build.gradle
@@ -17,7 +17,7 @@
*/
apply from: project(":").file("build_rules.gradle")
-applyJavaNature(javaVersion: 1.8, enableShadow: false /* Disable shadow
because of custom configuration below. */)
+applyJavaNature(enableShadow: false /* Disable shadow because of custom
configuration below. */)
apply plugin: "com.github.johnrengelman.shadow"
description = "Apache Beam :: SDKs :: Java :: Harness"
diff --git a/sdks/java/io/elasticsearch-tests/elasticsearch-tests-5/pom.xml
b/sdks/java/io/elasticsearch-tests/elasticsearch-tests-5/pom.xml
index ba76316..a137ce8 100644
--- a/sdks/java/io/elasticsearch-tests/elasticsearch-tests-5/pom.xml
+++ b/sdks/java/io/elasticsearch-tests/elasticsearch-tests-5/pom.xml
@@ -83,42 +83,6 @@
<argLine>-Dtests.security.manager=false</argLine>
</configuration>
</plugin>
- <!-- Overridden enforcer plugin for JDK1.8 for running tests -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-enforcer-plugin</artifactId>
- <version>1.4.1</version>
- <executions>
- <execution>
- <id>enforce</id>
- <goals>
- <goal>enforce</goal>
- </goals>
- <configuration>
- <rules>
- <enforceBytecodeVersion>
- <maxJdkVersion>1.8</maxJdkVersion>
- <excludes>
- <!-- Supplied by the user JDK and
compiled with matching
- version. Is not shaded, so safe to
ignore. -->
- <exclude>jdk.tools:jdk.tools</exclude>
- </excludes>
- </enforceBytecodeVersion>
- <requireJavaVersion>
- <version>[1.8,)</version>
- </requireJavaVersion>
- </rules>
- </configuration>
- </execution>
- </executions>
- <dependencies>
- <dependency>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>extra-enforcer-rules</artifactId>
- <version>1.0-beta-6</version>
- </dependency>
- </dependencies>
- </plugin>
</plugins>
</build>
</project>
diff --git a/sdks/java/io/hadoop/jdk1.8-tests/build.gradle
b/sdks/java/io/hadoop/jdk1.8-tests/build.gradle
index ffedc39..6e1d75e 100644
--- a/sdks/java/io/hadoop/jdk1.8-tests/build.gradle
+++ b/sdks/java/io/hadoop/jdk1.8-tests/build.gradle
@@ -17,7 +17,7 @@
*/
apply from: project(":").file("build_rules.gradle")
-applyJavaNature(javaVersion: 1.8)
+applyJavaNature()
description = "Apache Beam :: SDKs :: Java :: IO :: Hadoop :: jdk1.8-tests"
diff --git a/sdks/java/io/hadoop/jdk1.8-tests/pom.xml
b/sdks/java/io/hadoop/jdk1.8-tests/pom.xml
index f148f13..562b127 100644
--- a/sdks/java/io/hadoop/jdk1.8-tests/pom.xml
+++ b/sdks/java/io/hadoop/jdk1.8-tests/pom.xml
@@ -50,41 +50,6 @@
</plugins>
</pluginManagement>
<plugins>
- <!-- Overridden enforcer plugin for JDK1.8 for running tests -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-enforcer-plugin</artifactId>
- <executions>
- <execution>
- <id>enforce</id>
- <goals>
- <goal>enforce</goal>
- </goals>
- <configuration>
- <rules>
- <enforceBytecodeVersion>
- <maxJdkVersion>1.8</maxJdkVersion>
- <excludes>
- <!-- Supplied by the user JDK and compiled with matching
- version. Is not shaded, so safe to ignore. -->
- <exclude>jdk.tools:jdk.tools</exclude>
- </excludes>
- </enforceBytecodeVersion>
- <requireJavaVersion>
- <version>[1.8,)</version>
- </requireJavaVersion>
- </rules>
- </configuration>
- </execution>
- </executions>
- <dependencies>
- <dependency>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>extra-enforcer-rules</artifactId>
- <version>1.0-beta-6</version>
- </dependency>
- </dependencies>
- </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
diff --git a/sdks/java/io/tika/build.gradle b/sdks/java/io/tika/build.gradle
index cc63e29..e1bb627 100644
--- a/sdks/java/io/tika/build.gradle
+++ b/sdks/java/io/tika/build.gradle
@@ -17,7 +17,7 @@
*/
apply from: project(":").file("build_rules.gradle")
-applyJavaNature(javaVersion: 1.8)
+applyJavaNature()
description = "Apache Beam :: SDKs :: Java :: IO :: Tika"
diff --git a/sdks/java/java8tests/build.gradle
b/sdks/java/java8tests/build.gradle
index 977ede6..924cbfe 100644
--- a/sdks/java/java8tests/build.gradle
+++ b/sdks/java/java8tests/build.gradle
@@ -17,7 +17,7 @@
*/
apply from: project(":").file("build_rules.gradle")
-applyJavaNature(javaVersion: 1.8)
+applyJavaNature()
description = "Apache Beam :: SDKs :: Java :: Java 8 Tests"
diff --git a/sdks/java/maven-archetypes/examples-java8/build.gradle
b/sdks/java/maven-archetypes/examples-java8/build.gradle
index ad67d8b..095ab8f 100644
--- a/sdks/java/maven-archetypes/examples-java8/build.gradle
+++ b/sdks/java/maven-archetypes/examples-java8/build.gradle
@@ -17,7 +17,7 @@
*/
apply from: project(":").file("build_rules.gradle")
-applyJavaNature(javaVersion: 1.8)
+applyJavaNature()
description = "Apache Beam :: SDKs :: Java :: Maven Archetypes :: Examples -
Java 8"
diff --git a/sdks/java/maven-archetypes/examples-java8/pom.xml
b/sdks/java/maven-archetypes/examples-java8/pom.xml
index fbab9ff..15666ec 100644
--- a/sdks/java/maven-archetypes/examples-java8/pom.xml
+++ b/sdks/java/maven-archetypes/examples-java8/pom.xml
@@ -91,29 +91,6 @@
</execution>
</executions>
</plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-enforcer-plugin</artifactId>
- <executions>
- <execution>
- <id>enforce</id>
- <goals>
- <goal>enforce</goal>
- </goals>
- <configuration>
- <rules>
- <enforceBytecodeVersion>
- <maxJdkVersion>1.8</maxJdkVersion>
- </enforceBytecodeVersion>
- <requireJavaVersion>
- <version>[1.8,)</version>
- </requireJavaVersion>
- </rules>
- </configuration>
- </execution>
- </executions>
- </plugin>
</plugins>
</build>
diff --git
a/sdks/java/maven-archetypes/examples/src/main/resources/META-INF/maven/archetype-metadata.xml
b/sdks/java/maven-archetypes/examples/src/main/resources/META-INF/maven/archetype-metadata.xml
index 7f0430a..0c95fd8 100644
---
a/sdks/java/maven-archetypes/examples/src/main/resources/META-INF/maven/archetype-metadata.xml
+++
b/sdks/java/maven-archetypes/examples/src/main/resources/META-INF/maven/archetype-metadata.xml
@@ -23,7 +23,7 @@
<requiredProperties>
<requiredProperty key="targetPlatform">
- <defaultValue>1.7</defaultValue>
+ <defaultValue>1.8</defaultValue>
</requiredProperty>
</requiredProperties>
diff --git
a/sdks/java/maven-archetypes/examples/src/test/resources/projects/basic/archetype.properties
b/sdks/java/maven-archetypes/examples/src/test/resources/projects/basic/archetype.properties
index 9483a44..ee81f8f 100644
---
a/sdks/java/maven-archetypes/examples/src/test/resources/projects/basic/archetype.properties
+++
b/sdks/java/maven-archetypes/examples/src/test/resources/projects/basic/archetype.properties
@@ -18,4 +18,4 @@ package=it.pkg
version=0.1
groupId=archetype.it
artifactId=basic
-targetPlatform=1.7
+targetPlatform=1.8
diff --git
a/sdks/java/maven-archetypes/starter/src/main/resources/META-INF/maven/archetype-metadata.xml
b/sdks/java/maven-archetypes/starter/src/main/resources/META-INF/maven/archetype-metadata.xml
index e550960..e8521cc 100644
---
a/sdks/java/maven-archetypes/starter/src/main/resources/META-INF/maven/archetype-metadata.xml
+++
b/sdks/java/maven-archetypes/starter/src/main/resources/META-INF/maven/archetype-metadata.xml
@@ -22,7 +22,7 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";>
<requiredProperties>
<requiredProperty key="targetPlatform">
- <defaultValue>1.7</defaultValue>
+ <defaultValue>1.8</defaultValue>
</requiredProperty>
</requiredProperties>
diff --git
a/sdks/java/maven-archetypes/starter/src/test/resources/projects/basic/archetype.properties
b/sdks/java/maven-archetypes/starter/src/test/resources/projects/basic/archetype.properties
index 9483a44..ee81f8f 100644
---
a/sdks/java/maven-archetypes/starter/src/test/resources/projects/basic/archetype.properties
+++
b/sdks/java/maven-archetypes/starter/src/test/resources/projects/basic/archetype.properties
@@ -18,4 +18,4 @@ package=it.pkg
version=0.1
groupId=archetype.it
artifactId=basic
-targetPlatform=1.7
+targetPlatform=1.8
diff --git
a/sdks/java/maven-archetypes/starter/src/test/resources/projects/basic/reference/pom.xml
b/sdks/java/maven-archetypes/starter/src/test/resources/projects/basic/reference/pom.xml
index 91da6eb..62d6e70 100644
---
a/sdks/java/maven-archetypes/starter/src/test/resources/projects/basic/reference/pom.xml
+++
b/sdks/java/maven-archetypes/starter/src/test/resources/projects/basic/reference/pom.xml
@@ -53,8 +53,8 @@
<artifactId>maven-compiler-plugin</artifactId>
<version>${maven-compiler-plugin.version}</version>
<configuration>
- <source>1.7</source>
- <target>1.7</target>
+ <source>1.8</source>
+ <target>1.8</target>
</configuration>
</plugin>
</plugins>
--
To stop receiving notification emails like this one, please contact
[email protected].
