Skip to content

Commit

Permalink
Revert version updates
Browse files Browse the repository at this point in the history
  • Loading branch information
labkey-susanh committed Nov 5, 2024
1 parent 8743b72 commit 94fd77d
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
6 changes: 3 additions & 3 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -58,8 +58,8 @@ windowsProteomicsBinariesVersion=1.0

# The current version numbers for the gradle plugins.
artifactoryPluginVersion=5.2.5
gradleNodePluginVersion=7.1.0
gradlePluginsVersion=5.0.0
gradleNodePluginVersion=3.5.1
gradlePluginsVersion=4.2.0
owaspDependencyCheckPluginVersion=11.0.0
versioningPluginVersion=1.1.2

Expand Down Expand Up @@ -322,4 +322,4 @@ xercesImplVersion=2.12.2
xmlApisVersion=1.0.b2

# sync with Tika/POI
xmlbeansVersion=5.2.1
xmlbeansVersion=5.2.0
6 changes: 3 additions & 3 deletions server/embedded/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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.getEmbeddedServerDeployDirectoryPath(project)}. " +
task.description = "Check for conflicts in version numbers of jar file and files already in the build directory ${ServerDeployExtension.getEmbeddedServerDeployDirectory(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.getEmbeddedServerDeployDirectoryPath(project)} directory to be removed."
task.directory = new File(ServerDeployExtension.getEmbeddedServerDeployDirectoryPath(project))
"conflicting version(s) in the ${ServerDeployExtension.getEmbeddedServerDeployDirectory(project)} directory to be removed."
task.directory = new File(ServerDeployExtension.getEmbeddedServerDeployDirectory(project))
task.extension = "jar"
task.cleanTask = "server:cleanEmbeddedDeploy"
task.collection = project.tasks.bootJar.outputs.files
Expand Down

0 comments on commit 94fd77d

Please sign in to comment.