From bb5ff091af47bebcf0b9b771c0375c247dfaf030 Mon Sep 17 00:00:00 2001 From: Puneet Behl Date: Tue, 30 Apr 2024 16:59:02 +0530 Subject: [PATCH 01/13] chore(ci): Update renovate.json (#13488) --- .github/renovate.json | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.github/renovate.json b/.github/renovate.json index f50d856547b..ea24e8217ff 100644 --- a/.github/renovate.json +++ b/.github/renovate.json @@ -65,6 +65,13 @@ "^org\\.apache\\.maven\\.resolver" ], "groupName": "apache-maven-resolver monorepo" + }, + { + "matchPackagePatterns": [ + "^org\\.springframework\\:", + "^org\\.springframework\\.boot\\:" + ], + "groupName": "spring-framework" } ] } From 04b52f2db0ade18e00685afe4d8b46dd67dd7eaf Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 2 May 2024 17:17:49 +0530 Subject: [PATCH 02/13] fix(deps): update apache-tomcat monorepo to v9.0.88 (#13500) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index c37b9b4a56a..c3453e17f5d 100644 --- a/gradle.properties +++ b/gradle.properties @@ -45,7 +45,7 @@ springVersion=5.3.33 testingSupportVersion=3.2.1 testingSupportVersionForTests=3.2.1 tomcatLog4jVersion=8.5.2 -tomcatVersion=9.0.87 +tomcatVersion=9.0.88 viewsVersion=3.2.3 org.gradle.caching=true org.gradle.parallel=true From 92bba69d6d62bf4ddd84094f689ccc3b99708b69 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 3 May 2024 18:15:55 +0530 Subject: [PATCH 03/13] fix(deps): update dependency com.github.javaparser:javaparser-core to v3.25.10 (#13501) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index c3453e17f5d..4b299ab4f6f 100644 --- a/gradle.properties +++ b/gradle.properties @@ -18,7 +18,7 @@ h2Version=2.2.224 hibernateDatastoreVersion=8.1.0 jakartaAnnotationApiVersion=2.0.0 jansiVersion=1.18 -javaParserCoreVersion=3.25.9 +javaParserCoreVersion=3.25.10 javaxAnnotationApiVersion=1.3.2 jaxbApiVersion=2.3.1 jaxbImplVersion=4.0.5 From 26245fe430790bee6adea75f97972f5e19574cb1 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 3 May 2024 18:35:26 +0530 Subject: [PATCH 04/13] fix(deps): update grails-testing-support monorepo to v3.2.2 (#13504) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 4b299ab4f6f..97d4060e5f4 100644 --- a/gradle.properties +++ b/gradle.properties @@ -43,7 +43,7 @@ springBootVersion=2.7.18 springLoadedVersion=1.2.8.RELEASE springVersion=5.3.33 testingSupportVersion=3.2.1 -testingSupportVersionForTests=3.2.1 +testingSupportVersionForTests=3.2.2 tomcatLog4jVersion=8.5.2 tomcatVersion=9.0.88 viewsVersion=3.2.3 From 434b370196da892a6a1c54cb0cc18999853d13f7 Mon Sep 17 00:00:00 2001 From: Sergio del Amo Date: Thu, 4 Jul 2024 08:24:00 +0200 Subject: [PATCH 05/13] apply license gradle plugin This PR applies the [Gradle License Plugin](https://github.com/hierynomus/license-gradle-plugin). The plugin contributes a gradle task `downloadLicenses` which generates a license report of every dependencies. The plugin is applied to subprojects and the root project to get an aggregated report. ./gradlew downloadLicenses open build/reports/license/license-dependency.html --- build.gradle | 53 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 53 insertions(+) diff --git a/build.gradle b/build.gradle index 3b56e2a9a85..0bece6acd3e 100644 --- a/build.gradle +++ b/build.gradle @@ -11,12 +11,59 @@ buildscript { classpath "javax.xml.bind:jaxb-api:$jaxbApiVersion" classpath "com.sun.xml.bind:jaxb-impl:$jaxbImplVersion" classpath "org.codehaus.groovy.modules.http-builder:http-builder:0.7.2" + classpath("gradle.plugin.com.hierynomus.gradle.plugins:license-gradle-plugin:0.16.1") } } import static groovyx.net.http.ContentType.* apply plugin: 'idea' +apply plugin: 'com.github.hierynomus.license-report' + +List licenseExclusions = [ + "org.grails.grails-bom", + "org.grails:grails-bootstrap", + "org.grails:grails-codecs", + "org.grails:grails-console", + "org.grails:grails-core", + "org.grails:grails-databinding", + "org.grails:grails-dependencies", + "org.grails:grails-docs", + "org.grails:grails-encoder", + "org.grails:grails-gradle-model", + "org.grails:grails-logging", + "org.grails:grails-plugin-codecs", + "org.grails:grails-plugin-controllers", + "org.grails:grails-plugin-databinding", + "org.grails:grails-plugin-datasource", + "org.grails:grails-plugin-domain-class", + "org.grails:grails-plugin-i18n", + "org.grails:grails-plugin-interceptors", + "org.grails:grails-plugin-mimetypes", + "org.grails:grails-plugin-rest", + "org.grails:grails-plugin-services", + "org.grails:grails-plugin-url-mappings", + "org.grails:grails-plugin-validation", + "org.grails:grails-spring", + "org.grails:grails-test", + "org.grails:grails-test-suite-base", + "org.grails:grails-test-suite-persistence", + "org.grails:grails-test-suite-uber", + "org.grails:grails-test-suite-web", + "org.grails:grails-web", + "org.grails:grails-web-boot", + "org.grails:grails-web-common", + "org.grails:grails-web-databinding", + "org.grails:grails-web-fileupload", + "org.grails:grails-web-mvc", + "org.grails:grails-web-url-mappings", +].collect { "${it}:${project.projectVersion}" as String} + +downloadLicenses { + includeProjectDependencies = true + dependencyConfiguration = 'runtimeClasspath' + excludeDependencies = licenseExclusions +} ext { isJava8Compatible = org.gradle.api.JavaVersion.current().isJava8Compatible() @@ -352,6 +399,12 @@ subprojects { project -> apply plugin: 'eclipse' apply plugin: 'idea' apply plugin: 'project-report' + apply plugin: 'com.github.hierynomus.license-report' + downloadLicenses { + includeProjectDependencies = true + dependencyConfiguration = 'runtimeClasspath' + excludeDependencies = licenseExclusions + } if (!isTestSuite) { From 9e7b15316cfa3a891850e9de8039ac9dd0698eba Mon Sep 17 00:00:00 2001 From: Sergio del Amo Date: Wed, 17 Jul 2024 09:01:35 +0200 Subject: [PATCH 06/13] extract to gradle/dependency-licenses.gradle --- build.gradle | 56 +++---------------------------- gradle/dependency-licenses.gradle | 55 ++++++++++++++++++++++++++++++ 2 files changed, 60 insertions(+), 51 deletions(-) create mode 100644 gradle/dependency-licenses.gradle diff --git a/build.gradle b/build.gradle index 0bece6acd3e..5d6ab87884b 100644 --- a/build.gradle +++ b/build.gradle @@ -18,52 +18,9 @@ buildscript { import static groovyx.net.http.ContentType.* apply plugin: 'idea' -apply plugin: 'com.github.hierynomus.license-report' - -List licenseExclusions = [ - "org.grails.grails-bom", - "org.grails:grails-bootstrap", - "org.grails:grails-codecs", - "org.grails:grails-console", - "org.grails:grails-core", - "org.grails:grails-databinding", - "org.grails:grails-dependencies", - "org.grails:grails-docs", - "org.grails:grails-encoder", - "org.grails:grails-gradle-model", - "org.grails:grails-logging", - "org.grails:grails-plugin-codecs", - "org.grails:grails-plugin-controllers", - "org.grails:grails-plugin-databinding", - "org.grails:grails-plugin-datasource", - "org.grails:grails-plugin-domain-class", - "org.grails:grails-plugin-i18n", - "org.grails:grails-plugin-interceptors", - "org.grails:grails-plugin-mimetypes", - "org.grails:grails-plugin-rest", - "org.grails:grails-plugin-services", - "org.grails:grails-plugin-url-mappings", - "org.grails:grails-plugin-validation", - "org.grails:grails-spring", - "org.grails:grails-test", - "org.grails:grails-test-suite-base", - "org.grails:grails-test-suite-persistence", - "org.grails:grails-test-suite-uber", - "org.grails:grails-test-suite-web", - "org.grails:grails-web", - "org.grails:grails-web-boot", - "org.grails:grails-web-common", - "org.grails:grails-web-databinding", - "org.grails:grails-web-fileupload", - "org.grails:grails-web-mvc", - "org.grails:grails-web-url-mappings", -].collect { "${it}:${project.projectVersion}" as String} - -downloadLicenses { - includeProjectDependencies = true - dependencyConfiguration = 'runtimeClasspath' - excludeDependencies = licenseExclusions -} + + + ext { isJava8Compatible = org.gradle.api.JavaVersion.current().isJava8Compatible() @@ -337,6 +294,7 @@ allprojects { } apply from: "gradle/idea.gradle" +apply from: "gradle/dependency-licenses.gradle" tasks.withType(org.gradle.api.tasks.javadoc.Groovydoc) { configure { @@ -400,11 +358,6 @@ subprojects { project -> apply plugin: 'idea' apply plugin: 'project-report' apply plugin: 'com.github.hierynomus.license-report' - downloadLicenses { - includeProjectDependencies = true - dependencyConfiguration = 'runtimeClasspath' - excludeDependencies = licenseExclusions - } if (!isTestSuite) { @@ -667,6 +620,7 @@ apply { from 'gradle/docs.gradle' // tasks for building the documentation (e.g. user guide, javadocs) from 'gradle/assemble.gradle' // tasks for creating an installation or distribution from 'gradle/findbugs.gradle' + from 'gradle/dependency-licenses.gradle' } task buildscriptDependencies(type: org.gradle.api.tasks.diagnostics.DependencyReportTask) { diff --git a/gradle/dependency-licenses.gradle b/gradle/dependency-licenses.gradle new file mode 100644 index 00000000000..ba04d88cd63 --- /dev/null +++ b/gradle/dependency-licenses.gradle @@ -0,0 +1,55 @@ +buildscript { + repositories { + maven { url "https://plugins.gradle.org/m2/" } + } + dependencies { + + classpath("gradle.plugin.com.hierynomus.gradle.plugins:license-gradle-plugin:0.16.1") + } +} +apply plugin: 'com.github.hierynomus.license-report' + +List licenseExclusions = [ + "org.grails.grails-bom", + "org.grails:grails-bootstrap", + "org.grails:grails-codecs", + "org.grails:grails-console", + "org.grails:grails-core", + "org.grails:grails-databinding", + "org.grails:grails-dependencies", + "org.grails:grails-docs", + "org.grails:grails-encoder", + "org.grails:grails-gradle-model", + "org.grails:grails-logging", + "org.grails:grails-plugin-codecs", + "org.grails:grails-plugin-controllers", + "org.grails:grails-plugin-databinding", + "org.grails:grails-plugin-datasource", + "org.grails:grails-plugin-domain-class", + "org.grails:grails-plugin-i18n", + "org.grails:grails-plugin-interceptors", + "org.grails:grails-plugin-mimetypes", + "org.grails:grails-plugin-rest", + "org.grails:grails-plugin-services", + "org.grails:grails-plugin-url-mappings", + "org.grails:grails-plugin-validation", + "org.grails:grails-spring", + "org.grails:grails-test", + "org.grails:grails-test-suite-base", + "org.grails:grails-test-suite-persistence", + "org.grails:grails-test-suite-uber", + "org.grails:grails-test-suite-web", + "org.grails:grails-web", + "org.grails:grails-web-boot", + "org.grails:grails-web-common", + "org.grails:grails-web-databinding", + "org.grails:grails-web-fileupload", + "org.grails:grails-web-mvc", + "org.grails:grails-web-url-mappings", +].collect { "${it}:${project.projectVersion}" as String} + +downloadLicenses { + includeProjectDependencies = true + dependencyConfiguration = 'runtimeClasspath' + excludeDependencies = licenseExclusions +} \ No newline at end of file From a40b53ac1f843f36e08af1b055dd2089f0ede378 Mon Sep 17 00:00:00 2001 From: Sergio del Amo Date: Fri, 19 Jul 2024 08:07:33 +0200 Subject: [PATCH 07/13] Update build.gradle --- build.gradle | 3 --- 1 file changed, 3 deletions(-) diff --git a/build.gradle b/build.gradle index 5d6ab87884b..30e6a795d65 100644 --- a/build.gradle +++ b/build.gradle @@ -19,9 +19,6 @@ import static groovyx.net.http.ContentType.* apply plugin: 'idea' - - - ext { isJava8Compatible = org.gradle.api.JavaVersion.current().isJava8Compatible() grailsVersion = project.projectVersion From d721bd97eec5d85b90671bf8d144018e437a1d7c Mon Sep 17 00:00:00 2001 From: Sergio del Amo Date: Fri, 19 Jul 2024 08:07:56 +0200 Subject: [PATCH 08/13] Update gradle.properties --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 97d4060e5f4..ab51651711e 100644 --- a/gradle.properties +++ b/gradle.properties @@ -18,7 +18,7 @@ h2Version=2.2.224 hibernateDatastoreVersion=8.1.0 jakartaAnnotationApiVersion=2.0.0 jansiVersion=1.18 -javaParserCoreVersion=3.25.10 +javaParserCoreVersion=3.25.9 javaxAnnotationApiVersion=1.3.2 jaxbApiVersion=2.3.1 jaxbImplVersion=4.0.5 From 76e51953901eb98e4cf2870fc2fcda9b64ed5daa Mon Sep 17 00:00:00 2001 From: Sergio del Amo Date: Fri, 19 Jul 2024 08:08:19 +0200 Subject: [PATCH 09/13] Update gradle.properties --- gradle.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gradle.properties b/gradle.properties index ab51651711e..c37b9b4a56a 100644 --- a/gradle.properties +++ b/gradle.properties @@ -43,9 +43,9 @@ springBootVersion=2.7.18 springLoadedVersion=1.2.8.RELEASE springVersion=5.3.33 testingSupportVersion=3.2.1 -testingSupportVersionForTests=3.2.2 +testingSupportVersionForTests=3.2.1 tomcatLog4jVersion=8.5.2 -tomcatVersion=9.0.88 +tomcatVersion=9.0.87 viewsVersion=3.2.3 org.gradle.caching=true org.gradle.parallel=true From b489a7361c346d38ead4d175e188f8380e0909d1 Mon Sep 17 00:00:00 2001 From: Sergio del Amo Date: Fri, 19 Jul 2024 08:08:58 +0200 Subject: [PATCH 10/13] Update renovate.json --- .github/renovate.json | 7 ------- 1 file changed, 7 deletions(-) diff --git a/.github/renovate.json b/.github/renovate.json index ea24e8217ff..f50d856547b 100644 --- a/.github/renovate.json +++ b/.github/renovate.json @@ -65,13 +65,6 @@ "^org\\.apache\\.maven\\.resolver" ], "groupName": "apache-maven-resolver monorepo" - }, - { - "matchPackagePatterns": [ - "^org\\.springframework\\:", - "^org\\.springframework\\.boot\\:" - ], - "groupName": "spring-framework" } ] } From 494dd22d06bfb250ad8fcff14d24677eb1d777d4 Mon Sep 17 00:00:00 2001 From: Sergio del Amo Date: Fri, 19 Jul 2024 08:26:09 +0200 Subject: [PATCH 11/13] fix merge --- build.gradle | 3 +-- gradle/dependency-licenses.gradle | 9 --------- 2 files changed, 1 insertion(+), 11 deletions(-) diff --git a/build.gradle b/build.gradle index 30e6a795d65..8c8d91bb30a 100644 --- a/build.gradle +++ b/build.gradle @@ -354,7 +354,7 @@ subprojects { project -> apply plugin: 'eclipse' apply plugin: 'idea' apply plugin: 'project-report' - apply plugin: 'com.github.hierynomus.license-report' + apply from: "../gradle/dependency-licenses.gradle" if (!isTestSuite) { @@ -617,7 +617,6 @@ apply { from 'gradle/docs.gradle' // tasks for building the documentation (e.g. user guide, javadocs) from 'gradle/assemble.gradle' // tasks for creating an installation or distribution from 'gradle/findbugs.gradle' - from 'gradle/dependency-licenses.gradle' } task buildscriptDependencies(type: org.gradle.api.tasks.diagnostics.DependencyReportTask) { diff --git a/gradle/dependency-licenses.gradle b/gradle/dependency-licenses.gradle index ba04d88cd63..4d72154e1a5 100644 --- a/gradle/dependency-licenses.gradle +++ b/gradle/dependency-licenses.gradle @@ -1,12 +1,3 @@ -buildscript { - repositories { - maven { url "https://plugins.gradle.org/m2/" } - } - dependencies { - - classpath("gradle.plugin.com.hierynomus.gradle.plugins:license-gradle-plugin:0.16.1") - } -} apply plugin: 'com.github.hierynomus.license-report' List licenseExclusions = [ From 0bb3d9029eb8a1d8073f06d897c489ed3fdfdc0c Mon Sep 17 00:00:00 2001 From: Sergio del Amo Date: Fri, 19 Jul 2024 09:11:01 +0200 Subject: [PATCH 12/13] apply licenses.gradle in allProjects --- build.gradle | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index 99cc4dbcb63..d0e7eae5f2c 100644 --- a/build.gradle +++ b/build.gradle @@ -296,10 +296,10 @@ allprojects { } } } + apply from: rootProject.layout.projectDirectory.file('gradle/dependency-licenses.gradle') } apply from: "gradle/idea.gradle" -apply from: "gradle/dependency-licenses.gradle" subprojects { project -> @@ -342,7 +342,6 @@ subprojects { project -> apply plugin: 'eclipse' apply plugin: 'idea' apply plugin: 'project-report' - apply from: "../gradle/dependency-licenses.gradle" if (!isTestSuite) { From 9a8826a5d68110adea926f271b98df9ef8abfd0d Mon Sep 17 00:00:00 2001 From: Sergio del Amo Date: Fri, 16 Aug 2024 09:50:50 +0200 Subject: [PATCH 13/13] simplify licenseExclusions --- gradle/dependency-licenses.gradle | 41 +++---------------------------- 1 file changed, 3 insertions(+), 38 deletions(-) diff --git a/gradle/dependency-licenses.gradle b/gradle/dependency-licenses.gradle index 4d72154e1a5..b857a00c7fd 100644 --- a/gradle/dependency-licenses.gradle +++ b/gradle/dependency-licenses.gradle @@ -1,43 +1,8 @@ apply plugin: 'com.github.hierynomus.license-report' -List licenseExclusions = [ - "org.grails.grails-bom", - "org.grails:grails-bootstrap", - "org.grails:grails-codecs", - "org.grails:grails-console", - "org.grails:grails-core", - "org.grails:grails-databinding", - "org.grails:grails-dependencies", - "org.grails:grails-docs", - "org.grails:grails-encoder", - "org.grails:grails-gradle-model", - "org.grails:grails-logging", - "org.grails:grails-plugin-codecs", - "org.grails:grails-plugin-controllers", - "org.grails:grails-plugin-databinding", - "org.grails:grails-plugin-datasource", - "org.grails:grails-plugin-domain-class", - "org.grails:grails-plugin-i18n", - "org.grails:grails-plugin-interceptors", - "org.grails:grails-plugin-mimetypes", - "org.grails:grails-plugin-rest", - "org.grails:grails-plugin-services", - "org.grails:grails-plugin-url-mappings", - "org.grails:grails-plugin-validation", - "org.grails:grails-spring", - "org.grails:grails-test", - "org.grails:grails-test-suite-base", - "org.grails:grails-test-suite-persistence", - "org.grails:grails-test-suite-uber", - "org.grails:grails-test-suite-web", - "org.grails:grails-web", - "org.grails:grails-web-boot", - "org.grails:grails-web-common", - "org.grails:grails-web-databinding", - "org.grails:grails-web-fileupload", - "org.grails:grails-web-mvc", - "org.grails:grails-web-url-mappings", -].collect { "${it}:${project.projectVersion}" as String} +List licenseExclusions = rootProject.subprojects.collect { + "org.grails:${it.name}:${rootProject.projectVersion}" as String +} downloadLicenses { includeProjectDependencies = true