diff --git a/java8tests/pom.xml b/java8tests/pom.xml new file mode 100644 index 000000000000..b6be8953733b --- /dev/null +++ b/java8tests/pom.xml @@ -0,0 +1,183 @@ + + + + 4.0.0 + + + com.google.cloud.dataflow + google-cloud-dataflow-java-sdk-parent + 1.5.0-SNAPSHOT + + + com.google.cloud.dataflow + google-cloud-dataflow-java-java8tests-all + Google Cloud Dataflow Java 8 Tests - All + Google Cloud Dataflow Java SDK provides a simple, Java-based + interface for processing virtually any size data using Google cloud + resources. This artifact includes tests of the SDK from a Java 8 + user. + http://cloud.google.com/dataflow + + jar + + + + DataflowPipelineTests + + true + com.google.cloud.dataflow.sdk.testing.RunnableOnService + both + + + + + + + + maven-compiler-plugin + + 1.8 + 1.8 + + + + + org.apache.maven.plugins + maven-dependency-plugin + + + analyze-only + + true + + + + + + + org.apache.maven.plugins + maven-checkstyle-plugin + 2.12 + + + com.puppycrawl.tools + checkstyle + 6.6 + + + + ../checkstyle.xml + true + true + true + false + + + + + check + + + + + + + + org.apache.maven.plugins + maven-source-plugin + 2.4 + + + attach-sources + compile + + jar + + + + attach-test-sources + test-compile + + test-jar + + + + + + + org.apache.maven.plugins + maven-jar-plugin + + + default-jar + + jar + + + + default-test-jar + + test-jar + + + + + + + + org.jacoco + jacoco-maven-plugin + + + + + + + com.google.cloud.dataflow + google-cloud-dataflow-java-sdk-all + ${project.version} + + + + com.google.guava + guava + ${guava.version} + + + + joda-time + joda-time + ${joda.version} + + + + org.hamcrest + hamcrest-all + ${hamcrest.version} + test + + + + junit + junit + ${junit.version} + test + + + diff --git a/sdk/src/test/java8/com/google/cloud/dataflow/sdk/transforms/CombineJava8Test.java b/java8tests/src/test/java/com/google/cloud/dataflow/sdk/transforms/CombineJava8Test.java similarity index 100% rename from sdk/src/test/java8/com/google/cloud/dataflow/sdk/transforms/CombineJava8Test.java rename to java8tests/src/test/java/com/google/cloud/dataflow/sdk/transforms/CombineJava8Test.java diff --git a/sdk/src/test/java8/com/google/cloud/dataflow/sdk/transforms/FilterJava8Test.java b/java8tests/src/test/java/com/google/cloud/dataflow/sdk/transforms/FilterJava8Test.java similarity index 100% rename from sdk/src/test/java8/com/google/cloud/dataflow/sdk/transforms/FilterJava8Test.java rename to java8tests/src/test/java/com/google/cloud/dataflow/sdk/transforms/FilterJava8Test.java diff --git a/sdk/src/test/java8/com/google/cloud/dataflow/sdk/transforms/FlatMapElementsJava8Test.java b/java8tests/src/test/java/com/google/cloud/dataflow/sdk/transforms/FlatMapElementsJava8Test.java similarity index 100% rename from sdk/src/test/java8/com/google/cloud/dataflow/sdk/transforms/FlatMapElementsJava8Test.java rename to java8tests/src/test/java/com/google/cloud/dataflow/sdk/transforms/FlatMapElementsJava8Test.java diff --git a/sdk/src/test/java8/com/google/cloud/dataflow/sdk/transforms/MapElementsJava8Test.java b/java8tests/src/test/java/com/google/cloud/dataflow/sdk/transforms/MapElementsJava8Test.java similarity index 100% rename from sdk/src/test/java8/com/google/cloud/dataflow/sdk/transforms/MapElementsJava8Test.java rename to java8tests/src/test/java/com/google/cloud/dataflow/sdk/transforms/MapElementsJava8Test.java diff --git a/sdk/src/test/java8/com/google/cloud/dataflow/sdk/transforms/PartitionJava8Test.java b/java8tests/src/test/java/com/google/cloud/dataflow/sdk/transforms/PartitionJava8Test.java similarity index 100% rename from sdk/src/test/java8/com/google/cloud/dataflow/sdk/transforms/PartitionJava8Test.java rename to java8tests/src/test/java/com/google/cloud/dataflow/sdk/transforms/PartitionJava8Test.java diff --git a/sdk/src/test/java8/com/google/cloud/dataflow/sdk/transforms/RemoveDuplicatesJava8Test.java b/java8tests/src/test/java/com/google/cloud/dataflow/sdk/transforms/RemoveDuplicatesJava8Test.java similarity index 100% rename from sdk/src/test/java8/com/google/cloud/dataflow/sdk/transforms/RemoveDuplicatesJava8Test.java rename to java8tests/src/test/java/com/google/cloud/dataflow/sdk/transforms/RemoveDuplicatesJava8Test.java diff --git a/sdk/src/test/java8/com/google/cloud/dataflow/sdk/transforms/WithKeysJava8Test.java b/java8tests/src/test/java/com/google/cloud/dataflow/sdk/transforms/WithKeysJava8Test.java similarity index 100% rename from sdk/src/test/java8/com/google/cloud/dataflow/sdk/transforms/WithKeysJava8Test.java rename to java8tests/src/test/java/com/google/cloud/dataflow/sdk/transforms/WithKeysJava8Test.java diff --git a/sdk/src/test/java8/com/google/cloud/dataflow/sdk/transforms/WithTimestampsJava8Test.java b/java8tests/src/test/java/com/google/cloud/dataflow/sdk/transforms/WithTimestampsJava8Test.java similarity index 100% rename from sdk/src/test/java8/com/google/cloud/dataflow/sdk/transforms/WithTimestampsJava8Test.java rename to java8tests/src/test/java/com/google/cloud/dataflow/sdk/transforms/WithTimestampsJava8Test.java diff --git a/pom.xml b/pom.xml index 6fb0b32a573e..8a44ea9b4455 100644 --- a/pom.xml +++ b/pom.xml @@ -99,6 +99,15 @@ + + java8-tests + + [1.8,) + + + java8tests + + doclint-java8-disable diff --git a/sdk/pom.xml b/sdk/pom.xml index d7e10a53a801..d652d80648a2 100644 --- a/sdk/pom.xml +++ b/sdk/pom.xml @@ -54,77 +54,6 @@ both - - - java8tests - - [1.8,) - - - - - - - org.codehaus.mojo - build-helper-maven-plugin - - - add-java8-test-source - initialize - - add-test-source - - - - ${project.basedir}/src/test/java8 - - - - - - - - - org.apache.maven.plugins - maven-compiler-plugin - - - default-testCompile - test-compile - - testCompile - - - 1.7 - 1.7 - - - **/*Java8Test.java - - - - - - java8-testCompile - test-compile - - testCompile - - - 1.8 - 1.8 - - **/*Java8Test.java - - - - - - - -