You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tapestry.apache.org by ka...@apache.org on 2014/12/12 00:34:58 UTC
tapestry-5 git commit: Revert
a1cc85161050349ade0c119ca4278da56f32f43f that was done for JDK 1.5
compatibility for 5.3.8 release. The issue is that current versions of
library dependencies (kaptcha,
selenium) have already stopped supporting jdk 1.5
Repository: tapestry-5
Updated Branches:
refs/heads/5.3 3a3ce1dab -> c2db45f32
Revert a1cc85161050349ade0c119ca4278da56f32f43f that was done for JDK 1.5 compatibility for 5.3.8 release. The issue is that current versions of library dependencies (kaptcha, selenium) have already stopped supporting jdk 1.5
Project: http://git-wip-us.apache.org/repos/asf/tapestry-5/repo
Commit: http://git-wip-us.apache.org/repos/asf/tapestry-5/commit/c2db45f3
Tree: http://git-wip-us.apache.org/repos/asf/tapestry-5/tree/c2db45f3
Diff: http://git-wip-us.apache.org/repos/asf/tapestry-5/diff/c2db45f3
Branch: refs/heads/5.3
Commit: c2db45f3223785320216f7505443b482d1ceb27f
Parents: 3a3ce1d
Author: kaosko <ka...@apache.org>
Authored: Thu Dec 11 23:34:54 2014 +0000
Committer: kaosko <ka...@apache.org>
Committed: Thu Dec 11 23:34:54 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, 5 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/c2db45f3/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 7ff15c0..2b21278 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));
+ throw new IOException("Unable to create MacOutputStream: " + InternalUtils.toMessage(ex), ex);
}
}
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/c2db45f3/tapestry-kaptcha/build.gradle
----------------------------------------------------------------------
diff --git a/tapestry-kaptcha/build.gradle b/tapestry-kaptcha/build.gradle
index bb7461b..3dd4c43 100644
--- a/tapestry-kaptcha/build.gradle
+++ b/tapestry-kaptcha/build.gradle
@@ -2,15 +2,11 @@ description = "Kaptcha user verification support"
dependencies {
compile project(':tapestry-core')
- compile "com.google.code.kaptcha:kaptcha:2.3"
+ compile "com.github.axet:kaptcha:0.0.8"
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/c2db45f3/tapestry-test/build.gradle
----------------------------------------------------------------------
diff --git a/tapestry-test/build.gradle b/tapestry-test/build.gradle
index d38ada8..8214e97 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.21.0'
+versions.selenium = '2.26.0'
dependencies {
compile "org.seleniumhq.selenium:selenium-java:${versions.selenium}"
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/c2db45f3/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 c8d823a..7ae612a 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,6 +63,7 @@ public class JavaScriptResourceMinimizer extends AbstractMinimizer
{
boolean sourceIdentified = false;
+ @Override
public void run()
{
if (!sourceIdentified)
@@ -78,6 +79,7 @@ public class JavaScriptResourceMinimizer extends AbstractMinimizer
Runnable identifyWarnings = new Runnable()
{
+ @Override
public void run()
{
if (warningCount.get() > 0)