fixing package name

RanbirK · Jun 16, 2024 · e2c6dfb · e2c6dfb
1 parent 6fb71ef
commit e2c6dfb
Show file tree

Hide file tree

Showing 19 changed files with 45 additions and 31 deletions.
diff --git a/lang/java/gradle-plugin/README.md b/lang/java/gradle-plugin/README.md
@@ -55,7 +55,7 @@ pluginManagement {
 `build.gradle`:
 ```groovy
 plugins {
-    id "com.github.davidmc24.gradle.plugin.avro" version "VERSION"
+    id "org.apache.gradle.plugin.avro" version "VERSION"
 }
 ```
 
@@ -271,8 +271,8 @@ dependencies {
 
 avro {
     conversionsAndTypeFactoriesClasspath.from(configurations.customConversions)
-    logicalTypeFactoryClassNames.put("timezone", "test.java.org.apache.avro.test.custom.TimeZoneLogicalTypeFactory")
-    customConversionClassNames.add("test.java.org.apache.avro.test.custom.TimeZoneConversion")
+    logicalTypeFactoryClassNames.put("timezone", "org.apache.avro.test.custom.TimeZoneLogicalTypeFactory")
+    customConversionClassNames.add("org.apache.avro.test.custom.TimeZoneConversion")
 }
 ```
 
@@ -293,7 +293,7 @@ Here's a short example of what this might look like:
 import main.java.org.apache.avro.GenerateAvroJavaTask
 
 apply plugin: "java"
-apply plugin: "com.github.davidmc24.gradle.plugin.avro-base"
+apply plugin: "org.apache.gradle.plugin.avro-base"
 
 dependencies {
     implementation "org.apache.avro:avro:1.11.0"
@@ -386,7 +386,7 @@ In `gradle.build.kts` add:
 ```kotlin
 plugins {
     // Find latest release here: https://github.com/davidmc24/gradle-avro-plugin/releases
-    id("com.github.davidmc24.gradle.plugin.avro") version "VERSION"
+    id("org.apache.gradle.plugin.avro") version "VERSION"
 }
 ```
 
@@ -426,7 +426,7 @@ Example build:
 ```groovy
 import main.java.org.apache.avro.ResolveAvroDependenciesTask
 
-apply plugin: "com.github.davidmc24.gradle.plugin.avro-base"
+apply plugin: "org.apache.gradle.plugin.avro-base"
 
 tasks.register("resolveAvroDependencies", ResolveAvroDependenciesTask) {
     source file("src/avro/normalized")
@@ -444,10 +444,10 @@ From IDL files, first use `GenerateAvroProtocolTask` to convert the IDL files to
 Example using base plugin with support for both IDL and JSON protocol files in `src/main/avro`:
 
 ```groovy
-import main.java.org.apache.avro.GenerateAvroProtocolTask
-import main.java.org.apache.avro.GenerateAvroSchemaTask
+import org.apache.avro.GenerateAvroProtocolTask
+import org.apache.avro.GenerateAvroSchemaTask
 
-apply plugin: "com.github.davidmc24.gradle.plugin.avro-base"
+apply plugin: "org.apache.gradle.plugin.avro-base"
 
 def generateProtocol = tasks.register("generateProtocol", GenerateAvroProtocolTask) {
     source file("src/main/avro")

diff --git a/.../avro/AvroBasePluginFunctionalSpec.groovy → ...ustom/AvroBasePluginFunctionalSpec.groovy b/.../avro/AvroBasePluginFunctionalSpec.groovy → ...ustom/AvroBasePluginFunctionalSpec.groovy
@@ -13,10 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package  org.apache.avro
+package org.apache.avro.test.custom
 
-import test.java.org.apache.avro.test.custom.CommentGenerator
-import test.java.org.apache.avro.test.custom.TimestampGenerator
+import org.apache.avro.test.custom.CommentGenerator
+import org.apache.avro.test.custom.TimestampGenerator
 
 import static org.gradle.testkit.runner.TaskOutcome.SUCCESS
 

diff --git a/...ache/avro/AvroPluginFunctionalSpec.groovy → ...st/custom/AvroPluginFunctionalSpec.groovy b/...ache/avro/AvroPluginFunctionalSpec.groovy → ...st/custom/AvroPluginFunctionalSpec.groovy
@@ -13,7 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package  org.apache.avro
+package org.apache.avro.test.custom
+
+import org.apache.avro.GradleFeatures
 
 import static org.gradle.testkit.runner.TaskOutcome.FAILED
 import static org.gradle.testkit.runner.TaskOutcome.SUCCESS

diff --git a/...ovy/org/apache/avro/AvroPluginSpec.groovy → ...he/avro/test/custom/AvroPluginSpec.groovy b/...ovy/org/apache/avro/AvroPluginSpec.groovy → ...he/avro/test/custom/AvroPluginSpec.groovy
@@ -13,8 +13,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package  org.apache.avro
+package org.apache.avro.test.custom
 
+import org.apache.avro.AvroPlugin
+import org.apache.avro.Constants
+import org.apache.avro.GenerateAvroJavaTask
+import org.apache.avro.GenerateAvroProtocolTask
+import org.apache.avro.OutputDirTask
 import org.gradle.api.Project
 import org.gradle.testfixtures.ProjectBuilder
 import spock.lang.Specification

diff --git a/...oovy/org/apache/avro/AvroUtilsSpec.groovy → ...che/avro/test/custom/AvroUtilsSpec.groovy b/...oovy/org/apache/avro/AvroUtilsSpec.groovy → ...che/avro/test/custom/AvroUtilsSpec.groovy
@@ -1,5 +1,6 @@
-package  org.apache.avro
+package org.apache.avro.test.custom
 
+import org.apache.avro.AvroUtils
 import org.apache.avro.Protocol
 import org.apache.avro.Schema
 import spock.lang.Specification

diff --git a/...ro/BuildCacheSupportFunctionalSpec.groovy → ...om/BuildCacheSupportFunctionalSpec.groovy b/...ro/BuildCacheSupportFunctionalSpec.groovy → ...om/BuildCacheSupportFunctionalSpec.groovy
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package  org.apache.avro
+package org.apache.avro.test.custom
 
 import spock.lang.IgnoreIf
 import spock.util.environment.OperatingSystem

diff --git a/...vro/CustomConversionFunctionalSpec.groovy → ...tom/CustomConversionFunctionalSpec.groovy b/...vro/CustomConversionFunctionalSpec.groovy → ...tom/CustomConversionFunctionalSpec.groovy
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package  org.apache.avro
+package org.apache.avro.test.custom
 
 import static org.gradle.testkit.runner.TaskOutcome.SUCCESS
 

diff --git a/...ro/DuplicateHandlingFunctionalSpec.groovy → ...om/DuplicateHandlingFunctionalSpec.groovy b/...ro/DuplicateHandlingFunctionalSpec.groovy → ...om/DuplicateHandlingFunctionalSpec.groovy
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package  org.apache.avro
+package org.apache.avro.test.custom
 
 import static org.gradle.testkit.runner.TaskOutcome.FAILED
 import static org.gradle.testkit.runner.TaskOutcome.SUCCESS

diff --git a/...apache/avro/EncodingFunctionalSpec.groovy → ...test/custom/EncodingFunctionalSpec.groovy b/...apache/avro/EncodingFunctionalSpec.groovy → ...test/custom/EncodingFunctionalSpec.groovy
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package  org.apache.avro
+package org.apache.avro.test.custom
 
 import spock.lang.Unroll
 

diff --git a/...he/avro/EnumHandlingFunctionalSpec.groovy → .../custom/EnumHandlingFunctionalSpec.groovy b/...he/avro/EnumHandlingFunctionalSpec.groovy → .../custom/EnumHandlingFunctionalSpec.groovy
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package  org.apache.avro
+package org.apache.avro.test.custom
 
 import static org.gradle.testkit.runner.TaskOutcome.SUCCESS
 

diff --git a/...apache/avro/ExamplesFunctionalSpec.groovy → ...test/custom/ExamplesFunctionalSpec.groovy b/...apache/avro/ExamplesFunctionalSpec.groovy → ...test/custom/ExamplesFunctionalSpec.groovy
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package  org.apache.avro
+package org.apache.avro.test.custom
 
 import static org.gradle.testkit.runner.TaskOutcome.SUCCESS
 

diff --git a/...ovy/org/apache/avro/FunctionalSpec.groovy → ...he/avro/test/custom/FunctionalSpec.groovy b/...ovy/org/apache/avro/FunctionalSpec.groovy → ...he/avro/test/custom/FunctionalSpec.groovy
@@ -13,9 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package  org.apache.avro
+package org.apache.avro.test.custom
 
 import com.vdurmont.semver4j.Semver
+import org.apache.avro.GradleFeatures
 import org.gradle.testkit.runner.BuildResult
 import org.gradle.testkit.runner.GradleRunner
 import org.gradle.util.GradleVersion

diff --git a/...rateAvroProtocolTaskFunctionalSpec.groovy → ...rateAvroProtocolTaskFunctionalSpec.groovy b/...rateAvroProtocolTaskFunctionalSpec.groovy → ...rateAvroProtocolTaskFunctionalSpec.groovy
@@ -13,8 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package  org.apache.avro
+package org.apache.avro.test.custom
 
+import org.apache.avro.GenerateAvroProtocolTask
 import spock.lang.Subject
 
 import static org.gradle.testkit.runner.TaskOutcome.SUCCESS

diff --git a/...apache/avro/IntellijFunctionalSpec.groovy → ...test/custom/IntellijFunctionalSpec.groovy b/...apache/avro/IntellijFunctionalSpec.groovy → ...test/custom/IntellijFunctionalSpec.groovy
@@ -13,8 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package  org.apache.avro
+package org.apache.avro.test.custom
 
+import org.apache.avro.GradleFeatures
 import org.gradle.testkit.runner.BuildResult
 
 import static org.gradle.testkit.runner.TaskOutcome.SUCCESS

diff --git a/...tlinDSLCompatibilityFunctionalSpec.groovy → ...tlinDSLCompatibilityFunctionalSpec.groovy b/...tlinDSLCompatibilityFunctionalSpec.groovy → ...tlinDSLCompatibilityFunctionalSpec.groovy
@@ -1,4 +1,4 @@
-package  org.apache.avro
+package org.apache.avro.test.custom
 
 import static org.gradle.testkit.runner.TaskOutcome.SUCCESS
 

diff --git a/.../apache/avro/OptionsFunctionalSpec.groovy → .../test/custom/OptionsFunctionalSpec.groovy b/.../apache/avro/OptionsFunctionalSpec.groovy → .../test/custom/OptionsFunctionalSpec.groovy
@@ -13,10 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package  org.apache.avro
+package org.apache.avro.test.custom
 
-import test.java.org.apache.avro.test.custom.CommentGenerator
-import test.java.org.apache.avro.test.custom.TimestampGenerator
+import org.apache.avro.test.custom.CommentGenerator
+import org.apache.avro.test.custom.TimestampGenerator
 import org.apache.avro.compiler.specific.SpecificCompiler.FieldVisibility
 import org.apache.avro.generic.GenericData.StringType
 import spock.lang.Unroll

diff --git a/...AvroDependenciesTaskFunctionalSpec.groovy → ...AvroDependenciesTaskFunctionalSpec.groovy b/...AvroDependenciesTaskFunctionalSpec.groovy → ...AvroDependenciesTaskFunctionalSpec.groovy
@@ -1,5 +1,6 @@
-package  org.apache.avro
+package org.apache.avro.test.custom
 
+import org.apache.avro.ResolveAvroDependenciesTask
 import org.hamcrest.MatcherAssert
 import spock.lang.Subject
 import uk.co.datumedge.hamcrest.json.SameJSONAs

diff --git a/...org/apache/avro/SchemaResolverSpec.groovy → ...vro/test/custom/SchemaResolverSpec.groovy b/...org/apache/avro/SchemaResolverSpec.groovy → ...vro/test/custom/SchemaResolverSpec.groovy
@@ -1,5 +1,6 @@
-package  org.apache.avro
+package org.apache.avro.test.custom
 
+import org.apache.avro.SchemaResolver
 import org.gradle.api.GradleException
 import org.gradle.api.Project
 import org.gradle.testfixtures.ProjectBuilder

diff --git a/...groovy/org/apache/avro/StringsSpec.groovy → ...pache/avro/test/custom/StringsSpec.groovy b/...groovy/org/apache/avro/StringsSpec.groovy → ...pache/avro/test/custom/StringsSpec.groovy
@@ -1,5 +1,6 @@
-package  org.apache.avro
+package org.apache.avro.test.custom
 
+import org.apache.avro.Strings
 import spock.lang.Specification
 import spock.lang.Subject
 import spock.lang.Unroll