[struts] 02/02: Solve some dependency convergence issues reported by maven enforce plugin
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 + +
[struts] 01/02: Add maven enforce plugin with rule to avoid dependency convergence issues
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 67d40ce12adc334b070f086be970f3c176fdfb32 Author: Johannes Geppert AuthorDate: Sat Feb 9 15:03:46 2019 +0100 Add maven enforce plugin with rule to avoid dependency convergence issues https://issues.apache.org/jira/browse/WW-5018 --- pom.xml | 18 ++ 1 file changed, 18 insertions(+) diff --git a/pom.xml b/pom.xml index 28f2ce6..b010cc8 100644 --- a/pom.xml +++ b/pom.xml @@ -389,6 +389,24 @@ true + +org.apache.maven.plugins +maven-enforcer-plugin +3.0.0-M2 + + +enforce + + + + + + +enforce + + + +
[struts] branch master updated (c58e492 -> 75d2525)
This is an automated email from the ASF dual-hosted git repository. jogep pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/struts.git. from c58e492 Merge pull request #330 from aleksandr-m/feature/java8_date new 67d40ce Add maven enforce plugin with rule to avoid dependency convergence issues new 75d2525 Solve some dependency convergence issues reported by maven enforce plugin The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: apps/rest-showcase/pom.xml| 16 +++- apps/showcase/pom.xml | 9 + plugins/jasperreports/pom.xml | 12 plugins/osgi/pom.xml | 17 + pom.xml | 18 ++ 5 files changed, 55 insertions(+), 17 deletions(-)
[struts] branch master updated: Use latest available hibernate-validator version for bean validation test scope
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 The following commit(s) were added to refs/heads/master by this push: new 95866c3 Use latest available hibernate-validator version for bean validation test scope 95866c3 is described below commit 95866c347e2b746350d7d28f2391790f8e0d8fda Author: Johannes Geppert AuthorDate: Sat Feb 9 15:08:06 2019 +0100 Use latest available hibernate-validator version for bean validation test scope --- plugins/bean-validation/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/bean-validation/pom.xml b/plugins/bean-validation/pom.xml index f304f79..04595cc 100644 --- a/plugins/bean-validation/pom.xml +++ b/plugins/bean-validation/pom.xml @@ -52,7 +52,7 @@ org.hibernate hibernate-validator -5.1.3.Final +5.4.1.Final test
[struts] branch master updated: Fix compile issue of post order test example with latest http client version
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
The following commit(s) were added to refs/heads/master by this push:
new bbe46e9 Fix compile issue of post order test example with latest http
client version
bbe46e9 is described below
commit bbe46e92f09686bd541384facbcee422bc77c656
Author: Johannes Geppert
AuthorDate: Sat Feb 9 15:32:02 2019 +0100
Fix compile issue of post order test example with latest http client version
---
.../apache/struts2/rest/example/PostOrderTest.java | 101 +
1 file changed, 42 insertions(+), 59 deletions(-)
diff --git
a/apps/rest-showcase/src/test/java/it/org/apache/struts2/rest/example/PostOrderTest.java
b/apps/rest-showcase/src/test/java/it/org/apache/struts2/rest/example/PostOrderTest.java
index 80f48ae..333aa28 100644
---
a/apps/rest-showcase/src/test/java/it/org/apache/struts2/rest/example/PostOrderTest.java
+++
b/apps/rest-showcase/src/test/java/it/org/apache/struts2/rest/example/PostOrderTest.java
@@ -18,15 +18,16 @@
*/
package it.org.apache.struts2.rest.example;
+import com.gargoylesoftware.htmlunit.FailingHttpStatusCodeException;
import net.sourceforge.jwebunit.junit.WebTestCase;
-import org.apache.commons.httpclient.HttpClient;
-import org.apache.commons.httpclient.methods.PostMethod;
-import org.apache.commons.httpclient.methods.StringRequestEntity;
+import org.apache.http.client.methods.CloseableHttpResponse;
+import org.apache.http.client.methods.HttpPost;
+import org.apache.http.entity.StringEntity;
+import org.apache.http.impl.client.CloseableHttpClient;
+import org.apache.http.impl.client.HttpClients;
import java.io.IOException;
-import com.gargoylesoftware.htmlunit.FailingHttpStatusCodeException;
-
public class PostOrderTest extends WebTestCase {
public void setUp() throws Exception {
@@ -72,68 +73,50 @@ public class PostOrderTest extends WebTestCase {
}
public void testPostOrderInXml() throws IOException {
-HttpClient client = new HttpClient();
-PostMethod method = null;
-try {
-method = new PostMethod(ParameterUtils.getBaseUrl()+"/orders.xml");
-method.setRequestEntity(new
StringRequestEntity("\n" +
-"Test3\n" +
-"3342\n" +
-""));
-client.executeMethod(method);
-assertEquals(201, method.getStatusCode());
-
assertTrue(method.getResponseHeader("Location").getValue().startsWith(ParameterUtils.getBaseUrl()+"/orders/"));
-} finally {
-method.releaseConnection();
-}
+CloseableHttpClient client = HttpClients.createDefault();
+HttpPost httpPost = new HttpPost(ParameterUtils.getBaseUrl() +
"/orders.xml");
+httpPost.setEntity(new
StringEntity("\n" +
+"Test3\n" +
+"3342\n" +
+""));
+CloseableHttpResponse response = client.execute(httpPost);
+assertEquals(201, response.getStatusLine().getStatusCode());
+
assertTrue(response.getHeaders("Location")[0].getValue().startsWith(ParameterUtils.getBaseUrl()
+ "/orders/"));
+client.close();
}
public void testPostOrderInXmlWithBadData() throws IOException {
-HttpClient client = new HttpClient();
-PostMethod method = null;
-try {
-method = new PostMethod(ParameterUtils.getBaseUrl()+"/orders.xml");
-method.setRequestEntity(new
StringRequestEntity("\n" +
-"3342\n" +
-""));
-client.executeMethod(method);
-assertEquals(400, method.getStatusCode());
-String response = method.getResponseBodyAsString();
-assertTrue(response.contains("The client name is empty"));
-assertNull(method.getResponseHeader("Location"));
-} finally {
-method.releaseConnection();
-}
+CloseableHttpClient client = HttpClients.createDefault();
+HttpPost httpPost = new HttpPost(ParameterUtils.getBaseUrl() +
"/orders.xml");
+httpPost.setEntity(new
StringEntity("\n" +
+"3342\n" +
+""));
+CloseableHttpResponse response = client.execute(httpPost);
+assertEquals(400, response.getStatusLine().getStatusCode());
+assertTrue(response.toString().contains("The client name is
empty"));
+assertNull(response.getHeaders("Location"));
+client.close();
}
public void testPostOrderInJson() throws IOException {
-HttpClient client = new HttpClient();
-PostMethod method = null;
-try {
-method = new
PostMethod(ParameterUtils.getBaseUrl()+"/orders.json");
-method.setRequestEntity(new
StringRequestEntity("{\"amount\":33,\"clientName\":\"Test4\"}"));
-client.executeMethod(meth
[struts] branch master updated: Fix compile issue of jasper plugin with latest jasper version
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
The following commit(s) were added to refs/heads/master by this push:
new 9088405 Fix compile issue of jasper plugin with latest jasper version
9088405 is described below
commit 9088405b0f001ed788a781d55bbb9f11ec832352
Author: Johannes Geppert
AuthorDate: Sat Feb 9 15:35:12 2019 +0100
Fix compile issue of jasper plugin with latest jasper version
---
.../org/apache/struts2/views/jasperreports/JasperReportsResult.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/plugins/jasperreports/src/main/java/org/apache/struts2/views/jasperreports/JasperReportsResult.java
b/plugins/jasperreports/src/main/java/org/apache/struts2/views/jasperreports/JasperReportsResult.java
index c79e1b6..4eeb52d 100644
---
a/plugins/jasperreports/src/main/java/org/apache/struts2/views/jasperreports/JasperReportsResult.java
+++
b/plugins/jasperreports/src/main/java/org/apache/struts2/views/jasperreports/JasperReportsResult.java
@@ -352,7 +352,7 @@ public class JasperReportsResult extends
StrutsResultSupport implements JasperRe
Map imagesMap = new HashMap();
request.getSession(true).setAttribute("IMAGES_MAP", imagesMap);
-exporter = new JRHtmlExporter();
+exporter = new HtmlExporter();
exporter.setParameter(JRHtmlExporterParameter.IMAGES_MAP,
imagesMap);
exporter.setParameter(JRHtmlExporterParameter.IMAGES_URI,
request.getContextPath() + imageServletUrl);
