From e8703cc6c4fa2ad3f8201a80f55ecc1534140fa6 Mon Sep 17 00:00:00 2001 From: labkey-susanh Date: Fri, 1 Nov 2024 11:39:36 -0700 Subject: [PATCH 1/3] Gradle plugins version updates and xmlBeans version update --- gradle.properties | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gradle.properties b/gradle.properties index df2d7b6cdc..7007476f4f 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=4.3.0-configCache-SNAPSHOT owaspDependencyCheckPluginVersion=11.0.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.1 From e61b0086b93a96d91d2a05eb7433f3a375529aee Mon Sep 17 00:00:00 2001 From: labkey-susanh Date: Mon, 4 Nov 2024 08:22:00 -0800 Subject: [PATCH 2/3] Update for method rename --- server/embedded/build.gradle | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/server/embedded/build.gradle b/server/embedded/build.gradle index 14127dda87..d2a8f7db6e 100644 --- a/server/embedded/build.gradle +++ b/server/embedded/build.gradle @@ -93,10 +93,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 42df7312c5680885de689405748683e1cabf2d19 Mon Sep 17 00:00:00 2001 From: labkey-susanh Date: Tue, 5 Nov 2024 11:07:14 -0800 Subject: [PATCH 3/3] gradlePluginsVersion 5.0.0 --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 940b013800..56d8ad903f 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=4.3.0-configCache-SNAPSHOT +gradlePluginsVersion=5.0.0 owaspDependencyCheckPluginVersion=11.0.0 versioningPluginVersion=1.1.2