From 2bc9c52c4b291e3722037a7f15745ef3c333c50b Mon Sep 17 00:00:00 2001 From: Steve Ebersole Date: Thu, 13 May 2021 12:43:03 -0500 Subject: [PATCH] HHH-11994 : drop `hibernate-java8` module --- hibernate-java8/hibernate-java8.gradle | 27 ------------------- hibernate-java8/src/main/resources/README.txt | 3 --- settings.gradle | 3 +-- 3 files changed, 1 insertion(+), 32 deletions(-) delete mode 100644 hibernate-java8/hibernate-java8.gradle delete mode 100644 hibernate-java8/src/main/resources/README.txt diff --git a/hibernate-java8/hibernate-java8.gradle b/hibernate-java8/hibernate-java8.gradle deleted file mode 100644 index 92511a29e6..0000000000 --- a/hibernate-java8/hibernate-java8.gradle +++ /dev/null @@ -1,27 +0,0 @@ -description = '(deprecated - use hibernate-core instead) Support for Java8-specific features - mainly Java8 Date/Time (JSR 310)' - -apply from: rootProject.file( 'gradle/published-java-module.gradle' ) - - -dependencies { - compile( project( ':hibernate-core' ) ) -} - -// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// 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-java8/src/main/resources/README.txt b/hibernate-java8/src/main/resources/README.txt deleted file mode 100644 index e8b21a8791..0000000000 --- a/hibernate-java8/src/main/resources/README.txt +++ /dev/null @@ -1,3 +0,0 @@ -Java8-specific Hibernate O/RM functionality has been merged into the hibernate-core module, making this hibernate-java8 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-10883 \ No newline at end of file diff --git a/settings.gradle b/settings.gradle index bae1b7e3b2..335e71fea3 100644 --- a/settings.gradle +++ b/settings.gradle @@ -5,6 +5,7 @@ * See the lgpl.txt file in the root directory or . */ + plugins { id 'com.gradle.enterprise' version '3.2.1' } @@ -93,8 +94,6 @@ include 'hibernate-envers' // todo (6.0): re-enable hibernate-spatial //include 'hibernate-spatial' -include 'hibernate-java8' - include 'hibernate-osgi' include 'hibernate-c3p0'