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
Binary file modified Audit trail.mpr
Binary file not shown.
File renamed without changes.

Large diffs are not rendered by default.

32 changes: 25 additions & 7 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
plugins {
id 'java'
id 'com.mendix.gradle.publish-module-plugin' version '1.17'
id 'com.mendix.gradle.publish-module-plugin' version '1.23'
id 'net.researchgate.release' version '2.8.1'
}

Expand All @@ -10,13 +10,13 @@ sourceCompatibility = '11'
[compileJava, compileTestJava]*.options*.encoding = 'UTF-8'

mxMarketplace {
moduleName = "AuditTrail"
moduleLicense = "Apache V2"
appNumber = 138
appName = "Audittrail"
filterWidgets = true
moduleName = "AuditTrail"
moduleLicense = "Apache V2"
appNumber = 138
appName = "Audittrail"
filterWidgets = true
appDirectory = "."
includeFiles = List.of(ossClearanceFile)
includeFiles = List.of(licenseFile)
versionPathPrefix = "__Version " // the path prefix within the module to the version folder
}

Expand Down Expand Up @@ -77,4 +77,22 @@ tasks.register('afterReleaseBuildTask') {
dependsOn 'publishModuleToMarketplace'
}

tasks.register('includeOSSClearance', Zip) {
def mpkName = "${mxMarketplace.moduleName}_${version}.mpk"
def srcMpkLocation = "${project.rootDir}/${mpkName}"
def dstMpkLocation = File.createTempFile("READMEOSS", mpkName)

archiveFileName = dstMpkLocation.getPath()
from zipTree(srcMpkLocation)
from ossClearanceFile

doLast {
dstMpkLocation.renameTo(srcMpkLocation)
}
}

publishModuleToMarketplace {
dependsOn includeOSSClearance
}

afterReleaseBuild.dependsOn afterReleaseBuildTask
3 changes: 2 additions & 1 deletion environment.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,5 @@ def mxInstallVersion = System.getenv('MODELER_VERSION') ?: System.getenv('MX_INS

project.ext.mxInstallPath = "${mxPath}/${mxInstallVersion}"
project.ext.mxRuntimeBundles = new File("${mxInstallPath}/runtime/bundles")
project.ext.ossClearanceFile = file("SiemensMendixAudittrail__10.2.0__READMEOSS.html")
project.ext.ossClearanceFile = file("SiemensMendixAudittrail__10.2.1__READMEOSS.html")
project.ext.licenseFile = file("LICENSE.txt")
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
@@ -1 +1 @@
version=10.2.0
version=10.2.1
1 change: 1 addition & 0 deletions marketplace/release-notes/10.2.1.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
We added the LICENSE.txt file which was missing in previous releases.