diff --git a/hibernate-orm-build/settings.gradle b/hibernate-orm-build/settings.gradle deleted file mode 100644 index db9f052a37..0000000000 --- a/hibernate-orm-build/settings.gradle +++ /dev/null @@ -1 +0,0 @@ -rootProject.name = 'hibernate-orm-build' diff --git a/hibernate-orm-build/build.gradle b/local-build-plugins/build.gradle similarity index 100% rename from hibernate-orm-build/build.gradle rename to local-build-plugins/build.gradle diff --git a/hibernate-orm-build/gradle/wrapper/gradle-wrapper.jar b/local-build-plugins/gradle/wrapper/gradle-wrapper.jar similarity index 100% rename from hibernate-orm-build/gradle/wrapper/gradle-wrapper.jar rename to local-build-plugins/gradle/wrapper/gradle-wrapper.jar diff --git a/hibernate-orm-build/gradle/wrapper/gradle-wrapper.properties b/local-build-plugins/gradle/wrapper/gradle-wrapper.properties similarity index 100% rename from hibernate-orm-build/gradle/wrapper/gradle-wrapper.properties rename to local-build-plugins/gradle/wrapper/gradle-wrapper.properties diff --git a/hibernate-orm-build/gradlew b/local-build-plugins/gradlew similarity index 100% rename from hibernate-orm-build/gradlew rename to local-build-plugins/gradlew diff --git a/hibernate-orm-build/gradlew.bat b/local-build-plugins/gradlew.bat similarity index 100% rename from hibernate-orm-build/gradlew.bat rename to local-build-plugins/gradlew.bat diff --git a/local-build-plugins/settings.gradle b/local-build-plugins/settings.gradle new file mode 100644 index 0000000000..1412c27cbe --- /dev/null +++ b/local-build-plugins/settings.gradle @@ -0,0 +1 @@ +rootProject.name = 'local-build-plugins' diff --git a/hibernate-orm-build/src/main/java/org/hibernate/orm/FileCommandLineArgumentProvider.java b/local-build-plugins/src/main/java/org/hibernate/orm/FileCommandLineArgumentProvider.java similarity index 100% rename from hibernate-orm-build/src/main/java/org/hibernate/orm/FileCommandLineArgumentProvider.java rename to local-build-plugins/src/main/java/org/hibernate/orm/FileCommandLineArgumentProvider.java diff --git a/hibernate-orm-build/src/main/java/org/hibernate/orm/ReleaseFamilyIdentifier.java b/local-build-plugins/src/main/java/org/hibernate/orm/ReleaseFamilyIdentifier.java similarity index 100% rename from hibernate-orm-build/src/main/java/org/hibernate/orm/ReleaseFamilyIdentifier.java rename to local-build-plugins/src/main/java/org/hibernate/orm/ReleaseFamilyIdentifier.java diff --git a/hibernate-orm-build/src/main/java/org/hibernate/orm/antlr/AntlrHelper.java b/local-build-plugins/src/main/java/org/hibernate/orm/antlr/AntlrHelper.java similarity index 100% rename from hibernate-orm-build/src/main/java/org/hibernate/orm/antlr/AntlrHelper.java rename to local-build-plugins/src/main/java/org/hibernate/orm/antlr/AntlrHelper.java diff --git a/hibernate-orm-build/src/main/java/org/hibernate/orm/antlr/AntlrPlugin.java b/local-build-plugins/src/main/java/org/hibernate/orm/antlr/AntlrPlugin.java similarity index 100% rename from hibernate-orm-build/src/main/java/org/hibernate/orm/antlr/AntlrPlugin.java rename to local-build-plugins/src/main/java/org/hibernate/orm/antlr/AntlrPlugin.java diff --git a/hibernate-orm-build/src/main/java/org/hibernate/orm/antlr/AntlrSpec.java b/local-build-plugins/src/main/java/org/hibernate/orm/antlr/AntlrSpec.java similarity index 100% rename from hibernate-orm-build/src/main/java/org/hibernate/orm/antlr/AntlrSpec.java rename to local-build-plugins/src/main/java/org/hibernate/orm/antlr/AntlrSpec.java diff --git a/hibernate-orm-build/src/main/java/org/hibernate/orm/antlr/GrammarDescriptorFactory.java b/local-build-plugins/src/main/java/org/hibernate/orm/antlr/GrammarDescriptorFactory.java similarity index 100% rename from hibernate-orm-build/src/main/java/org/hibernate/orm/antlr/GrammarDescriptorFactory.java rename to local-build-plugins/src/main/java/org/hibernate/orm/antlr/GrammarDescriptorFactory.java diff --git a/hibernate-orm-build/src/main/java/org/hibernate/orm/antlr/SplitGrammarDescriptor.java b/local-build-plugins/src/main/java/org/hibernate/orm/antlr/SplitGrammarDescriptor.java similarity index 100% rename from hibernate-orm-build/src/main/java/org/hibernate/orm/antlr/SplitGrammarDescriptor.java rename to local-build-plugins/src/main/java/org/hibernate/orm/antlr/SplitGrammarDescriptor.java diff --git a/hibernate-orm-build/src/main/java/org/hibernate/orm/antlr/SplitGrammarGenerationTask.java b/local-build-plugins/src/main/java/org/hibernate/orm/antlr/SplitGrammarGenerationTask.java similarity index 100% rename from hibernate-orm-build/src/main/java/org/hibernate/orm/antlr/SplitGrammarGenerationTask.java rename to local-build-plugins/src/main/java/org/hibernate/orm/antlr/SplitGrammarGenerationTask.java diff --git a/hibernate-orm-build/src/main/java/org/hibernate/orm/db/DatabaseService.java b/local-build-plugins/src/main/java/org/hibernate/orm/db/DatabaseService.java similarity index 100% rename from hibernate-orm-build/src/main/java/org/hibernate/orm/db/DatabaseService.java rename to local-build-plugins/src/main/java/org/hibernate/orm/db/DatabaseService.java diff --git a/hibernate-orm-build/src/main/java/org/hibernate/orm/db/DatabaseServicePlugin.java b/local-build-plugins/src/main/java/org/hibernate/orm/db/DatabaseServicePlugin.java similarity index 100% rename from hibernate-orm-build/src/main/java/org/hibernate/orm/db/DatabaseServicePlugin.java rename to local-build-plugins/src/main/java/org/hibernate/orm/db/DatabaseServicePlugin.java diff --git a/hibernate-orm-build/src/main/java/org/hibernate/orm/docs/DescriptorAccess.java b/local-build-plugins/src/main/java/org/hibernate/orm/docs/DescriptorAccess.java similarity index 100% rename from hibernate-orm-build/src/main/java/org/hibernate/orm/docs/DescriptorAccess.java rename to local-build-plugins/src/main/java/org/hibernate/orm/docs/DescriptorAccess.java diff --git a/hibernate-orm-build/src/main/java/org/hibernate/orm/docs/DocumentationPublishing.java b/local-build-plugins/src/main/java/org/hibernate/orm/docs/DocumentationPublishing.java similarity index 100% rename from hibernate-orm-build/src/main/java/org/hibernate/orm/docs/DocumentationPublishing.java rename to local-build-plugins/src/main/java/org/hibernate/orm/docs/DocumentationPublishing.java diff --git a/hibernate-orm-build/src/main/java/org/hibernate/orm/docs/DocumentationPublishingPlugin.java b/local-build-plugins/src/main/java/org/hibernate/orm/docs/DocumentationPublishingPlugin.java similarity index 100% rename from hibernate-orm-build/src/main/java/org/hibernate/orm/docs/DocumentationPublishingPlugin.java rename to local-build-plugins/src/main/java/org/hibernate/orm/docs/DocumentationPublishingPlugin.java diff --git a/hibernate-orm-build/src/main/java/org/hibernate/orm/docs/GenerateDescriptorTask.java b/local-build-plugins/src/main/java/org/hibernate/orm/docs/GenerateDescriptorTask.java similarity index 100% rename from hibernate-orm-build/src/main/java/org/hibernate/orm/docs/GenerateDescriptorTask.java rename to local-build-plugins/src/main/java/org/hibernate/orm/docs/GenerateDescriptorTask.java diff --git a/hibernate-orm-build/src/main/java/org/hibernate/orm/docs/ProjectDocumentation.java b/local-build-plugins/src/main/java/org/hibernate/orm/docs/ProjectDocumentation.java similarity index 100% rename from hibernate-orm-build/src/main/java/org/hibernate/orm/docs/ProjectDocumentation.java rename to local-build-plugins/src/main/java/org/hibernate/orm/docs/ProjectDocumentation.java diff --git a/hibernate-orm-build/src/main/java/org/hibernate/orm/docs/PublishDescriptorTask.java b/local-build-plugins/src/main/java/org/hibernate/orm/docs/PublishDescriptorTask.java similarity index 100% rename from hibernate-orm-build/src/main/java/org/hibernate/orm/docs/PublishDescriptorTask.java rename to local-build-plugins/src/main/java/org/hibernate/orm/docs/PublishDescriptorTask.java diff --git a/hibernate-orm-build/src/main/java/org/hibernate/orm/docs/PublishTask.java b/local-build-plugins/src/main/java/org/hibernate/orm/docs/PublishTask.java similarity index 100% rename from hibernate-orm-build/src/main/java/org/hibernate/orm/docs/PublishTask.java rename to local-build-plugins/src/main/java/org/hibernate/orm/docs/PublishTask.java diff --git a/hibernate-orm-build/src/main/java/org/hibernate/orm/docs/ReleaseFamilyDocumentation.java b/local-build-plugins/src/main/java/org/hibernate/orm/docs/ReleaseFamilyDocumentation.java similarity index 100% rename from hibernate-orm-build/src/main/java/org/hibernate/orm/docs/ReleaseFamilyDocumentation.java rename to local-build-plugins/src/main/java/org/hibernate/orm/docs/ReleaseFamilyDocumentation.java diff --git a/hibernate-orm-build/src/main/java/org/hibernate/orm/docs/ReleaseFamilyIdentifierMarshalling.java b/local-build-plugins/src/main/java/org/hibernate/orm/docs/ReleaseFamilyIdentifierMarshalling.java similarity index 100% rename from hibernate-orm-build/src/main/java/org/hibernate/orm/docs/ReleaseFamilyIdentifierMarshalling.java rename to local-build-plugins/src/main/java/org/hibernate/orm/docs/ReleaseFamilyIdentifierMarshalling.java diff --git a/hibernate-orm-build/src/main/java/org/hibernate/orm/jakarta/JakartaDirectoryTransformation.java b/local-build-plugins/src/main/java/org/hibernate/orm/jakarta/JakartaDirectoryTransformation.java similarity index 100% rename from hibernate-orm-build/src/main/java/org/hibernate/orm/jakarta/JakartaDirectoryTransformation.java rename to local-build-plugins/src/main/java/org/hibernate/orm/jakarta/JakartaDirectoryTransformation.java diff --git a/hibernate-orm-build/src/main/java/org/hibernate/orm/jakarta/JakartaJarTransformation.java b/local-build-plugins/src/main/java/org/hibernate/orm/jakarta/JakartaJarTransformation.java similarity index 100% rename from hibernate-orm-build/src/main/java/org/hibernate/orm/jakarta/JakartaJarTransformation.java rename to local-build-plugins/src/main/java/org/hibernate/orm/jakarta/JakartaJarTransformation.java diff --git a/hibernate-orm-build/src/main/java/org/hibernate/orm/jakarta/JakartaPlugin.java b/local-build-plugins/src/main/java/org/hibernate/orm/jakarta/JakartaPlugin.java similarity index 100% rename from hibernate-orm-build/src/main/java/org/hibernate/orm/jakarta/JakartaPlugin.java rename to local-build-plugins/src/main/java/org/hibernate/orm/jakarta/JakartaPlugin.java diff --git a/hibernate-orm-build/src/main/java/org/hibernate/orm/jakarta/JakartaPublishingPlugin.java b/local-build-plugins/src/main/java/org/hibernate/orm/jakarta/JakartaPublishingPlugin.java similarity index 100% rename from hibernate-orm-build/src/main/java/org/hibernate/orm/jakarta/JakartaPublishingPlugin.java rename to local-build-plugins/src/main/java/org/hibernate/orm/jakarta/JakartaPublishingPlugin.java diff --git a/hibernate-orm-build/src/main/java/org/hibernate/orm/jakarta/JakartaSpec.java b/local-build-plugins/src/main/java/org/hibernate/orm/jakarta/JakartaSpec.java similarity index 100% rename from hibernate-orm-build/src/main/java/org/hibernate/orm/jakarta/JakartaSpec.java rename to local-build-plugins/src/main/java/org/hibernate/orm/jakarta/JakartaSpec.java diff --git a/hibernate-orm-build/src/main/java/org/hibernate/orm/post/AbstractJandexAwareTask.java b/local-build-plugins/src/main/java/org/hibernate/orm/post/AbstractJandexAwareTask.java similarity index 100% rename from hibernate-orm-build/src/main/java/org/hibernate/orm/post/AbstractJandexAwareTask.java rename to local-build-plugins/src/main/java/org/hibernate/orm/post/AbstractJandexAwareTask.java diff --git a/hibernate-orm-build/src/main/java/org/hibernate/orm/post/Inclusion.java b/local-build-plugins/src/main/java/org/hibernate/orm/post/Inclusion.java similarity index 100% rename from hibernate-orm-build/src/main/java/org/hibernate/orm/post/Inclusion.java rename to local-build-plugins/src/main/java/org/hibernate/orm/post/Inclusion.java diff --git a/hibernate-orm-build/src/main/java/org/hibernate/orm/post/IncubationReportTask.java b/local-build-plugins/src/main/java/org/hibernate/orm/post/IncubationReportTask.java similarity index 100% rename from hibernate-orm-build/src/main/java/org/hibernate/orm/post/IncubationReportTask.java rename to local-build-plugins/src/main/java/org/hibernate/orm/post/IncubationReportTask.java diff --git a/hibernate-orm-build/src/main/java/org/hibernate/orm/post/IndexManager.java b/local-build-plugins/src/main/java/org/hibernate/orm/post/IndexManager.java similarity index 100% rename from hibernate-orm-build/src/main/java/org/hibernate/orm/post/IndexManager.java rename to local-build-plugins/src/main/java/org/hibernate/orm/post/IndexManager.java diff --git a/hibernate-orm-build/src/main/java/org/hibernate/orm/post/IndexerTask.java b/local-build-plugins/src/main/java/org/hibernate/orm/post/IndexerTask.java similarity index 100% rename from hibernate-orm-build/src/main/java/org/hibernate/orm/post/IndexerTask.java rename to local-build-plugins/src/main/java/org/hibernate/orm/post/IndexerTask.java diff --git a/hibernate-orm-build/src/main/java/org/hibernate/orm/post/InternalsReportTask.java b/local-build-plugins/src/main/java/org/hibernate/orm/post/InternalsReportTask.java similarity index 100% rename from hibernate-orm-build/src/main/java/org/hibernate/orm/post/InternalsReportTask.java rename to local-build-plugins/src/main/java/org/hibernate/orm/post/InternalsReportTask.java diff --git a/hibernate-orm-build/src/main/java/org/hibernate/orm/post/LoggingReportTask.java b/local-build-plugins/src/main/java/org/hibernate/orm/post/LoggingReportTask.java similarity index 100% rename from hibernate-orm-build/src/main/java/org/hibernate/orm/post/LoggingReportTask.java rename to local-build-plugins/src/main/java/org/hibernate/orm/post/LoggingReportTask.java diff --git a/hibernate-orm-build/src/main/java/org/hibernate/orm/post/LoggingReportTask2.java b/local-build-plugins/src/main/java/org/hibernate/orm/post/LoggingReportTask2.java similarity index 100% rename from hibernate-orm-build/src/main/java/org/hibernate/orm/post/LoggingReportTask2.java rename to local-build-plugins/src/main/java/org/hibernate/orm/post/LoggingReportTask2.java diff --git a/hibernate-orm-build/src/main/java/org/hibernate/orm/post/ReportGenerationPlugin.java b/local-build-plugins/src/main/java/org/hibernate/orm/post/ReportGenerationPlugin.java similarity index 100% rename from hibernate-orm-build/src/main/java/org/hibernate/orm/post/ReportGenerationPlugin.java rename to local-build-plugins/src/main/java/org/hibernate/orm/post/ReportGenerationPlugin.java diff --git a/hibernate-orm-build/src/main/java/org/hibernate/orm/post/package-info.java b/local-build-plugins/src/main/java/org/hibernate/orm/post/package-info.java similarity index 100% rename from hibernate-orm-build/src/main/java/org/hibernate/orm/post/package-info.java rename to local-build-plugins/src/main/java/org/hibernate/orm/post/package-info.java diff --git a/settings.gradle b/settings.gradle index 27d6f4845d..dec931fd9c 100644 --- a/settings.gradle +++ b/settings.gradle @@ -13,6 +13,8 @@ pluginManagement { url = uri( "${gradle.gradleUserHomeDir}/tmp/plugins" ) } } + + includeBuild 'local-build-plugins' } plugins { @@ -135,8 +137,6 @@ else { logger.lifecycle "Java versions for main code: " + gradle.ext.javaVersions.main logger.lifecycle "Java versions for tests: " + gradle.ext.javaVersions.test -includeBuild('hibernate-orm-build') - include 'hibernate-core' include 'hibernate-testing'