diff --git a/lang/java/gradle-plugin/src/test/groovy/org/apache/avro/test/custom/AvroBasePluginFunctionalSpec.groovy b/lang/java/gradle-plugin/src/test/groovy/org/apache/avro/AvroBasePluginFunctionalSpec.groovy similarity index 99% rename from lang/java/gradle-plugin/src/test/groovy/org/apache/avro/test/custom/AvroBasePluginFunctionalSpec.groovy rename to lang/java/gradle-plugin/src/test/groovy/org/apache/avro/AvroBasePluginFunctionalSpec.groovy index ea6d9523302..8176eac8019 100644 --- a/lang/java/gradle-plugin/src/test/groovy/org/apache/avro/test/custom/AvroBasePluginFunctionalSpec.groovy +++ b/lang/java/gradle-plugin/src/test/groovy/org/apache/avro/AvroBasePluginFunctionalSpec.groovy @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.avro.test.custom +package org.apache.avro import org.apache.avro.test.custom.CommentGenerator import org.apache.avro.test.custom.TimestampGenerator diff --git a/lang/java/gradle-plugin/src/test/groovy/org/apache/avro/test/custom/AvroPluginFunctionalSpec.groovy b/lang/java/gradle-plugin/src/test/groovy/org/apache/avro/AvroPluginFunctionalSpec.groovy similarity index 98% rename from lang/java/gradle-plugin/src/test/groovy/org/apache/avro/test/custom/AvroPluginFunctionalSpec.groovy rename to lang/java/gradle-plugin/src/test/groovy/org/apache/avro/AvroPluginFunctionalSpec.groovy index d15a78aafb7..d2447a506c7 100644 --- a/lang/java/gradle-plugin/src/test/groovy/org/apache/avro/test/custom/AvroPluginFunctionalSpec.groovy +++ b/lang/java/gradle-plugin/src/test/groovy/org/apache/avro/AvroPluginFunctionalSpec.groovy @@ -13,9 +13,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.avro.test.custom +package org.apache.avro -import org.apache.avro.GradleFeatures import static org.gradle.testkit.runner.TaskOutcome.FAILED import static org.gradle.testkit.runner.TaskOutcome.SUCCESS diff --git a/lang/java/gradle-plugin/src/test/groovy/org/apache/avro/test/custom/AvroPluginSpec.groovy b/lang/java/gradle-plugin/src/test/groovy/org/apache/avro/AvroPluginSpec.groovy similarity index 99% rename from lang/java/gradle-plugin/src/test/groovy/org/apache/avro/test/custom/AvroPluginSpec.groovy rename to lang/java/gradle-plugin/src/test/groovy/org/apache/avro/AvroPluginSpec.groovy index 7037cfcbe26..057484f797a 100644 --- a/lang/java/gradle-plugin/src/test/groovy/org/apache/avro/test/custom/AvroPluginSpec.groovy +++ b/lang/java/gradle-plugin/src/test/groovy/org/apache/avro/AvroPluginSpec.groovy @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.avro.test.custom +package org.apache.avro import org.apache.avro.AvroPlugin import org.apache.avro.Constants diff --git a/lang/java/gradle-plugin/src/test/groovy/org/apache/avro/test/custom/AvroUtilsSpec.groovy b/lang/java/gradle-plugin/src/test/groovy/org/apache/avro/AvroUtilsSpec.groovy similarity index 98% rename from lang/java/gradle-plugin/src/test/groovy/org/apache/avro/test/custom/AvroUtilsSpec.groovy rename to lang/java/gradle-plugin/src/test/groovy/org/apache/avro/AvroUtilsSpec.groovy index 722b753b100..7b3b1b89f56 100644 --- a/lang/java/gradle-plugin/src/test/groovy/org/apache/avro/test/custom/AvroUtilsSpec.groovy +++ b/lang/java/gradle-plugin/src/test/groovy/org/apache/avro/AvroUtilsSpec.groovy @@ -1,4 +1,4 @@ -package org.apache.avro.test.custom +package org.apache.avro import org.apache.avro.AvroUtils import org.apache.avro.Protocol diff --git a/lang/java/gradle-plugin/src/test/groovy/org/apache/avro/test/custom/BuildCacheSupportFunctionalSpec.groovy b/lang/java/gradle-plugin/src/test/groovy/org/apache/avro/BuildCacheSupportFunctionalSpec.groovy similarity index 99% rename from lang/java/gradle-plugin/src/test/groovy/org/apache/avro/test/custom/BuildCacheSupportFunctionalSpec.groovy rename to lang/java/gradle-plugin/src/test/groovy/org/apache/avro/BuildCacheSupportFunctionalSpec.groovy index 90a741802e5..5f433cd6b72 100644 --- a/lang/java/gradle-plugin/src/test/groovy/org/apache/avro/test/custom/BuildCacheSupportFunctionalSpec.groovy +++ b/lang/java/gradle-plugin/src/test/groovy/org/apache/avro/BuildCacheSupportFunctionalSpec.groovy @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.avro.test.custom +package org.apache.avro import spock.lang.IgnoreIf import spock.util.environment.OperatingSystem diff --git a/lang/java/gradle-plugin/src/test/groovy/org/apache/avro/test/custom/CustomConversionFunctionalSpec.groovy b/lang/java/gradle-plugin/src/test/groovy/org/apache/avro/CustomConversionFunctionalSpec.groovy similarity index 99% rename from lang/java/gradle-plugin/src/test/groovy/org/apache/avro/test/custom/CustomConversionFunctionalSpec.groovy rename to lang/java/gradle-plugin/src/test/groovy/org/apache/avro/CustomConversionFunctionalSpec.groovy index c5ef4538251..962293efb94 100644 --- a/lang/java/gradle-plugin/src/test/groovy/org/apache/avro/test/custom/CustomConversionFunctionalSpec.groovy +++ b/lang/java/gradle-plugin/src/test/groovy/org/apache/avro/CustomConversionFunctionalSpec.groovy @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.avro.test.custom +package org.apache.avro import static org.gradle.testkit.runner.TaskOutcome.SUCCESS diff --git a/lang/java/gradle-plugin/src/test/groovy/org/apache/avro/test/custom/DuplicateHandlingFunctionalSpec.groovy b/lang/java/gradle-plugin/src/test/groovy/org/apache/avro/DuplicateHandlingFunctionalSpec.groovy similarity index 99% rename from lang/java/gradle-plugin/src/test/groovy/org/apache/avro/test/custom/DuplicateHandlingFunctionalSpec.groovy rename to lang/java/gradle-plugin/src/test/groovy/org/apache/avro/DuplicateHandlingFunctionalSpec.groovy index 39600408ef2..0138604ceff 100644 --- a/lang/java/gradle-plugin/src/test/groovy/org/apache/avro/test/custom/DuplicateHandlingFunctionalSpec.groovy +++ b/lang/java/gradle-plugin/src/test/groovy/org/apache/avro/DuplicateHandlingFunctionalSpec.groovy @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.avro.test.custom +package org.apache.avro import static org.gradle.testkit.runner.TaskOutcome.FAILED import static org.gradle.testkit.runner.TaskOutcome.SUCCESS diff --git a/lang/java/gradle-plugin/src/test/groovy/org/apache/avro/test/custom/EncodingFunctionalSpec.groovy b/lang/java/gradle-plugin/src/test/groovy/org/apache/avro/EncodingFunctionalSpec.groovy similarity index 99% rename from lang/java/gradle-plugin/src/test/groovy/org/apache/avro/test/custom/EncodingFunctionalSpec.groovy rename to lang/java/gradle-plugin/src/test/groovy/org/apache/avro/EncodingFunctionalSpec.groovy index 5868503dfc5..38f26fb87e9 100644 --- a/lang/java/gradle-plugin/src/test/groovy/org/apache/avro/test/custom/EncodingFunctionalSpec.groovy +++ b/lang/java/gradle-plugin/src/test/groovy/org/apache/avro/EncodingFunctionalSpec.groovy @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.avro.test.custom +package org.apache.avro import spock.lang.Unroll diff --git a/lang/java/gradle-plugin/src/test/groovy/org/apache/avro/test/custom/EnumHandlingFunctionalSpec.groovy b/lang/java/gradle-plugin/src/test/groovy/org/apache/avro/EnumHandlingFunctionalSpec.groovy similarity index 98% rename from lang/java/gradle-plugin/src/test/groovy/org/apache/avro/test/custom/EnumHandlingFunctionalSpec.groovy rename to lang/java/gradle-plugin/src/test/groovy/org/apache/avro/EnumHandlingFunctionalSpec.groovy index fdfa82f70f5..494fcd1213c 100644 --- a/lang/java/gradle-plugin/src/test/groovy/org/apache/avro/test/custom/EnumHandlingFunctionalSpec.groovy +++ b/lang/java/gradle-plugin/src/test/groovy/org/apache/avro/EnumHandlingFunctionalSpec.groovy @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.avro.test.custom +package org.apache.avro import static org.gradle.testkit.runner.TaskOutcome.SUCCESS diff --git a/lang/java/gradle-plugin/src/test/groovy/org/apache/avro/test/custom/ExamplesFunctionalSpec.groovy b/lang/java/gradle-plugin/src/test/groovy/org/apache/avro/ExamplesFunctionalSpec.groovy similarity index 98% rename from lang/java/gradle-plugin/src/test/groovy/org/apache/avro/test/custom/ExamplesFunctionalSpec.groovy rename to lang/java/gradle-plugin/src/test/groovy/org/apache/avro/ExamplesFunctionalSpec.groovy index c57803a5b17..c9d7ffdf763 100644 --- a/lang/java/gradle-plugin/src/test/groovy/org/apache/avro/test/custom/ExamplesFunctionalSpec.groovy +++ b/lang/java/gradle-plugin/src/test/groovy/org/apache/avro/ExamplesFunctionalSpec.groovy @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.avro.test.custom +package org.apache.avro import static org.gradle.testkit.runner.TaskOutcome.SUCCESS diff --git a/lang/java/gradle-plugin/src/test/groovy/org/apache/avro/test/custom/FunctionalSpec.groovy b/lang/java/gradle-plugin/src/test/groovy/org/apache/avro/FunctionalSpec.groovy similarity index 99% rename from lang/java/gradle-plugin/src/test/groovy/org/apache/avro/test/custom/FunctionalSpec.groovy rename to lang/java/gradle-plugin/src/test/groovy/org/apache/avro/FunctionalSpec.groovy index 757d9239aca..c06400935a1 100644 --- a/lang/java/gradle-plugin/src/test/groovy/org/apache/avro/test/custom/FunctionalSpec.groovy +++ b/lang/java/gradle-plugin/src/test/groovy/org/apache/avro/FunctionalSpec.groovy @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.avro.test.custom +package org.apache.avro import com.vdurmont.semver4j.Semver import org.apache.avro.GradleFeatures diff --git a/lang/java/gradle-plugin/src/test/groovy/org/apache/avro/test/custom/GenerateAvroProtocolTaskFunctionalSpec.groovy b/lang/java/gradle-plugin/src/test/groovy/org/apache/avro/GenerateAvroProtocolTaskFunctionalSpec.groovy similarity index 98% rename from lang/java/gradle-plugin/src/test/groovy/org/apache/avro/test/custom/GenerateAvroProtocolTaskFunctionalSpec.groovy rename to lang/java/gradle-plugin/src/test/groovy/org/apache/avro/GenerateAvroProtocolTaskFunctionalSpec.groovy index 6a620db5db3..c72842f2976 100644 --- a/lang/java/gradle-plugin/src/test/groovy/org/apache/avro/test/custom/GenerateAvroProtocolTaskFunctionalSpec.groovy +++ b/lang/java/gradle-plugin/src/test/groovy/org/apache/avro/GenerateAvroProtocolTaskFunctionalSpec.groovy @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.avro.test.custom +package org.apache.avro + -import org.apache.avro.GenerateAvroProtocolTask import spock.lang.Subject import static org.gradle.testkit.runner.TaskOutcome.SUCCESS diff --git a/lang/java/gradle-plugin/src/test/groovy/org/apache/avro/test/custom/IntellijFunctionalSpec.groovy b/lang/java/gradle-plugin/src/test/groovy/org/apache/avro/IntellijFunctionalSpec.groovy similarity index 97% rename from lang/java/gradle-plugin/src/test/groovy/org/apache/avro/test/custom/IntellijFunctionalSpec.groovy rename to lang/java/gradle-plugin/src/test/groovy/org/apache/avro/IntellijFunctionalSpec.groovy index 62bfe1a86ee..4120dfa4798 100644 --- a/lang/java/gradle-plugin/src/test/groovy/org/apache/avro/test/custom/IntellijFunctionalSpec.groovy +++ b/lang/java/gradle-plugin/src/test/groovy/org/apache/avro/IntellijFunctionalSpec.groovy @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.avro.test.custom +package org.apache.avro + -import org.apache.avro.GradleFeatures import org.gradle.testkit.runner.BuildResult import static org.gradle.testkit.runner.TaskOutcome.SUCCESS diff --git a/lang/java/gradle-plugin/src/test/groovy/org/apache/avro/test/custom/KotlinDSLCompatibilityFunctionalSpec.groovy b/lang/java/gradle-plugin/src/test/groovy/org/apache/avro/KotlinDSLCompatibilityFunctionalSpec.groovy similarity index 98% rename from lang/java/gradle-plugin/src/test/groovy/org/apache/avro/test/custom/KotlinDSLCompatibilityFunctionalSpec.groovy rename to lang/java/gradle-plugin/src/test/groovy/org/apache/avro/KotlinDSLCompatibilityFunctionalSpec.groovy index 8a127fac4b0..a3a511c7f3e 100644 --- a/lang/java/gradle-plugin/src/test/groovy/org/apache/avro/test/custom/KotlinDSLCompatibilityFunctionalSpec.groovy +++ b/lang/java/gradle-plugin/src/test/groovy/org/apache/avro/KotlinDSLCompatibilityFunctionalSpec.groovy @@ -1,4 +1,4 @@ -package org.apache.avro.test.custom +package org.apache.avro import static org.gradle.testkit.runner.TaskOutcome.SUCCESS diff --git a/lang/java/gradle-plugin/src/test/groovy/org/apache/avro/test/custom/OptionsFunctionalSpec.groovy b/lang/java/gradle-plugin/src/test/groovy/org/apache/avro/OptionsFunctionalSpec.groovy similarity index 99% rename from lang/java/gradle-plugin/src/test/groovy/org/apache/avro/test/custom/OptionsFunctionalSpec.groovy rename to lang/java/gradle-plugin/src/test/groovy/org/apache/avro/OptionsFunctionalSpec.groovy index 792b82a1f75..af9ea4ee1b8 100644 --- a/lang/java/gradle-plugin/src/test/groovy/org/apache/avro/test/custom/OptionsFunctionalSpec.groovy +++ b/lang/java/gradle-plugin/src/test/groovy/org/apache/avro/OptionsFunctionalSpec.groovy @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.avro.test.custom +package org.apache.avro import org.apache.avro.test.custom.CommentGenerator import org.apache.avro.test.custom.TimestampGenerator diff --git a/lang/java/gradle-plugin/src/test/groovy/org/apache/avro/test/custom/ResolveAvroDependenciesTaskFunctionalSpec.groovy b/lang/java/gradle-plugin/src/test/groovy/org/apache/avro/ResolveAvroDependenciesTaskFunctionalSpec.groovy similarity index 94% rename from lang/java/gradle-plugin/src/test/groovy/org/apache/avro/test/custom/ResolveAvroDependenciesTaskFunctionalSpec.groovy rename to lang/java/gradle-plugin/src/test/groovy/org/apache/avro/ResolveAvroDependenciesTaskFunctionalSpec.groovy index 3963b880877..0bfa2c68973 100644 --- a/lang/java/gradle-plugin/src/test/groovy/org/apache/avro/test/custom/ResolveAvroDependenciesTaskFunctionalSpec.groovy +++ b/lang/java/gradle-plugin/src/test/groovy/org/apache/avro/ResolveAvroDependenciesTaskFunctionalSpec.groovy @@ -1,6 +1,6 @@ -package org.apache.avro.test.custom +package org.apache.avro + -import org.apache.avro.ResolveAvroDependenciesTask import org.hamcrest.MatcherAssert import spock.lang.Subject import uk.co.datumedge.hamcrest.json.SameJSONAs diff --git a/lang/java/gradle-plugin/src/test/groovy/org/apache/avro/test/custom/SchemaResolverSpec.groovy b/lang/java/gradle-plugin/src/test/groovy/org/apache/avro/SchemaResolverSpec.groovy similarity index 99% rename from lang/java/gradle-plugin/src/test/groovy/org/apache/avro/test/custom/SchemaResolverSpec.groovy rename to lang/java/gradle-plugin/src/test/groovy/org/apache/avro/SchemaResolverSpec.groovy index 0303ce7958a..aa93af15fe1 100644 --- a/lang/java/gradle-plugin/src/test/groovy/org/apache/avro/test/custom/SchemaResolverSpec.groovy +++ b/lang/java/gradle-plugin/src/test/groovy/org/apache/avro/SchemaResolverSpec.groovy @@ -1,4 +1,4 @@ -package org.apache.avro.test.custom +package org.apache.avro import org.apache.avro.SchemaResolver import org.gradle.api.GradleException diff --git a/lang/java/gradle-plugin/src/test/groovy/org/apache/avro/test/custom/StringsSpec.groovy b/lang/java/gradle-plugin/src/test/groovy/org/apache/avro/StringsSpec.groovy similarity index 97% rename from lang/java/gradle-plugin/src/test/groovy/org/apache/avro/test/custom/StringsSpec.groovy rename to lang/java/gradle-plugin/src/test/groovy/org/apache/avro/StringsSpec.groovy index df07fc660f6..ed132209460 100644 --- a/lang/java/gradle-plugin/src/test/groovy/org/apache/avro/test/custom/StringsSpec.groovy +++ b/lang/java/gradle-plugin/src/test/groovy/org/apache/avro/StringsSpec.groovy @@ -1,4 +1,4 @@ -package org.apache.avro.test.custom +package org.apache.avro import org.apache.avro.Strings import spock.lang.Specification