[jira] [Commented] (TAP5-2573) Update Closure Compiler version
[ https://issues.apache.org/jira/browse/TAP5-2573?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=15893809#comment-15893809 ] Hudson commented on TAP5-2573: -- FAILURE: Integrated in Jenkins build tapestry-trunk-freestyle #1603 (See [https://builds.apache.org/job/tapestry-trunk-freestyle/1603/]) TAP5-2573: upgrade Closure Compiler (jochen.kemnade: rev 6cbf779257cdab9c485d4208d1a92658749c4634) * (edit) tapestry-webresources/build.gradle > Update Closure Compiler version > --- > > Key: TAP5-2573 > URL: https://issues.apache.org/jira/browse/TAP5-2573 > Project: Tapestry 5 > Issue Type: Dependency upgrade > Components: tapestry-webresources >Affects Versions: 5.4.1 >Reporter: MihkelJ >Priority: Minor > Fix For: 5.5.0 > > > tapestry-webresources includes closure compiler version v20131014. As of now, > the latest version is v20170124. > The signature for {{CompilerOptions#setOutputCharset}} has changed from > accepting {{String}} to accepting {{Charset}}, which prevents upgrading the > dependency separately from tapestry-webresources. -- This message was sent by Atlassian JIRA (v6.3.15#6346)
[2/4] tapestry-5 git commit: upgrade SLF4J
upgrade SLF4J Project: http://git-wip-us.apache.org/repos/asf/tapestry-5/repo Commit: http://git-wip-us.apache.org/repos/asf/tapestry-5/commit/1cf83351 Tree: http://git-wip-us.apache.org/repos/asf/tapestry-5/tree/1cf83351 Diff: http://git-wip-us.apache.org/repos/asf/tapestry-5/diff/1cf83351 Branch: refs/heads/master Commit: 1cf8335119311db0f52ef230b7d9cf949643d061 Parents: d7ef141 Author: Jochen KemnadeAuthored: Fri Mar 3 06:48:11 2017 +0100 Committer: Jochen Kemnade Committed: Fri Mar 3 06:48:11 2017 +0100 -- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/1cf83351/build.gradle -- diff --git a/build.gradle b/build.gradle index ab5abd5..753de69 100755 --- a/build.gradle +++ b/build.gradle @@ -15,7 +15,7 @@ project.ext.versions = [ servletapi: "3.0.1", spock: "1.0-groovy-2.4", hibernate: "5.1.0.Final", -slf4j: "1.7.21", +slf4j: "1.7.24", geb: "0.13.1", selenium: "2.53.1" ]
[1/4] tapestry-5 git commit: fix deprecation warning
Repository: tapestry-5 Updated Branches: refs/heads/master 7faf5f943 -> d6d1bf134 fix deprecation warning Project: http://git-wip-us.apache.org/repos/asf/tapestry-5/repo Commit: http://git-wip-us.apache.org/repos/asf/tapestry-5/commit/d7ef1411 Tree: http://git-wip-us.apache.org/repos/asf/tapestry-5/tree/d7ef1411 Diff: http://git-wip-us.apache.org/repos/asf/tapestry-5/diff/d7ef1411 Branch: refs/heads/master Commit: d7ef1411797e001df9cdf00ac56ba9391120545a Parents: 7faf5f9 Author: Jochen KemnadeAuthored: Fri Mar 3 06:47:03 2017 +0100 Committer: Jochen Kemnade Committed: Fri Mar 3 06:47:03 2017 +0100 -- build.gradle | 86 --- 1 file changed, 44 insertions(+), 42 deletions(-) -- http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/d7ef1411/build.gradle -- diff --git a/build.gradle b/build.gradle index da137fd..ab5abd5 100755 --- a/build.gradle +++ b/build.gradle @@ -577,47 +577,49 @@ boolean isWindows() { System.properties['os.name'].toLowerCase().contains('windows') } -task updateBootstrap << { - def bootstrapVersion = '3.3.7' - def target = new File(temporaryDir, 'bootstrap.zip') - ant.get(src: "https://github.com/twbs/bootstrap/archive/v${bootstrapVersion}.zip;, dest: target) - - def adjustDirectory = { - def relativePath = it.relativePath - if (relativePath.pathString.contains('/dist/')){ - relativePath = new RelativePath(!it.file.isDirectory(), relativePath.segments[2..-1] as String[]) - } else { - relativePath = new RelativePath(!it.file.isDirectory(), relativePath.segments[1..-1] as String[]) - } - println "copying $it.relativePath to $relativePath" - it.relativePath = relativePath - - } - - copy { -from(zipTree(target)){ -include('*/js/*.js') -include('*/dist/fonts/*') -eachFile adjustDirectory -} -from(zipTree(target)){ -include('*/dist/css/bootstrap.css') -include('*/dist/css/bootstrap-theme.css') -eachFile adjustDirectory -// TAP5-2351: remove source map reference from css files -filter({ (it ==~ /\/\*\s*# sourceMappingURL=[\S]+\s*\*\//) ? "" : it }) -} - into('tapestry-core/src/main/resources/META-INF/assets/tapestry5/bootstrap/') - } - - copy { -from(zipTree(target)){ -include('*/js/*.js') -include('*/dist/fonts/*') -include('*/less/**/*.less') - -eachFile adjustDirectory -} -into('tapestry-webresources/src/test/webapp/bootstrap/') +task updateBootstrap { + doLast { + def bootstrapVersion = '3.3.7' + def target = new File(temporaryDir, 'bootstrap.zip') + ant.get(src: "https://github.com/twbs/bootstrap/archive/v${bootstrapVersion}.zip;, dest: target) + + def adjustDirectory = { + def relativePath = it.relativePath + if (relativePath.pathString.contains('/dist/')){ + relativePath = new RelativePath(!it.file.isDirectory(), relativePath.segments[2..-1] as String[]) + } else { + relativePath = new RelativePath(!it.file.isDirectory(), relativePath.segments[1..-1] as String[]) + } + println "copying $it.relativePath to $relativePath" + it.relativePath = relativePath + + } + + copy { + from(zipTree(target)){ + include('*/js/*.js') + include('*/dist/fonts/*') + eachFile adjustDirectory + } + from(zipTree(target)){ + include('*/dist/css/bootstrap.css') + include('*/dist/css/bootstrap-theme.css') + eachFile adjustDirectory + // TAP5-2351: remove source map reference from css files + filter({ (it ==~ /\/\*\s*# sourceMappingURL=[\S]+\s*\*\//) ? "" : it }) + } + into('tapestry-core/src/main/resources/META-INF/assets/tapestry5/bootstrap/') + } + + copy { + from(zipTree(target)){ + include('*/js/*.js') + include('*/dist/fonts/*') + include('*/less/**/*.less') + + eachFile adjustDirectory + } + into('tapestry-webresources/src/test/webapp/bootstrap/') + } } }
[4/4] tapestry-5 git commit: upgade Gradle wrapper
upgade Gradle wrapper Project: http://git-wip-us.apache.org/repos/asf/tapestry-5/repo Commit: http://git-wip-us.apache.org/repos/asf/tapestry-5/commit/d6d1bf13 Tree: http://git-wip-us.apache.org/repos/asf/tapestry-5/tree/d6d1bf13 Diff: http://git-wip-us.apache.org/repos/asf/tapestry-5/diff/d6d1bf13 Branch: refs/heads/master Commit: d6d1bf134288e55ebb59b760b24391a80697fdec Parents: 6cbf779 Author: Jochen KemnadeAuthored: Fri Mar 3 06:51:20 2017 +0100 Committer: Jochen Kemnade Committed: Fri Mar 3 06:55:29 2017 +0100 -- build.gradle | 2 +- gradle/wrapper/gradle-wrapper.jar| Bin 52928 -> 54208 bytes gradle/wrapper/gradle-wrapper.properties | 4 ++-- gradlew | 19 +++ 4 files changed, 14 insertions(+), 11 deletions(-) -- http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/d6d1bf13/build.gradle -- diff --git a/build.gradle b/build.gradle index 753de69..d1cea20 100755 --- a/build.gradle +++ b/build.gradle @@ -424,7 +424,7 @@ task continuousIntegration { } task wrapper(type: Wrapper) { -gradleVersion = '3.1' +gradleVersion = '3.4' description "Regenerates the Gradle Wrapper files" } http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/d6d1bf13/gradle/wrapper/gradle-wrapper.jar -- diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 6ffa237..e1508cd 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/d6d1bf13/gradle/wrapper/gradle-wrapper.properties -- diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index c558c90..f5f87ea 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Thu Sep 22 12:09:59 CEST 2016 +#Fri Mar 03 06:51:16 CET 2017 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-3.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-3.4-bin.zip http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/d6d1bf13/gradlew -- diff --git a/gradlew b/gradlew index 9aa616c..4453cce 100755 --- a/gradlew +++ b/gradlew @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/usr/bin/env sh ## ## @@ -154,16 +154,19 @@ if $cygwin ; then esac fi -# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules -function splitJvmOpts() { -JVM_OPTS=("$@") +# Escape application args +save ( ) { +for i do printf %s\\n "$i" | sed "s/'/'''/g;1s/^/'/;\$s/\$/' /" ; done +echo " " } -eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS -JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME" +APP_ARGS=$(save "$@") + +# Collect all arguments for the java command, following the shell quoting and substitution rules +eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" # by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong -if [[ "$(uname)" == "Darwin" ]] && [[ "$HOME" == "$PWD" ]]; then +if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then cd "$(dirname "$0")" fi -exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@" +exec "$JAVACMD" "$@"
[3/4] tapestry-5 git commit: TAP5-2573: upgrade Closure Compiler
TAP5-2573: upgrade Closure Compiler Project: http://git-wip-us.apache.org/repos/asf/tapestry-5/repo Commit: http://git-wip-us.apache.org/repos/asf/tapestry-5/commit/6cbf7792 Tree: http://git-wip-us.apache.org/repos/asf/tapestry-5/tree/6cbf7792 Diff: http://git-wip-us.apache.org/repos/asf/tapestry-5/diff/6cbf7792 Branch: refs/heads/master Commit: 6cbf779257cdab9c485d4208d1a92658749c4634 Parents: 1cf8335 Author: Jochen KemnadeAuthored: Fri Mar 3 06:50:21 2017 +0100 Committer: Jochen Kemnade Committed: Fri Mar 3 06:55:29 2017 +0100 -- tapestry-webresources/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/6cbf7792/tapestry-webresources/build.gradle -- diff --git a/tapestry-webresources/build.gradle b/tapestry-webresources/build.gradle index f49bede..235e632 100644 --- a/tapestry-webresources/build.gradle +++ b/tapestry-webresources/build.gradle @@ -3,7 +3,7 @@ description = "Integration with WRO4J to perform runtime CoffeeScript compilatio dependencies { compile project(":tapestry-core") compile "com.github.sommeri:less4j:1.12.0" -compile "com.google.javascript:closure-compiler:v20160822" +compile "com.google.javascript:closure-compiler:v20170218" compile "org.mozilla:rhino:1.7.7.1" testCompile project(":tapestry-runner")
[jira] [Closed] (TAP5-2573) Update Closure Compiler version
[ https://issues.apache.org/jira/browse/TAP5-2573?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Jochen Kemnade closed TAP5-2573. Resolution: Fixed Fix Version/s: 5.5.0 We cannot include a newer version in Tapestry 5.4.x because we need to support Java 6. Tapestry 5.5 will include a more recent Closure Compiler and until it comes out, you can always create a modified version of the {{GoogleClosureMinimizer}} class and use it to override the default compiler: {code:java} @Contribute(ResourceMinimizer.class) @Primary public static void overrideClosureCompiler(final MappedConfigurationconfiguration) { configuration.overrideInstance("text/javascript", YourCustomCompiler.class); } {code} > Update Closure Compiler version > --- > > Key: TAP5-2573 > URL: https://issues.apache.org/jira/browse/TAP5-2573 > Project: Tapestry 5 > Issue Type: Dependency upgrade > Components: tapestry-webresources >Affects Versions: 5.4.1 >Reporter: MihkelJ >Priority: Minor > Fix For: 5.5.0 > > > tapestry-webresources includes closure compiler version v20131014. As of now, > the latest version is v20170124. > The signature for {{CompilerOptions#setOutputCharset}} has changed from > accepting {{String}} to accepting {{Charset}}, which prevents upgrading the > dependency separately from tapestry-webresources. -- This message was sent by Atlassian JIRA (v6.3.15#6346)
[jira] [Updated] (TAP5-2573) Update Closure Compiler version
[ https://issues.apache.org/jira/browse/TAP5-2573?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Jochen Kemnade updated TAP5-2573: - Issue Type: Dependency upgrade (was: Improvement) > Update Closure Compiler version > --- > > Key: TAP5-2573 > URL: https://issues.apache.org/jira/browse/TAP5-2573 > Project: Tapestry 5 > Issue Type: Dependency upgrade > Components: tapestry-webresources >Affects Versions: 5.4.1 >Reporter: MihkelJ >Priority: Minor > > tapestry-webresources includes closure compiler version v20131014. As of now, > the latest version is v20170124. > The signature for {{CompilerOptions#setOutputCharset}} has changed from > accepting {{String}} to accepting {{Charset}}, which prevents upgrading the > dependency separately from tapestry-webresources. -- This message was sent by Atlassian JIRA (v6.3.15#6346)
[jira] [Commented] (TAP5-2574) No match on Locale nb
[ https://issues.apache.org/jira/browse/TAP5-2574?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=15893797#comment-15893797 ] Jochen Kemnade commented on TAP5-2574: -- See also https://issues.apache.org/jira/browse/TAP5-1824, https://issues.apache.org/jira/browse/TAP5-992, https://sites.google.com/site/openjdklocale/design-notes/resource-bundle-lookup-order#TOC-Special-Case-3:-Norwegian-Locales > No match on Locale nb > -- > > Key: TAP5-2574 > URL: https://issues.apache.org/jira/browse/TAP5-2574 > Project: Tapestry 5 > Issue Type: Bug > Components: tapestry-core >Affects Versions: 5.4.1 >Reporter: Svein > > {code}configuration.add(SymbolConstants.SUPPORTED_LOCALES, "no_NB,en");{code} > {code}org.apache.tapestry5.internal.services.Request.getLocale() for returns > "nb" for Norwegian{code} > No *_no_NB.properties or *_no.properties are used. I think A way to alias > locale is needed. E.g: > {code}configuration.add(SymbolConstants.SUPPORTED_LOCALES, > "no_NB{nb},en);{code} -- This message was sent by Atlassian JIRA (v6.3.15#6346)
[jira] [Commented] (TAP5-2574) No match on Locale nb
[ https://issues.apache.org/jira/browse/TAP5-2574?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=15893792#comment-15893792 ] Jochen Kemnade commented on TAP5-2574: -- Shouldn't this be {{nb_NO}} instead of {{no_NB}}? > No match on Locale nb > -- > > Key: TAP5-2574 > URL: https://issues.apache.org/jira/browse/TAP5-2574 > Project: Tapestry 5 > Issue Type: Bug > Components: tapestry-core >Affects Versions: 5.4.1 >Reporter: Svein > > {code}configuration.add(SymbolConstants.SUPPORTED_LOCALES, "no_NB,en");{code} > {code}org.apache.tapestry5.internal.services.Request.getLocale() for returns > "nb" for Norwegian{code} > No *_no_NB.properties or *_no.properties are used. I think A way to alias > locale is needed. E.g: > {code}configuration.add(SymbolConstants.SUPPORTED_LOCALES, > "no_NB{nb},en);{code} -- This message was sent by Atlassian JIRA (v6.3.15#6346)