Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Gradle 8.8 #833

Merged
merged 4 commits into from
Jun 12, 2024
Merged

Gradle 8.8 #833

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8eb4bc9
Gradle 8.8
labkey-susanh Jun 3, 2024
ebed965
Merge remote-tracking branch 'origin/develop' into fb_gradle8.8
labkey-susanh Jun 11, 2024
8afd3e8
Issue 50563: Add checkVersionConflicts task for embedded project to a…
labkey-susanh Jun 11, 2024
53cee07
gradlePluginsVersion 2.7.1
labkey-susanh Jun 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ windowsProteomicsBinariesVersion=1.0
# The current version numbers for the gradle plugins.
artifactoryPluginVersion=4.31.9
gradleNodePluginVersion=3.5.1
gradlePluginsVersion=2.7.0
gradlePluginsVersion=2.7.1
owaspDependencyCheckPluginVersion=9.2.0
versioningPluginVersion=1.1.2

Expand Down
Binary file modified gradle/wrapper/gradle-wrapper.jar
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
16 changes: 16 additions & 0 deletions server/embedded/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
import org.labkey.gradle.util.BuildUtils
import org.labkey.gradle.util.PomFileHelper
import org.labkey.gradle.util.GroupNames
import org.labkey.gradle.task.CheckForVersionConflicts
import org.labkey.gradle.plugin.extension.ServerDeployExtension

plugins {
id "java"
Expand Down Expand Up @@ -84,6 +87,19 @@ dependencies {

BuildUtils.addLabKeyDependency(project: project, config: "implementation", depProjectPath: BuildUtils.getBootstrapProjectPath(gradle))

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)}. " +
"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))
task.extension = "jar"
task.cleanTask = "server:cleanEmbeddedDeploy"
task.collection = project.tasks.bootJar.outputs.files
}

project.publishing {
publications {
embeddedJar(MavenPublication) {
Expand Down