From 26ccd0c36ddf03993dd27681a23dabd3c1c7454c Mon Sep 17 00:00:00 2001 From: Steve Ebersole Date: Fri, 14 May 2021 05:42:56 -0500 Subject: [PATCH] HHH-11995 - Drop hibernate-entitymanager artifact --- .../hibernate-entitymanager.gradle | 30 ------------------- .../src/main/resources/README.txt | 3 -- settings.gradle | 1 - 3 files changed, 34 deletions(-) delete mode 100644 hibernate-entitymanager/hibernate-entitymanager.gradle delete mode 100644 hibernate-entitymanager/src/main/resources/README.txt diff --git a/hibernate-entitymanager/hibernate-entitymanager.gradle b/hibernate-entitymanager/hibernate-entitymanager.gradle deleted file mode 100644 index b2c7a15411..0000000000 --- a/hibernate-entitymanager/hibernate-entitymanager.gradle +++ /dev/null @@ -1,30 +0,0 @@ -description = '(deprecated - use hibernate-core instead) Hibernate O/RM implementation of the JPA specification' - -apply from: rootProject.file( 'gradle/published-java-module.gradle' ) - -dependencies { - compile( project( ':hibernate-core' ) ) - compile( libraries.commons_annotations ) - compile( libraries.jpa ) - compile( libraries.byteBuddy ) - compile( libraries.jta ) -} - -// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// Traditionally we used to not include any manifest attributes in this JAR -// except "Manifest-Version" -// Since it's a legacy JAR, let's continue that way until it's retired. - -jar { - manifest.attributes.removeAll { key, value -> key != "Manifest-Version" } - // Prevent BND from adding manifest attributes automatically - bnd( '-nobundles': 'true' ) -} - -sourcesJar { - manifest.attributes.removeAll { key, value -> key != "Manifest-Version" } -} - -javadocJar { - manifest.attributes.removeAll { key, value -> key != "Manifest-Version" } -} diff --git a/hibernate-entitymanager/src/main/resources/README.txt b/hibernate-entitymanager/src/main/resources/README.txt deleted file mode 100644 index 5e3c2ce981..0000000000 --- a/hibernate-entitymanager/src/main/resources/README.txt +++ /dev/null @@ -1,3 +0,0 @@ -Hibernate's JPA support has been merged into the hibernate-core module, making this hibernate-entitymanager module -obsolete. This module will be removed in Hibernate ORM 6.0. It is only kept here for various consumers that expect a -static set of artifact names across a number of Hibernate releases. See https://hibernate.atlassian.net/browse/HHH-10823 \ No newline at end of file diff --git a/settings.gradle b/settings.gradle index 329205cf3b..39b8ff61da 100644 --- a/settings.gradle +++ b/settings.gradle @@ -87,7 +87,6 @@ logger.lifecycle "Java versions for main code: " + gradle.ext.javaVersions.main logger.lifecycle "Java versions for tests: " + gradle.ext.javaVersions.test include 'hibernate-core' -include 'hibernate-entitymanager' include 'hibernate-testing' include 'hibernate-envers' // todo (6.0): re-enable hibernate-spatial