From 4e852ad2b8bf65a52419411309c8b098e0cc9cb5 Mon Sep 17 00:00:00 2001 From: labkey-susanh Date: Fri, 13 Dec 2024 12:00:50 -0800 Subject: [PATCH 1/8] Update gradlePlugins, gradleNodePlugin and xmlbeans versions --- gradle.properties | 6 +++--- server/build.gradle | 7 ++++--- server/embedded/build.gradle | 6 +++--- 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/gradle.properties b/gradle.properties index 0854096e37..c8abed6cbb 100644 --- a/gradle.properties +++ b/gradle.properties @@ -58,8 +58,8 @@ windowsProteomicsBinariesVersion=1.0 # The current version numbers for the gradle plugins. artifactoryPluginVersion=5.2.5 -gradleNodePluginVersion=3.5.1 -gradlePluginsVersion=4.2.0 +gradleNodePluginVersion=7.1.0 +gradlePluginsVersion=5.1.0-npmSetupUpdates-SNAPSHOT owaspDependencyCheckPluginVersion=11.1.0 versioningPluginVersion=1.1.2 @@ -322,4 +322,4 @@ xercesImplVersion=2.12.2 xmlApisVersion=1.0.b2 # sync with Tika/POI -xmlbeansVersion=5.2.0 +xmlbeansVersion=5.2.2 diff --git a/server/build.gradle b/server/build.gradle index 6101773f0c..b752e89b60 100644 --- a/server/build.gradle +++ b/server/build.gradle @@ -231,8 +231,9 @@ else // Each project that requires node will have its own downloaded version of node and npm, but for the symlinkNode // task we need a single location, and one that works even when not building from source (Issue 35207) project.node { - workDir = BuildUtils.getRootBuildDirFile(project, ".node") - npmWorkDir = BuildUtils.getRootBuildDirFile(project, ".node") - yarnWorkDir = BuildUtils.getRootBuildDirFile(project, ".node") + workDir = project.file("${project.rootProject.projectDir}/.node") + npmWorkDir = project.file("${project.rootProject.projectDir}/.node") +// workDir = BuildUtils.getRootBuildDirFile(project, ".node") +// npmWorkDir = BuildUtils.getRootBuildDirFile(project, ".node") } project.tasks.named('deployApp').configure { dependsOn(project.tasks.npmSetup) } diff --git a/server/embedded/build.gradle b/server/embedded/build.gradle index bbb71e5862..943cf6b021 100644 --- a/server/embedded/build.gradle +++ b/server/embedded/build.gradle @@ -90,10 +90,10 @@ project.tasks.register( "checkVersionConflicts", CheckForVersionConflicts) { CheckForVersionConflicts task -> task.group = GroupNames.BUILD - task.description = "Check for conflicts in version numbers of jar file and files already in the build directory ${ServerDeployExtension.getEmbeddedServerDeployDirectory(project)}. " + + task.description = "Check for conflicts in version numbers of jar file and files already in the build directory ${ServerDeployExtension.getEmbeddedServerDeployDirectoryPath(project)}. " + "Default action on detecting a conflict is to fail. Use -PversionConflictAction=[delete|fail|warn] to change this behavior. The value 'delete' will cause the " + - "conflicting version(s) in the ${ServerDeployExtension.getEmbeddedServerDeployDirectory(project)} directory to be removed." - task.directory = new File(ServerDeployExtension.getEmbeddedServerDeployDirectory(project)) + "conflicting version(s) in the ${ServerDeployExtension.getEmbeddedServerDeployDirectoryPath(project)} directory to be removed." + task.directory = new File(ServerDeployExtension.getEmbeddedServerDeployDirectoryPath(project)) task.extension = "jar" task.cleanTask = "server:cleanEmbeddedDeploy" task.collection = project.tasks.bootJar.outputs.files From 500f00977d5e91b9be2c51437c62f7bc76111fea Mon Sep 17 00:00:00 2001 From: labkey-susanh Date: Tue, 17 Dec 2024 10:27:25 -0800 Subject: [PATCH 2/8] conditionalize setting of node plugin properties --- server/build.gradle | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/server/build.gradle b/server/build.gradle index b752e89b60..52b7f36344 100644 --- a/server/build.gradle +++ b/server/build.gradle @@ -230,10 +230,16 @@ else // We add this configuration here so we have a single location to link to for the npm and node executables. // Each project that requires node will have its own downloaded version of node and npm, but for the symlinkNode // task we need a single location, and one that works even when not building from source (Issue 35207) -project.node { - workDir = project.file("${project.rootProject.projectDir}/.node") - npmWorkDir = project.file("${project.rootProject.projectDir}/.node") -// workDir = BuildUtils.getRootBuildDirFile(project, ".node") -// npmWorkDir = BuildUtils.getRootBuildDirFile(project, ".node") +if (BuildUtils.useServerNode(project)) +{ + project.node { + workDir = project.file("${project.rootProject.projectDir}/.node") + npmWorkDir = project.file("${project.rootProject.projectDir}/.node") + } +} else { + project.node { + workDir = BuildUtils.getRootBuildDirFile(project, ".node") + npmWorkDir = BuildUtils.getRootBuildDirFile(project, ".node") + } } project.tasks.named('deployApp').configure { dependsOn(project.tasks.npmSetup) } From 4d62d5a3252f4a5c5d7fccc3ad340fd566eabf43 Mon Sep 17 00:00:00 2001 From: labkey-susanh Date: Tue, 17 Dec 2024 11:02:14 -0800 Subject: [PATCH 3/8] Update to xmlBeans v5.3.0 --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index c8abed6cbb..e7cc6a4e19 100644 --- a/gradle.properties +++ b/gradle.properties @@ -322,4 +322,4 @@ xercesImplVersion=2.12.2 xmlApisVersion=1.0.b2 # sync with Tika/POI -xmlbeansVersion=5.2.2 +xmlbeansVersion=5.3.0 From 177c872896dae8b6ab7dce08f3d83a042cf800d8 Mon Sep 17 00:00:00 2001 From: labkey-susanh Date: Tue, 17 Dec 2024 14:04:53 -0800 Subject: [PATCH 4/8] Remove lingering yarn references --- build.gradle | 2 +- gradle.properties | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/build.gradle b/build.gradle index 0ae95b26ad..e12e917871 100644 --- a/build.gradle +++ b/build.gradle @@ -506,7 +506,7 @@ project.tasks.register('listNpmProjects', DefaultTask) { List npmProjects = [] project.allprojects({Project p -> if (p.getPlugins().hasPlugin(NpmRun.class)) - npmProjects.add("${p.path} (${NpmRun.useYarn(p) ? 'yarn' : 'npm'})") + npmProjects.add(p.path) }) if (npmProjects.size() == 0) println("No projects found containing ${NpmRun.NPM_PROJECT_FILE}") diff --git a/gradle.properties b/gradle.properties index e7cc6a4e19..c02d5dbf2f 100644 --- a/gradle.properties +++ b/gradle.properties @@ -73,9 +73,6 @@ nodeRepo=https://nodejs.org/dist nodeWorkDirectory=.node # Directory in a project's build directory where the npm binary will be placed npmWorkDirectory=.node -#yarnVersion=1.16.0 -# Directory in a project's build directory where the yarn binary will be placed -#yarnWorkDirectory=.node # uncomment the line below to include version number info in build artifacts # Generally you don't need or want to do this when developing. From ef1f58abf07a6eea05ee27c07f1959cef31b4b21 Mon Sep 17 00:00:00 2001 From: labkey-susanh Date: Wed, 18 Dec 2024 10:30:46 -0800 Subject: [PATCH 5/8] Revert XMLBeans update --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index c02d5dbf2f..239308c894 100644 --- a/gradle.properties +++ b/gradle.properties @@ -319,4 +319,4 @@ xercesImplVersion=2.12.2 xmlApisVersion=1.0.b2 # sync with Tika/POI -xmlbeansVersion=5.3.0 +xmlbeansVersion=5.2.1 From 40a8aad5b975aeab1ba383350b7cd716028b76f2 Mon Sep 17 00:00:00 2001 From: labkey-susanh Date: Thu, 19 Dec 2024 10:02:54 -0800 Subject: [PATCH 6/8] Really revert xmlBeans version (5.2.0) --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 239308c894..a6c290b712 100644 --- a/gradle.properties +++ b/gradle.properties @@ -319,4 +319,4 @@ xercesImplVersion=2.12.2 xmlApisVersion=1.0.b2 # sync with Tika/POI -xmlbeansVersion=5.2.1 +xmlbeansVersion=5.2.0 From d99db2520ed3beb3d6b22d59ba53d98e072e268e Mon Sep 17 00:00:00 2001 From: labkey-susanh Date: Fri, 20 Dec 2024 15:17:59 -0800 Subject: [PATCH 7/8] Update to non-deprecated syntax in Gradle DSL --- build.gradle | 8 ++++---- settings.gradle | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/build.gradle b/build.gradle index e12e917871..6c4825fb21 100644 --- a/build.gradle +++ b/build.gradle @@ -108,7 +108,7 @@ allprojects { if (project.hasProperty("artifactory_contextUrl")) { maven { - url "${artifactory_contextUrl}/ext-tools-local" + url = "${artifactory_contextUrl}/ext-tools-local" content { includeGroup "org.labkey.tools.windows" includeGroup "org.labkey.tools.linux" @@ -116,7 +116,7 @@ allprojects { } } maven { - url "${artifactory_contextUrl}/libs-release-no-proxy" + url = "${artifactory_contextUrl}/libs-release-no-proxy" if (project.hasProperty('artifactory_user') && project.hasProperty('artifactory_password')) { @@ -133,7 +133,7 @@ allprojects { } } maven { - url "${artifactory_contextUrl}/libs-snapshot-no-proxy" + url = "${artifactory_contextUrl}/libs-snapshot-no-proxy" if (project.hasProperty('artifactory_user') && project.hasProperty('artifactory_password')) { @@ -165,7 +165,7 @@ allprojects { maven { // Mondrian dependencies are available via this repository. It's a direct dependency of the Query // module but is declared here as many modules depend on Query and therefore need it as well. - url "https://repo.orl.eng.hitachivantara.com/artifactory/pnt-mvn" + url = "https://repo.orl.eng.hitachivantara.com/artifactory/pnt-mvn" content { includeGroup "pentaho" includeGroup "org.pentaho" diff --git a/settings.gradle b/settings.gradle index 98fc33deb3..6faf7d1af7 100644 --- a/settings.gradle +++ b/settings.gradle @@ -8,7 +8,7 @@ pluginManagement { } } maven { - url "${artifactory_contextUrl}/plugins-release-no-proxy" + url = "${artifactory_contextUrl}/plugins-release-no-proxy" mavenContent { releasesOnly() } @@ -21,7 +21,7 @@ pluginManagement { { mavenLocal() maven { - url "${artifactory_contextUrl}/plugins-snapshot-local" + url = "${artifactory_contextUrl}/plugins-snapshot-local" mavenContent { snapshotsOnly() } @@ -57,7 +57,7 @@ buildscript { } } maven { - url "${artifactory_contextUrl}/plugins-release" + url = "${artifactory_contextUrl}/plugins-release" mavenContent { releasesOnly() } @@ -68,7 +68,7 @@ buildscript { // You will need to rerun the publish task to pick up new changes. mavenLocal() maven { - url "${artifactory_contextUrl}/plugins-snapshot-local" + url = "${artifactory_contextUrl}/plugins-snapshot-local" mavenContent { snapshotsOnly() } From fdb38fb0f179aa2ac2dba7e8200d210b7acbbd3b Mon Sep 17 00:00:00 2001 From: labkey-susanh Date: Fri, 27 Dec 2024 07:28:01 -0800 Subject: [PATCH 8/8] gradlePluginsVersion 6.0.0 --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index a6c290b712..7faf20df6c 100644 --- a/gradle.properties +++ b/gradle.properties @@ -59,7 +59,7 @@ windowsProteomicsBinariesVersion=1.0 # The current version numbers for the gradle plugins. artifactoryPluginVersion=5.2.5 gradleNodePluginVersion=7.1.0 -gradlePluginsVersion=5.1.0-npmSetupUpdates-SNAPSHOT +gradlePluginsVersion=6.0.0 owaspDependencyCheckPluginVersion=11.1.0 versioningPluginVersion=1.1.2