You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tapestry.apache.org by jk...@apache.org on 2016/04/19 14:50:48 UTC
[1/2] tapestry-5 git commit: remove obsolete dependency
Repository: tapestry-5
Updated Branches:
refs/heads/master d241e4902 -> bdea53ea9
remove obsolete dependency
Project: http://git-wip-us.apache.org/repos/asf/tapestry-5/repo
Commit: http://git-wip-us.apache.org/repos/asf/tapestry-5/commit/e547c9cf
Tree: http://git-wip-us.apache.org/repos/asf/tapestry-5/tree/e547c9cf
Diff: http://git-wip-us.apache.org/repos/asf/tapestry-5/diff/e547c9cf
Branch: refs/heads/master
Commit: e547c9cf9dcb590f480ea79772e5fcd9c361341b
Parents: d241e49
Author: Jochen Kemnade <jk...@apache.org>
Authored: Tue Apr 19 14:45:42 2016 +0200
Committer: Jochen Kemnade <jk...@apache.org>
Committed: Tue Apr 19 14:45:42 2016 +0200
----------------------------------------------------------------------
tapestry-webresources/build.gradle | 2 --
1 file changed, 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/e547c9cf/tapestry-webresources/build.gradle
----------------------------------------------------------------------
diff --git a/tapestry-webresources/build.gradle b/tapestry-webresources/build.gradle
index 62c431d..fa34969 100644
--- a/tapestry-webresources/build.gradle
+++ b/tapestry-webresources/build.gradle
@@ -8,8 +8,6 @@ dependencies {
testCompile project(":tapestry-runner")
testCompile "org.gebish:geb-spock:${versions.geb}"
- // Geb pulls in Groovy 2.3, so we need to select an appropriate Spock version
- testCompile "org.spockframework:spock-core:1.0-groovy-2.3"
testCompile "org.seleniumhq.selenium:selenium-java:${versions.selenium}", {
exclude group: "org.eclipse.jetty"
[2/2] tapestry-5 git commit: upgrade closure compiler
Posted by jk...@apache.org.
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/bdea53ea
Tree: http://git-wip-us.apache.org/repos/asf/tapestry-5/tree/bdea53ea
Diff: http://git-wip-us.apache.org/repos/asf/tapestry-5/diff/bdea53ea
Branch: refs/heads/master
Commit: bdea53ea9fe0eb6cc552e06613f4a9c2afb9ad41
Parents: e547c9c
Author: Jochen Kemnade <jk...@apache.org>
Authored: Tue Apr 19 14:50:28 2016 +0200
Committer: Jochen Kemnade <jk...@apache.org>
Committed: Tue Apr 19 14:50:28 2016 +0200
----------------------------------------------------------------------
tapestry-webresources/build.gradle | 2 +-
.../internal/webresources/GoogleClosureMinimizer.java | 6 ++++--
2 files changed, 5 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/bdea53ea/tapestry-webresources/build.gradle
----------------------------------------------------------------------
diff --git a/tapestry-webresources/build.gradle b/tapestry-webresources/build.gradle
index fa34969..052d6d1 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:v20131014"
+ compile "com.google.javascript:closure-compiler:v20160315"
compile "org.mozilla:rhino:1.7.7.1"
testCompile project(":tapestry-runner")
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/bdea53ea/tapestry-webresources/src/main/java/org/apache/tapestry5/internal/webresources/GoogleClosureMinimizer.java
----------------------------------------------------------------------
diff --git a/tapestry-webresources/src/main/java/org/apache/tapestry5/internal/webresources/GoogleClosureMinimizer.java b/tapestry-webresources/src/main/java/org/apache/tapestry5/internal/webresources/GoogleClosureMinimizer.java
index e3102ac..ee318aa 100644
--- a/tapestry-webresources/src/main/java/org/apache/tapestry5/internal/webresources/GoogleClosureMinimizer.java
+++ b/tapestry-webresources/src/main/java/org/apache/tapestry5/internal/webresources/GoogleClosureMinimizer.java
@@ -28,6 +28,8 @@ import org.slf4j.Logger;
import java.io.IOException;
import java.io.InputStream;
+import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
import java.util.Collections;
import java.util.List;
import java.util.logging.Level;
@@ -39,7 +41,7 @@ import java.util.logging.Level;
public class GoogleClosureMinimizer extends AbstractMinimizer
{
- private final static String OUTPUT_CHARSET = "utf-8";
+ private final static Charset OUTPUT_CHARSET = StandardCharsets.UTF_8;
private final List<SourceFile> EXTERNS = Collections.emptyList();
@@ -83,7 +85,7 @@ public class GoogleClosureMinimizer extends AbstractMinimizer
compiler.disableThreads();
- SourceFile input = SourceFile.fromInputStream(resource.toString(), resource.openStream());
+ SourceFile input = SourceFile.fromInputStream(resource.toString(), resource.openStream(), StandardCharsets.UTF_8);
List<SourceFile> inputs = Collections.singletonList(input);
[2/2] tapestry-5 git commit: upgrade closure compiler
Posted by jk...@apache.org.
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/bdea53ea
Tree: http://git-wip-us.apache.org/repos/asf/tapestry-5/tree/bdea53ea
Diff: http://git-wip-us.apache.org/repos/asf/tapestry-5/diff/bdea53ea
Branch: refs/heads/master
Commit: bdea53ea9fe0eb6cc552e06613f4a9c2afb9ad41
Parents: e547c9c
Author: Jochen Kemnade <jk...@apache.org>
Authored: Tue Apr 19 14:50:28 2016 +0200
Committer: Jochen Kemnade <jk...@apache.org>
Committed: Tue Apr 19 14:50:28 2016 +0200
----------------------------------------------------------------------
tapestry-webresources/build.gradle | 2 +-
.../internal/webresources/GoogleClosureMinimizer.java | 6 ++++--
2 files changed, 5 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/bdea53ea/tapestry-webresources/build.gradle
----------------------------------------------------------------------
diff --git a/tapestry-webresources/build.gradle b/tapestry-webresources/build.gradle
index fa34969..052d6d1 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:v20131014"
+ compile "com.google.javascript:closure-compiler:v20160315"
compile "org.mozilla:rhino:1.7.7.1"
testCompile project(":tapestry-runner")
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/bdea53ea/tapestry-webresources/src/main/java/org/apache/tapestry5/internal/webresources/GoogleClosureMinimizer.java
----------------------------------------------------------------------
diff --git a/tapestry-webresources/src/main/java/org/apache/tapestry5/internal/webresources/GoogleClosureMinimizer.java b/tapestry-webresources/src/main/java/org/apache/tapestry5/internal/webresources/GoogleClosureMinimizer.java
index e3102ac..ee318aa 100644
--- a/tapestry-webresources/src/main/java/org/apache/tapestry5/internal/webresources/GoogleClosureMinimizer.java
+++ b/tapestry-webresources/src/main/java/org/apache/tapestry5/internal/webresources/GoogleClosureMinimizer.java
@@ -28,6 +28,8 @@ import org.slf4j.Logger;
import java.io.IOException;
import java.io.InputStream;
+import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
import java.util.Collections;
import java.util.List;
import java.util.logging.Level;
@@ -39,7 +41,7 @@ import java.util.logging.Level;
public class GoogleClosureMinimizer extends AbstractMinimizer
{
- private final static String OUTPUT_CHARSET = "utf-8";
+ private final static Charset OUTPUT_CHARSET = StandardCharsets.UTF_8;
private final List<SourceFile> EXTERNS = Collections.emptyList();
@@ -83,7 +85,7 @@ public class GoogleClosureMinimizer extends AbstractMinimizer
compiler.disableThreads();
- SourceFile input = SourceFile.fromInputStream(resource.toString(), resource.openStream());
+ SourceFile input = SourceFile.fromInputStream(resource.toString(), resource.openStream(), StandardCharsets.UTF_8);
List<SourceFile> inputs = Collections.singletonList(input);