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 2014/05/29 12:16:08 UTC
[1/3] git commit: re-enable assertion,
more recent Selenium versions seem to handle XML responses well
Repository: tapestry-5
Updated Branches:
refs/heads/master ff2fcd8a7 -> b4fd56869
re-enable assertion, more recent Selenium versions seem to handle XML responses well
Project: http://git-wip-us.apache.org/repos/asf/tapestry-5/repo
Commit: http://git-wip-us.apache.org/repos/asf/tapestry-5/commit/1069f052
Tree: http://git-wip-us.apache.org/repos/asf/tapestry-5/tree/1069f052
Diff: http://git-wip-us.apache.org/repos/asf/tapestry-5/diff/1069f052
Branch: refs/heads/master
Commit: 1069f052f56b6b5e2dcf81456d8be19c5c757ab9
Parents: ff2fcd8
Author: Jochen Kemnade <jk...@apache.org>
Authored: Wed May 28 18:46:55 2014 +0200
Committer: Jochen Kemnade <jk...@apache.org>
Committed: Wed May 28 18:46:55 2014 +0200
----------------------------------------------------------------------
.../apache/tapestry5/integration/app1/CoreBehaviorsTests.java | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/1069f052/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/CoreBehaviorsTests.java
----------------------------------------------------------------------
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/CoreBehaviorsTests.java b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/CoreBehaviorsTests.java
index d7ecc25..20703bb 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/CoreBehaviorsTests.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/CoreBehaviorsTests.java
@@ -1458,9 +1458,7 @@ public class CoreBehaviorsTests extends App1TestCase
{
open(getBaseURL() + "xmlcontent");
- // Commented out ... Selenium can't seem to handle an XML response.
-
- // assertSourcePresent("<![CDATA[< & >]]>");
+ assertSourcePresent("<![CDATA[< & >]]>");
}
@Test
[2/3] git commit: TAP5-2342: avoid importing @java.util.*@ as that
might cause naming conflicts with our own classes on future JDK versions
Posted by jk...@apache.org.
TAP5-2342: avoid importing @java.util.*@ as that might cause naming conflicts with our own classes on future JDK versions
Project: http://git-wip-us.apache.org/repos/asf/tapestry-5/repo
Commit: http://git-wip-us.apache.org/repos/asf/tapestry-5/commit/f3c872f6
Tree: http://git-wip-us.apache.org/repos/asf/tapestry-5/tree/f3c872f6
Diff: http://git-wip-us.apache.org/repos/asf/tapestry-5/diff/f3c872f6
Branch: refs/heads/master
Commit: f3c872f67d3099bb84faa2bce88d022d95c12f27
Parents: 1069f05
Author: Jochen Kemnade <jk...@apache.org>
Authored: Thu May 29 11:57:34 2014 +0200
Committer: Jochen Kemnade <jk...@apache.org>
Committed: Thu May 29 11:57:34 2014 +0200
----------------------------------------------------------------------
.../apache/tapestry5/ioc/internal/DefaultModuleDefImpl.java | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/f3c872f6/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/DefaultModuleDefImpl.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/DefaultModuleDefImpl.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/DefaultModuleDefImpl.java
index 55e993d..753e746 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/DefaultModuleDefImpl.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/DefaultModuleDefImpl.java
@@ -29,7 +29,13 @@ import java.lang.annotation.Annotation;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.lang.reflect.Modifier;
-import java.util.*;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Set;
/**
* Starting from the Class for a module, identifies all the services (service builder methods),
[3/3] git commit: Closes TAP5-2343: check JDK version only if the
aggregateJavadoc is executed,
perform version check only on JDK 1.5 through 1.7
Posted by jk...@apache.org.
Closes TAP5-2343: check JDK version only if the aggregateJavadoc is executed, perform version check only on JDK 1.5 through 1.7
Project: http://git-wip-us.apache.org/repos/asf/tapestry-5/repo
Commit: http://git-wip-us.apache.org/repos/asf/tapestry-5/commit/b4fd5686
Tree: http://git-wip-us.apache.org/repos/asf/tapestry-5/tree/b4fd5686
Diff: http://git-wip-us.apache.org/repos/asf/tapestry-5/diff/b4fd5686
Branch: refs/heads/master
Commit: b4fd5686936a6587e12835cc2040db367b5a8e95
Parents: f3c872f
Author: Jochen Kemnade <jk...@apache.org>
Authored: Thu May 29 12:10:52 2014 +0200
Committer: Jochen Kemnade <jk...@apache.org>
Committed: Thu May 29 12:10:52 2014 +0200
----------------------------------------------------------------------
build.gradle | 18 +++++++++++-------
1 file changed, 11 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b4fd5686/build.gradle
----------------------------------------------------------------------
diff --git a/build.gradle b/build.gradle
index 74b24bd..b349e74 100755
--- a/build.gradle
+++ b/build.gradle
@@ -298,11 +298,11 @@ subprojects {
// Cribbed from https://github.com/hibernate/hibernate-core/blob/master/release/release.gradle#L19
task aggregateJavadoc(type: Javadoc) {
-
- // Temporary: don't check on the CI server. This can be removed when the CI server is upgraded.
- if (!continuousIntegrationBuild && !checkJDK())
- throw new StopActionException("Update your JDK to fix VU#225657")
-
+ doFirst {
+ // Temporary: don't check on the CI server. This can be removed when the CI server is upgraded.
+ if (!continuousIntegrationBuild && !checkJDK())
+ throw new StopActionException("Update your JDK to fix VU#225657")
+ }
dependsOn configurations.javadoc
group "Documentation"
@@ -557,14 +557,18 @@ boolean checkJDK() {
def match = jdkVersion =~ /_(\d+)/
if (!match.find())
- throw new IllegalStateException("""Could not parse minor version number out of "#{jdkVersion}".""")
+ throw new IllegalStateException("""Could not parse minor version number out of "${jdkVersion}".""")
def minor = match[0][1].toInteger()
if (jdkVersion.startsWith("1.7")) {
minor > 21
}
- else { // JDK 6 and 5 require the same minor version
+ else if (jdkVersion.startsWith("1.5") || jdkVersion.startsWith("1.6")) {
+ // JDK 6 and 5 require the same minor version
minor > 45
}
+ else {
+ true
+ }
}
[3/3] git commit: Closes TAP5-2343: check JDK version only if the
aggregateJavadoc is executed,
perform version check only on JDK 1.5 through 1.7
Posted by jk...@apache.org.
Closes TAP5-2343: check JDK version only if the aggregateJavadoc is executed, perform version check only on JDK 1.5 through 1.7
Project: http://git-wip-us.apache.org/repos/asf/tapestry-5/repo
Commit: http://git-wip-us.apache.org/repos/asf/tapestry-5/commit/b4fd5686
Tree: http://git-wip-us.apache.org/repos/asf/tapestry-5/tree/b4fd5686
Diff: http://git-wip-us.apache.org/repos/asf/tapestry-5/diff/b4fd5686
Branch: refs/heads/master
Commit: b4fd5686936a6587e12835cc2040db367b5a8e95
Parents: f3c872f
Author: Jochen Kemnade <jk...@apache.org>
Authored: Thu May 29 12:10:52 2014 +0200
Committer: Jochen Kemnade <jk...@apache.org>
Committed: Thu May 29 12:10:52 2014 +0200
----------------------------------------------------------------------
build.gradle | 18 +++++++++++-------
1 file changed, 11 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b4fd5686/build.gradle
----------------------------------------------------------------------
diff --git a/build.gradle b/build.gradle
index 74b24bd..b349e74 100755
--- a/build.gradle
+++ b/build.gradle
@@ -298,11 +298,11 @@ subprojects {
// Cribbed from https://github.com/hibernate/hibernate-core/blob/master/release/release.gradle#L19
task aggregateJavadoc(type: Javadoc) {
-
- // Temporary: don't check on the CI server. This can be removed when the CI server is upgraded.
- if (!continuousIntegrationBuild && !checkJDK())
- throw new StopActionException("Update your JDK to fix VU#225657")
-
+ doFirst {
+ // Temporary: don't check on the CI server. This can be removed when the CI server is upgraded.
+ if (!continuousIntegrationBuild && !checkJDK())
+ throw new StopActionException("Update your JDK to fix VU#225657")
+ }
dependsOn configurations.javadoc
group "Documentation"
@@ -557,14 +557,18 @@ boolean checkJDK() {
def match = jdkVersion =~ /_(\d+)/
if (!match.find())
- throw new IllegalStateException("""Could not parse minor version number out of "#{jdkVersion}".""")
+ throw new IllegalStateException("""Could not parse minor version number out of "${jdkVersion}".""")
def minor = match[0][1].toInteger()
if (jdkVersion.startsWith("1.7")) {
minor > 21
}
- else { // JDK 6 and 5 require the same minor version
+ else if (jdkVersion.startsWith("1.5") || jdkVersion.startsWith("1.6")) {
+ // JDK 6 and 5 require the same minor version
minor > 45
}
+ else {
+ true
+ }
}
[2/3] git commit: TAP5-2342: avoid importing @java.util.*@ as that
might cause naming conflicts with our own classes on future JDK versions
Posted by jk...@apache.org.
TAP5-2342: avoid importing @java.util.*@ as that might cause naming conflicts with our own classes on future JDK versions
Project: http://git-wip-us.apache.org/repos/asf/tapestry-5/repo
Commit: http://git-wip-us.apache.org/repos/asf/tapestry-5/commit/f3c872f6
Tree: http://git-wip-us.apache.org/repos/asf/tapestry-5/tree/f3c872f6
Diff: http://git-wip-us.apache.org/repos/asf/tapestry-5/diff/f3c872f6
Branch: refs/heads/master
Commit: f3c872f67d3099bb84faa2bce88d022d95c12f27
Parents: 1069f05
Author: Jochen Kemnade <jk...@apache.org>
Authored: Thu May 29 11:57:34 2014 +0200
Committer: Jochen Kemnade <jk...@apache.org>
Committed: Thu May 29 11:57:34 2014 +0200
----------------------------------------------------------------------
.../apache/tapestry5/ioc/internal/DefaultModuleDefImpl.java | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/f3c872f6/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/DefaultModuleDefImpl.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/DefaultModuleDefImpl.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/DefaultModuleDefImpl.java
index 55e993d..753e746 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/DefaultModuleDefImpl.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/DefaultModuleDefImpl.java
@@ -29,7 +29,13 @@ import java.lang.annotation.Annotation;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.lang.reflect.Modifier;
-import java.util.*;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Set;
/**
* Starting from the Class for a module, identifies all the services (service builder methods),