You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tapestry.apache.org by bo...@apache.org on 2018/11/04 17:18:50 UTC
[1/2] tapestry-5 git commit: Fix problem of intermittent Selenium
link conversion to absolute URLs
Repository: tapestry-5
Updated Branches:
refs/heads/master b323f47ad -> 28d755bec
Fix problem of intermittent Selenium link conversion to absolute URLs
Project: http://git-wip-us.apache.org/repos/asf/tapestry-5/repo
Commit: http://git-wip-us.apache.org/repos/asf/tapestry-5/commit/e22c6191
Tree: http://git-wip-us.apache.org/repos/asf/tapestry-5/tree/e22c6191
Diff: http://git-wip-us.apache.org/repos/asf/tapestry-5/diff/e22c6191
Branch: refs/heads/master
Commit: e22c61916d24255579c0e62bd9190d400b0997a8
Parents: b323f47
Author: Bob Harner <bo...@gmail.com>
Authored: Sun Nov 4 11:54:35 2018 -0500
Committer: Bob Harner <bo...@gmail.com>
Committed: Sun Nov 4 12:16:02 2018 -0500
----------------------------------------------------------------------
.../tapestry5/integration/appfolder/AppFolderTests.groovy | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/e22c6191/tapestry-core/src/test/groovy/org/apache/tapestry5/integration/appfolder/AppFolderTests.groovy
----------------------------------------------------------------------
diff --git a/tapestry-core/src/test/groovy/org/apache/tapestry5/integration/appfolder/AppFolderTests.groovy b/tapestry-core/src/test/groovy/org/apache/tapestry5/integration/appfolder/AppFolderTests.groovy
index c2baaab..a0c192d 100644
--- a/tapestry-core/src/test/groovy/org/apache/tapestry5/integration/appfolder/AppFolderTests.groovy
+++ b/tapestry-core/src/test/groovy/org/apache/tapestry5/integration/appfolder/AppFolderTests.groovy
@@ -56,10 +56,12 @@ class AppFolderTests extends GroovyTapestryCoreTestCase
// there's only one image on page
String assetURL = getAttribute("//img/@src")
- // Selenium now adds unwanted port & host
- String urlPath = new URL(assetURL).getPath();
+ // Selenium now (sometimes?) adds unwanted port & host
+ if (assetURL.startsWith("http")) {
+ assetURL = new URL(assetURL).getPath()
+ }
- assert urlPath.startsWith("/t5app/assets/")
+ assert assetURL.startsWith("/t5app/assets/")
assertDownloadedAsset urlPath, "src/test/appfolder/images/t5-logo.png"
}
[2/2] tapestry-5 git commit: TAP5-2588: Make Java 9/10 detection work
for 11 too
Posted by bo...@apache.org.
TAP5-2588: Make Java 9/10 detection work for 11 too
Project: http://git-wip-us.apache.org/repos/asf/tapestry-5/repo
Commit: http://git-wip-us.apache.org/repos/asf/tapestry-5/commit/28d755be
Tree: http://git-wip-us.apache.org/repos/asf/tapestry-5/tree/28d755be
Diff: http://git-wip-us.apache.org/repos/asf/tapestry-5/diff/28d755be
Branch: refs/heads/master
Commit: 28d755becd3c648479f446eb0b7e8e6f3925205f
Parents: e22c619
Author: Bob Harner <bo...@gmail.com>
Authored: Sun Nov 4 12:13:10 2018 -0500
Committer: Bob Harner <bo...@gmail.com>
Committed: Sun Nov 4 12:17:30 2018 -0500
----------------------------------------------------------------------
build.gradle | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/28d755be/build.gradle
----------------------------------------------------------------------
diff --git a/build.gradle b/build.gradle
index 45872f6..d0db2c5 100755
--- a/build.gradle
+++ b/build.gradle
@@ -116,12 +116,11 @@ dependencies {
binaries "org.antlr:antlr-runtime:3.3", { transitive = false }
}
-def isJava9 = System.properties['java.version'].startsWith('9')
-def isJava10 = System.properties['java.version'].startsWith('10')
+String jdkVersion = System.properties['java.version']
+def jdkMajorVersion = jdkVersion.substring(0, jdkVersion.indexOf(".")) // 1, 9, 10...
subprojects {
- def jdkVersion = System.properties['java.version']
def specifyMaxPermSize = jdkVersion ==~ /1\.[67].+/
version = parent.version
@@ -135,6 +134,8 @@ subprojects {
apply plugin: "java"
apply plugin: "groovy" // mostly for testing
apply plugin: "maven" // for deployment
+ // TODO: replace the "maven" plugin above with the newer "maven-publish"
+
apply plugin: "project-report"
apply plugin: "jacoco"
@@ -193,7 +194,7 @@ subprojects {
systemProperties["java.io.tmpdir"] = temporaryDir.absolutePath
jvmArgs("-Dfile.encoding=UTF-8")
- if (isJava9 || isJava10){
+ if (jdkMajorVersion != "1"){
// TODO: make these regular dependencies instead
jvmArgs += ["--add-modules", "java.xml.ws.annotation,java.xml.bind"]
}