From commits-return-18752-archive-asf-public=cust-asf.ponee.io@struts.apache.org Wed Feb 12 15:23:43 2020 Return-Path: X-Original-To: archive-asf-public@cust-asf.ponee.io Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [207.244.88.153]) by mx-eu-01.ponee.io (Postfix) with SMTP id E762D180657 for ; Wed, 12 Feb 2020 16:23:42 +0100 (CET) Received: (qmail 54346 invoked by uid 500); 12 Feb 2020 15:23:41 -0000 Mailing-List: contact commits-help@struts.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@struts.apache.org Delivered-To: mailing list commits@struts.apache.org Received: (qmail 54337 invoked by uid 99); 12 Feb 2020 15:23:41 -0000 Received: from ec2-52-202-80-70.compute-1.amazonaws.com (HELO gitbox.apache.org) (52.202.80.70) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 12 Feb 2020 15:23:41 +0000 Received: by gitbox.apache.org (ASF Mail Server at gitbox.apache.org, from userid 33) id C557F8546B; Wed, 12 Feb 2020 15:23:41 +0000 (UTC) Date: Wed, 12 Feb 2020 15:23:41 +0000 To: "commits@struts.apache.org" Subject: [struts] branch master updated: debug docker build for JDK 9+ MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Message-ID: <158152102159.23376.18105450917367198554@gitbox.apache.org> From: lukaszlenart@apache.org X-Git-Host: gitbox.apache.org X-Git-Repo: struts X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Oldrev: 7e0dadb90efacf3f2464a31e79f7f5e6b1f8cc7b X-Git-Newrev: 07afb5ba88115e6f7f41f7c86272a3b2cf53f20e X-Git-Rev: 07afb5ba88115e6f7f41f7c86272a3b2cf53f20e X-Git-NotificationType: ref_changed_plus_diff X-Git-Multimail-Version: 1.5.dev Auto-Submitted: auto-generated 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 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))) {