From commits-return-18330-archive-asf-public=cust-asf.ponee.io@struts.apache.org Sat Feb 9 14:04:21 2019 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 [140.211.11.3]) by mx-eu-01.ponee.io (Postfix) with SMTP id CDE5118067C for ; Sat, 9 Feb 2019 15:04:20 +0100 (CET) Received: (qmail 19142 invoked by uid 500); 9 Feb 2019 14:04:19 -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 18957 invoked by uid 99); 9 Feb 2019 14:04:19 -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; Sat, 09 Feb 2019 14:04:19 +0000 Received: by gitbox.apache.org (ASF Mail Server at gitbox.apache.org, from userid 33) id 00ABA820A7; Sat, 9 Feb 2019 14:04:18 +0000 (UTC) Date: Sat, 09 Feb 2019 14:04:20 +0000 To: "commits@struts.apache.org" Subject: [struts] 02/02: Solve some dependency convergence issues reported by maven enforce plugin MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit From: jogep@apache.org In-Reply-To: <154972105886.531.188737101714249922@gitbox.apache.org> References: <154972105886.531.188737101714249922@gitbox.apache.org> X-Git-Host: gitbox.apache.org X-Git-Repo: struts X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Rev: 75d252554b7fd08e14bb7d4416dc403df8b7de1e X-Git-NotificationType: diff X-Git-Multimail-Version: 1.5.dev Auto-Submitted: auto-generated Message-Id: <20190209140419.00ABA820A7@gitbox.apache.org> This is an automated email from the ASF dual-hosted git repository. jogep pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/struts.git commit 75d252554b7fd08e14bb7d4416dc403df8b7de1e Author: Johannes Geppert AuthorDate: Sat Feb 9 15:04:22 2019 +0100 Solve some dependency convergence issues reported by maven enforce plugin https://issues.apache.org/jira/browse/WW-5018 --- apps/rest-showcase/pom.xml | 16 +++++++++++----- apps/showcase/pom.xml | 9 +-------- plugins/jasperreports/pom.xml | 12 ++++++++---- plugins/osgi/pom.xml | 17 +++++++++++++++++ 4 files changed, 37 insertions(+), 17 deletions(-) diff --git a/apps/rest-showcase/pom.xml b/apps/rest-showcase/pom.xml index 810cd31..2bf65a1 100644 --- a/apps/rest-showcase/pom.xml +++ b/apps/rest-showcase/pom.xml @@ -73,26 +73,32 @@ net.sourceforge.jwebunit jwebunit-core - 1.4.1 + 3.3 test + - commons-httpclient - commons-httpclient - 3.1 + net.sourceforge.htmlunit + htmlunit + 2.27 test net.sourceforge.jwebunit jwebunit-htmlunit-plugin - 1.4.1 + 3.3 test xom xom + + + net.sourceforge.htmlunit + htmlunit + diff --git a/apps/showcase/pom.xml b/apps/showcase/pom.xml index 9e9cce2..a3c8341 100644 --- a/apps/showcase/pom.xml +++ b/apps/showcase/pom.xml @@ -141,13 +141,6 @@ commons-fileupload - - commons-httpclient - commons-httpclient - 3.1 - test - - junit junit @@ -157,7 +150,7 @@ net.sourceforge.htmlunit htmlunit - 2.24 + 2.27 test diff --git a/plugins/jasperreports/pom.xml b/plugins/jasperreports/pom.xml index 72804ed..8a9762d 100644 --- a/plugins/jasperreports/pom.xml +++ b/plugins/jasperreports/pom.xml @@ -39,13 +39,17 @@ net.sf.jasperreports jasperreports - 6.0.3 + 6.7.0 provided - + - org.olap4j - olap4j + com.fasterxml.jackson.core + jackson-databind + + + com.fasterxml.jackson.core + jackson-annotation diff --git a/plugins/osgi/pom.xml b/plugins/osgi/pom.xml index cbe48f0..9162538 100644 --- a/plugins/osgi/pom.xml +++ b/plugins/osgi/pom.xml @@ -33,16 +33,33 @@ + org.osgi + org.osgi.core + 4.3.1 + + org.apache.felix org.apache.felix.main org.apache.felix org.apache.felix.shell + + + org.osgi + org.osgi.core + + org.apache.felix org.apache.felix.shell.tui + + + org.osgi + org.osgi.core + +