Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 5c86c4a

Browse files
dreab8dreab8
committed
Merge remote-tracking branch 'upstream/master' into wip/6.0_merge_29
2 parents fe25fee + ba0902d commit 5c86c4a

149 files changed

Lines changed: 392 additions & 233 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎build.gradle‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ buildscript {
2323
}
2424

2525
plugins {
26-
id 'com.gradle.build-scan' version '2.4.2'
2726
id 'me.champeau.buildscan-recipes' version '0.2.3'
2827
id 'org.hibernate.build.xjc' version '2.0.1' apply false
2928
id 'org.hibernate.build.maven-repo-auth' version '3.0.2' apply false

‎gradle/java-module.gradle‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -51,10 +51,8 @@ ext {
5151
sourceCompatibility = project.baselineJavaVersion
5252
targetCompatibility = project.baselineJavaVersion
5353

54-
afterEvaluate {
55-
if ( !project.description ) {
56-
project.description = "The Hibernate ORM $project.name module"
57-
}
54+
if ( !project.description ) {
55+
project.description = "The Hibernate ORM $project.name module"
5856
}
5957

6058

‎gradle/publishing-pom.gradle‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,11 @@
77

88
apply plugin: 'maven-publish'
99

10+
// Disable Gradle module metadata publishing until we know what we want.
11+
// https://docs.gradle.org/6.0.1/userguide/publishing_gradle_module_metadata.html#sub:disabling-gmm-publication
12+
tasks.withType(GenerateModuleMetadata) {
13+
enabled = false
14+
}
1015

1116
publishing {
1217

‎gradle/wrapper/gradle-wrapper.jar‎

-561 Bytes
Binary file not shown.

‎gradle/wrapper/gradle-wrapper.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.3-all.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-6.3-all.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists

‎gradlew‎

Lines changed: 19 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎gradlew.bat‎

Lines changed: 17 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎hibernate-agroal/hibernate-agroal.gradle‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@
55
* See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
66
*/
77

8-
apply from: rootProject.file( 'gradle/published-java-module.gradle' )
9-
108
description = 'Integration for Agroal as a ConnectionProvider for Hibernate ORM'
119

10+
apply from: rootProject.file( 'gradle/published-java-module.gradle' )
11+
1212
dependencies {
1313
compile project( ':hibernate-core' )
1414
compile( libraries.agroal_api )

‎hibernate-c3p0/hibernate-c3p0.gradle‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@
55
* See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
66
*/
77

8-
apply from: rootProject.file( 'gradle/published-java-module.gradle' )
9-
108
description = 'Integration for c3p0 Connection pooling into Hibernate ORM'
119

10+
apply from: rootProject.file( 'gradle/published-java-module.gradle' )
11+
1212
dependencies {
1313
compile project( ':hibernate-core' )
1414
compile( libraries.c3p0 )

‎hibernate-core/hibernate-core.gradle‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,12 @@ plugins {
1010
*/
1111
import org.apache.tools.ant.filters.ReplaceTokens
1212

13+
description = 'Hibernate\'s core ORM functionality'
14+
1315
apply from: rootProject.file( 'gradle/published-java-module.gradle' )
1416
apply plugin: Antlr4Plugin
1517
apply plugin: 'hibernate-matrix-testing'
1618

17-
description = 'Hibernate\'s core ORM functionality'
18-
1919
ext {
2020
jaxbTargetDir = file( "${buildDir}/generated-src/jaxb/main" )
2121
}

0 commit comments

Comments
 (0)