Repository: tapestry-5 Updated Branches: refs/heads/5.3 52765fe76 -> a1cc85161
Fix build to make it succeed on jdk 1.5. selenium 2.21.0 is the last jre5 version, com.google.kaptcha:kaptcha:2.3 has never existed on maven central, fix the simple syntax errors. I actually don't agree with these changes because it'll just make it more difficult for the users but we can always revert this commit and follow up with T5.3.9 release Project: http://git-wip-us.apache.org/repos/asf/tapestry-5/repo Commit: http://git-wip-us.apache.org/repos/asf/tapestry-5/commit/a1cc8516 Tree: http://git-wip-us.apache.org/repos/asf/tapestry-5/tree/a1cc8516 Diff: http://git-wip-us.apache.org/repos/asf/tapestry-5/diff/a1cc8516 Branch: refs/heads/5.3 Commit: a1cc85161050349ade0c119ca4278da56f32f43f Parents: 52765fe Author: kaosko <[email protected]> Authored: Thu Nov 20 03:43:59 2014 +0000 Committer: kaosko <[email protected]> Committed: Thu Nov 20 03:43:59 2014 +0000 ---------------------------------------------------------------------- .../org/apache/tapestry5/internal/util/MacOutputStream.java | 2 +- tapestry-kaptcha/build.gradle | 6 +++++- tapestry-test/build.gradle | 2 +- .../internal/yuicompressor/JavaScriptResourceMinimizer.java | 2 -- 4 files changed, 7 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/a1cc8516/tapestry-core/src/main/java/org/apache/tapestry5/internal/util/MacOutputStream.java ---------------------------------------------------------------------- diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/util/MacOutputStream.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/util/MacOutputStream.java index 2b21278..7ff15c0 100644 --- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/util/MacOutputStream.java +++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/util/MacOutputStream.java @@ -42,7 +42,7 @@ public class MacOutputStream extends OutputStream return new MacOutputStream(mac); } catch (Exception ex) { - throw new IOException("Unable to create MacOutputStream: " + InternalUtils.toMessage(ex), ex); + throw new IOException("Unable to create MacOutputStream: " + InternalUtils.toMessage(ex)); } } http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/a1cc8516/tapestry-kaptcha/build.gradle ---------------------------------------------------------------------- diff --git a/tapestry-kaptcha/build.gradle b/tapestry-kaptcha/build.gradle index 3dd4c43..bb7461b 100644 --- a/tapestry-kaptcha/build.gradle +++ b/tapestry-kaptcha/build.gradle @@ -2,11 +2,15 @@ description = "Kaptcha user verification support" dependencies { compile project(':tapestry-core') - compile "com.github.axet:kaptcha:0.0.8" + compile "com.google.code.kaptcha:kaptcha:2.3" testCompile project(':tapestry-test') } +repositories { + mavenLocal() +} + jar { manifest { attributes 'Tapestry-Module-Classes': 'org.apache.tapestry5.kaptcha.services.KaptchaModule' http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/a1cc8516/tapestry-test/build.gradle ---------------------------------------------------------------------- diff --git a/tapestry-test/build.gradle b/tapestry-test/build.gradle index 8214e97..d38ada8 100644 --- a/tapestry-test/build.gradle +++ b/tapestry-test/build.gradle @@ -1,6 +1,6 @@ description = "Utilities for unit and integration testing of Tapestry applications" -versions.selenium = '2.26.0' +versions.selenium = '2.21.0' dependencies { compile "org.seleniumhq.selenium:selenium-java:${versions.selenium}" http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/a1cc8516/tapestry-yuicompressor/src/main/java/org/apache/tapestry5/internal/yuicompressor/JavaScriptResourceMinimizer.java ---------------------------------------------------------------------- diff --git a/tapestry-yuicompressor/src/main/java/org/apache/tapestry5/internal/yuicompressor/JavaScriptResourceMinimizer.java b/tapestry-yuicompressor/src/main/java/org/apache/tapestry5/internal/yuicompressor/JavaScriptResourceMinimizer.java index 7ae612a..c8d823a 100644 --- a/tapestry-yuicompressor/src/main/java/org/apache/tapestry5/internal/yuicompressor/JavaScriptResourceMinimizer.java +++ b/tapestry-yuicompressor/src/main/java/org/apache/tapestry5/internal/yuicompressor/JavaScriptResourceMinimizer.java @@ -63,7 +63,6 @@ public class JavaScriptResourceMinimizer extends AbstractMinimizer { boolean sourceIdentified = false; - @Override public void run() { if (!sourceIdentified) @@ -79,7 +78,6 @@ public class JavaScriptResourceMinimizer extends AbstractMinimizer Runnable identifyWarnings = new Runnable() { - @Override public void run() { if (warningCount.get() > 0)
