Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ lib/

# Ignore zip files created by build
src/main/resources/moduleTemplate.zip
src/main/resources/distributionResources.zip

# Ignore Gradle GUI config
gradle-app.setting
Expand Down
15 changes: 12 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,22 @@ on how to do that, including how to develop and test locally and the versioning

### TBD
*Released*: TBD
(Earliest compatible LabKey version: 24.8)
(Earliest compatible LabKey version: 24.10)

### 4.0.0
*Released*: 5 September 2024
(Earliest compatible LabKey version: 24.10)
- Add `--add-opens` JVM arg for `java.nio` to `startTomcat` task. Required for Snowflake JDBC driver.
- Update `distributions` task to build embedded Tomcat tar.gz archives only
- Remove support for building zip, Tomcat standalone, and module archives
- Remove `makeDistribution` property and deprecate `embeddedArchiveType` property (currently ignored)
- Remove `makeDistribution` and `embeddedArchiveType` properties
- Fix `subDirName` property's optional behavior; this property now correctly defaults to `project.name`.
- Change `extraFileIdentifier` property's default value to `project.name` as well
- Change `extraFileIdentifier` property's default value to `-project.name`
- Remove support for `useEmbeddedTomcat` property and remove all standalone handling
- Remove all `tomcat-lib` JAR file handling: `cleanTomcatLib`, `deployTomcatJars`, and `stageTomcatJars` tasks;
`tomcatJars` configuration
- Remove `labkey.xml` and `log4j2.xml` files and handling
- Remove `distributionResources` folder

### 3.0.1
*Released*: 18 July 2024
Expand Down
10 changes: 1 addition & 9 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ dependencies {
}

group 'org.labkey.build'
project.version = "3.1.0-SNAPSHOT"
project.version = "4.1.0-SNAPSHOT"

gradlePlugin {
plugins {
Expand Down Expand Up @@ -163,14 +163,6 @@ if (project.file("moduleTemplate").exists())
project.tasks.processResources.dependsOn(project.tasks.zipModuleTemplate)
}

project.tasks.register("zipDistributionResources", Zip) {
Zip zip ->
zip.archiveFileName = "distributionResources.zip"
zip.from project.file("distributionResources")
zip.destinationDirectory.set(new File(project.projectDir, "src/main/resources"))
}
project.tasks.processResources.dependsOn(project.tasks.zipDistributionResources)

if (hasProperty('artifactory_user') && hasProperty('artifactory_password'))
{
publishing {
Expand Down
7 changes: 0 additions & 7 deletions distributionResources/README.txt

This file was deleted.

7 changes: 0 additions & 7 deletions distributionResources/embedded/README.txt

This file was deleted.

163 changes: 0 additions & 163 deletions distributionResources/embedded/config/application.properties

This file was deleted.

64 changes: 0 additions & 64 deletions distributionResources/labkey.xml

This file was deleted.

Loading