struts-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From lukaszlen...@apache.org
Subject [struts] branch master updated: debug docker build for JDK 9+
Date Wed, 12 Feb 2020 15:23:41 GMT
This is an automated email from the ASF dual-hosted git repository.

lukaszlenart pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/struts.git


The following commit(s) were added to refs/heads/master by this push:
     new 07afb5b  debug docker build for JDK 9+
     new 555e534  Merge pull request #396 from yasserzamani/debug_docker
07afb5b is described below

commit 07afb5ba88115e6f7f41f7c86272a3b2cf53f20e
Author: Yasser Zamani <yasserzamani@apache.org>
AuthorDate: Wed Feb 12 17:39:05 2020 +0330

    debug docker build for JDK 9+
---
 Jenkinsfile                                                         | 2 +-
 .../src/main/java/com/opensymphony/xwork2/util/ClassPathFinder.java | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 51b66b5..80f2815 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -8,7 +8,7 @@ pipeline {
     buildDiscarder logRotator(daysToKeepStr: '14', numToKeepStr: '10')
     timeout(80)
     disableConcurrentBuilds()
-    skipStagesAfterUnstable()
+    #!skipStagesAfterUnstable()
     quietPeriod(30)
   }
   triggers {
diff --git a/core/src/main/java/com/opensymphony/xwork2/util/ClassPathFinder.java b/core/src/main/java/com/opensymphony/xwork2/util/ClassPathFinder.java
index 7ab188c..ecfda32 100644
--- a/core/src/main/java/com/opensymphony/xwork2/util/ClassPathFinder.java
+++ b/core/src/main/java/com/opensymphony/xwork2/util/ClassPathFinder.java
@@ -90,6 +90,12 @@ public class ClassPathFinder {
             } catch (URISyntaxException e) {
                 continue;
             }
+
+            // debug docker build for JDK 9+
+            if (entryURI.getRawQuery() != null) {
+                throw new StrutsException("Currently URI with query component isn't supported:
" + entryURI.toString());
+            }
+
             File entry = new File(entryURI);
             if (entry.isFile() && entry.toString().endsWith(".jar")) {
                 try(ZipInputStream zip = new ZipInputStream(new FileInputStream(entry)))
{


Mime
View raw message