Skip to content

Commit 4dbd7b0

Browse files
committed
DM-8566: build related fixes
- Fix duplicate nom.tam.fits classes during build - Add preferIPv4Stack to tomcat env. - Add firefly.war to Firefly Standalone release page
1 parent 8ab2c36 commit 4dbd7b0

File tree

1 file changed

+18
-5
lines changed

1 file changed

+18
-5
lines changed

buildScript/gwt_webapp.gincl

Lines changed: 18 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -126,6 +126,13 @@ task prepareWebapp (type:Copy, dependsOn: [gwt, loadConfig, createVersionTag]) {
126126
into gwt.warDir
127127
}
128128

129+
// temporary solution to extract fits_io.jar into WEB-INF/classes directory
130+
// this fix the multiple nom.tam.fits issue
131+
copy {
132+
from zipTree(file("$fireflyPath/jars/fits-io/fits_io.jar"))
133+
into "${gwt.warDir}/WEB-INF/classes"
134+
}
135+
129136
if (project.appConfigProps["ehcache.replicate"] && !project.appConfigProps["ehcache.replicate"].toBoolean()) {
130137
exclude "ehcache.xml"
131138
}
@@ -240,12 +247,18 @@ task publishToGithub (dependsOn: loadConfig) {
240247
throw new GradleException(">> Task failed due to missing node.js", e)
241248
}
242249

243-
def relConfig = '{ "tag": "' + tag_label + '"' +
244-
', "token": "' + project.property("github.auth.token") + '"' +
245-
', "name": "' + rel_title + '"' +
246-
', "assets": ["' + "${buildDir}/exec/${webapp.baseWarName}-exec.war" + '"]' +
247-
"}"
248250

251+
def relConfig = sprintf("""
252+
|{ "tag": "%s",
253+
| "token": "%s",
254+
| "name": "%s",
255+
| "assets": ["%s", "%s"]
256+
|}
257+
""".stripMargin(),
258+
tag_label,
259+
project.property("github.auth.token"),
260+
rel_title,
261+
"${buildDir}/exec/${webapp.baseWarName}-exec.war", "${buildDir}/exec/${webapp.baseWarName}.war")
249262
def res = exec {
250263
environment 'NODE_PATH': "${fireflyPath}/node_modules"
251264
executable "node"

0 commit comments

Comments
 (0)