From 8c168e3b4b1186dcba282a52bdf3e60f1e7177f7 Mon Sep 17 00:00:00 2001 From: Wouter Born Date: Fri, 14 Jul 2023 10:59:53 +0200 Subject: [PATCH 01/21] Upgrade JDOM from 1.0 to 2.0.6.1 This upgrade fixes warnings in IntelliJ IDEA about the CVE-2021-33813 in the JDOM 1.0 dependency. The tags are redundant and cause issues in IntelliJ IDEA. It is also better to use JAVA_HOME instead of /usr/bin as javadoc may not always be symlinked to a Java 8 JDK causing compilation issues. Signed-off-by: Wouter Born --- mockrunner-all/pom.xml | 1 - .../mockrunner/base/HTMLOutputTestCase.java | 2 +- .../test/web/HTMLOutputModuleTest.java | 2 +- mockrunner-core/pom.xml | 5 ++--- .../com/mockrunner/test/util/XmlUtilTest.java | 4 ++-- .../java/com/mockrunner/util/web/XmlUtil.java | 20 +++++++++---------- mockrunner-ejb/pom.xml | 1 - mockrunner-jca/pom.xml | 1 - mockrunner-jdbc/pom.xml | 1 - .../mockrunner/jdbc/XMLResultSetFactory.java | 6 +++--- ...MLResultSetFactorySQLDeveloperSupport.java | 6 +++--- .../com/mockrunner/mock/jdbc/MockSQLXML.java | 15 +++++++------- .../mockrunner/test/jdbc/MockSQLXMLTest.java | 10 +++++----- mockrunner-jms-spring/pom.xml | 1 - mockrunner-jms/pom.xml | 1 - mockrunner-servlet/pom.xml | 1 - .../base/BasicHTMLOutputTestCase.java | 2 +- .../com/mockrunner/base/HTMLOutputModule.java | 4 ++-- .../example/servlet/RedirectServletTest.java | 2 +- mockrunner-tag/pom.xml | 1 - pom.xml | 10 +++++----- 21 files changed, 44 insertions(+), 52 deletions(-) diff --git a/mockrunner-all/pom.xml b/mockrunner-all/pom.xml index 4b7793a67..6fbffaceb 100644 --- a/mockrunner-all/pom.xml +++ b/mockrunner-all/pom.xml @@ -6,7 +6,6 @@ com.mockrunner mockrunner 2.0.7-SNAPSHOT - .. mockrunner-all diff --git a/mockrunner-all/src/main/java/com/mockrunner/base/HTMLOutputTestCase.java b/mockrunner-all/src/main/java/com/mockrunner/base/HTMLOutputTestCase.java index 87d61d692..a5987cdad 100644 --- a/mockrunner-all/src/main/java/com/mockrunner/base/HTMLOutputTestCase.java +++ b/mockrunner-all/src/main/java/com/mockrunner/base/HTMLOutputTestCase.java @@ -56,7 +56,7 @@ protected org.w3c.dom.Document getOutputAsW3CDocument() /** * Delegates to {@link HTMLOutputModule#getOutputAsJDOMDocument} */ - protected org.jdom.Document getOutputAsJDOMDocument() + protected org.jdom2.Document getOutputAsJDOMDocument() { return getHTMLOutputModule().getOutputAsJDOMDocument(); } diff --git a/mockrunner-all/src/test/java/com/mockrunner/test/web/HTMLOutputModuleTest.java b/mockrunner-all/src/test/java/com/mockrunner/test/web/HTMLOutputModuleTest.java index 2ae4fdd49..38bfdb578 100644 --- a/mockrunner-all/src/test/java/com/mockrunner/test/web/HTMLOutputModuleTest.java +++ b/mockrunner-all/src/test/java/com/mockrunner/test/web/HTMLOutputModuleTest.java @@ -17,7 +17,7 @@ import org.apache.struts.action.ActionForm; import org.apache.struts.action.ActionForward; import org.apache.struts.action.ActionMapping; -import org.jdom.Element; +import org.jdom2.Element; import org.junit.Before; import org.junit.Test; diff --git a/mockrunner-core/pom.xml b/mockrunner-core/pom.xml index 7e7d581b9..35b448c81 100644 --- a/mockrunner-core/pom.xml +++ b/mockrunner-core/pom.xml @@ -6,7 +6,6 @@ com.mockrunner mockrunner 2.0.7-SNAPSHOT - .. mockrunner-core @@ -31,8 +30,8 @@ - jdom - jdom + org.jdom + jdom2 diff --git a/mockrunner-core/src/main/java/com/mockrunner/test/util/XmlUtilTest.java b/mockrunner-core/src/main/java/com/mockrunner/test/util/XmlUtilTest.java index 5983a0b3f..282198e41 100644 --- a/mockrunner-core/src/main/java/com/mockrunner/test/util/XmlUtilTest.java +++ b/mockrunner-core/src/main/java/com/mockrunner/test/util/XmlUtilTest.java @@ -5,8 +5,8 @@ import junit.framework.TestCase; -import org.jdom.Document; -import org.jdom.Element; +import org.jdom2.Document; +import org.jdom2.Element; import com.mockrunner.util.web.XmlUtil; diff --git a/mockrunner-core/src/main/java/com/mockrunner/util/web/XmlUtil.java b/mockrunner-core/src/main/java/com/mockrunner/util/web/XmlUtil.java index aab42bceb..8ae749abf 100644 --- a/mockrunner-core/src/main/java/com/mockrunner/util/web/XmlUtil.java +++ b/mockrunner-core/src/main/java/com/mockrunner/util/web/XmlUtil.java @@ -5,9 +5,9 @@ import org.apache.xerces.parsers.DOMParser; import org.cyberneko.html.HTMLConfiguration; -import org.jdom.Element; -import org.jdom.input.DOMBuilder; -import org.jdom.output.XMLOutputter; +import org.jdom2.Element; +import org.jdom2.input.DOMBuilder; +import org.jdom2.output.XMLOutputter; import org.xml.sax.InputSource; import com.mockrunner.base.NestedApplicationException; @@ -34,10 +34,10 @@ public class XmlUtil * * * the method returns the h1 tag as Element. - * @param document the org.jdom.Document + * @param document the org.jdom2.Document * @return the body Element */ - public static Element getBodyFragmentFromJDOMDocument(org.jdom.Document document) + public static Element getBodyFragmentFromJDOMDocument(org.jdom2.Document document) { Element element = document.getRootElement().getChild("BODY"); if(null == element) @@ -57,17 +57,17 @@ public static Element getBodyFragmentFromJDOMDocument(org.jdom.Document document * @return the body element * @deprecated use {@link #getBodyFragmentFromJDOMDocument} */ - public static Element getBodyFragmentJDOMDocument(org.jdom.Document document) + public static Element getBodyFragmentJDOMDocument(org.jdom2.Document document) { return getBodyFragmentFromJDOMDocument(document); } /** * Returns the documents XML content as a string. - * @param document the org.jdom.Document + * @param document the org.jdom2.Document * @return the output as string */ - public static String createStringFromJDOMDocument(org.jdom.Document document) + public static String createStringFromJDOMDocument(org.jdom2.Document document) { try { @@ -83,9 +83,9 @@ public static String createStringFromJDOMDocument(org.jdom.Document document) * Creates a JDOM Document from a specified * W3C Document. * @param document the org.w3c.dom.Document - * @return the org.jdom.Document + * @return the org.jdom2.Document */ - public static org.jdom.Document createJDOMDocument(org.w3c.dom.Document document) + public static org.jdom2.Document createJDOMDocument(org.w3c.dom.Document document) { return new DOMBuilder().build(document); } diff --git a/mockrunner-ejb/pom.xml b/mockrunner-ejb/pom.xml index 20f0dc1a5..e787cb3e6 100644 --- a/mockrunner-ejb/pom.xml +++ b/mockrunner-ejb/pom.xml @@ -6,7 +6,6 @@ com.mockrunner mockrunner 2.0.7-SNAPSHOT - .. mockrunner-ejb diff --git a/mockrunner-jca/pom.xml b/mockrunner-jca/pom.xml index 094db9730..8d805b9c9 100644 --- a/mockrunner-jca/pom.xml +++ b/mockrunner-jca/pom.xml @@ -6,7 +6,6 @@ com.mockrunner mockrunner 2.0.7-SNAPSHOT - .. mockrunner-jca diff --git a/mockrunner-jdbc/pom.xml b/mockrunner-jdbc/pom.xml index 44cf19bae..56e5d75b4 100644 --- a/mockrunner-jdbc/pom.xml +++ b/mockrunner-jdbc/pom.xml @@ -6,7 +6,6 @@ com.mockrunner mockrunner 2.0.7-SNAPSHOT - .. mockrunner-jdbc diff --git a/mockrunner-jdbc/src/main/java/com/mockrunner/jdbc/XMLResultSetFactory.java b/mockrunner-jdbc/src/main/java/com/mockrunner/jdbc/XMLResultSetFactory.java index 24d7c4617..c8faf67d8 100644 --- a/mockrunner-jdbc/src/main/java/com/mockrunner/jdbc/XMLResultSetFactory.java +++ b/mockrunner-jdbc/src/main/java/com/mockrunner/jdbc/XMLResultSetFactory.java @@ -7,9 +7,9 @@ import java.util.List; import java.util.Map; -import org.jdom.Document; -import org.jdom.Element; -import org.jdom.input.SAXBuilder; +import org.jdom2.Document; +import org.jdom2.Element; +import org.jdom2.input.SAXBuilder; import com.mockrunner.base.NestedApplicationException; import com.mockrunner.mock.jdbc.MockResultSet; diff --git a/mockrunner-jdbc/src/main/java/com/mockrunner/jdbc/XMLResultSetFactorySQLDeveloperSupport.java b/mockrunner-jdbc/src/main/java/com/mockrunner/jdbc/XMLResultSetFactorySQLDeveloperSupport.java index 837ac29d3..b9d3fb098 100644 --- a/mockrunner-jdbc/src/main/java/com/mockrunner/jdbc/XMLResultSetFactorySQLDeveloperSupport.java +++ b/mockrunner-jdbc/src/main/java/com/mockrunner/jdbc/XMLResultSetFactorySQLDeveloperSupport.java @@ -4,9 +4,9 @@ import java.util.Iterator; import java.util.List; -import org.jdom.Document; -import org.jdom.Element; -import org.jdom.input.SAXBuilder; +import org.jdom2.Document; +import org.jdom2.Element; +import org.jdom2.input.SAXBuilder; import com.mockrunner.base.NestedApplicationException; import com.mockrunner.mock.jdbc.MockResultSet; diff --git a/mockrunner-jdbc/src/main/java/com/mockrunner/mock/jdbc/MockSQLXML.java b/mockrunner-jdbc/src/main/java/com/mockrunner/mock/jdbc/MockSQLXML.java index c6ef37f25..fab2a8cf6 100644 --- a/mockrunner-jdbc/src/main/java/com/mockrunner/mock/jdbc/MockSQLXML.java +++ b/mockrunner-jdbc/src/main/java/com/mockrunner/mock/jdbc/MockSQLXML.java @@ -32,13 +32,13 @@ import javax.xml.transform.stream.StreamResult; import javax.xml.transform.stream.StreamSource; -import org.jdom.Document; -import org.jdom.input.DOMBuilder; -import org.jdom.input.SAXBuilder; -import org.jdom.input.SAXHandler; -import org.jdom.output.DOMOutputter; -import org.jdom.output.Format; -import org.jdom.output.XMLOutputter; +import org.jdom2.Document; +import org.jdom2.input.DOMBuilder; +import org.jdom2.input.SAXBuilder; +import org.jdom2.input.sax.SAXHandler; +import org.jdom2.output.DOMOutputter; +import org.jdom2.output.Format; +import org.jdom2.output.XMLOutputter; import org.w3c.dom.Node; import org.xml.sax.InputSource; @@ -146,6 +146,7 @@ protected XMLInputFactory createXMLInputFactory() protected SAXBuilder createJDOMSAXBuilder() { + SAXBuilder builder = new SAXBuilder(); builder.setValidation(false); return builder; diff --git a/mockrunner-jdbc/src/test/java/com/mockrunner/test/jdbc/MockSQLXMLTest.java b/mockrunner-jdbc/src/test/java/com/mockrunner/test/jdbc/MockSQLXMLTest.java index 074832ebc..47059016a 100644 --- a/mockrunner-jdbc/src/test/java/com/mockrunner/test/jdbc/MockSQLXMLTest.java +++ b/mockrunner-jdbc/src/test/java/com/mockrunner/test/jdbc/MockSQLXMLTest.java @@ -24,11 +24,11 @@ import junit.framework.TestCase; -import org.jdom.Document; -import org.jdom.input.DOMBuilder; -import org.jdom.input.SAXBuilder; -import org.jdom.output.Format; -import org.jdom.output.XMLOutputter; +import org.jdom2.Document; +import org.jdom2.input.DOMBuilder; +import org.jdom2.input.SAXBuilder; +import org.jdom2.output.Format; +import org.jdom2.output.XMLOutputter; import org.xml.sax.ContentHandler; import org.xml.sax.helpers.AttributesImpl; diff --git a/mockrunner-jms-spring/pom.xml b/mockrunner-jms-spring/pom.xml index 3cb9a0c18..f93b38332 100644 --- a/mockrunner-jms-spring/pom.xml +++ b/mockrunner-jms-spring/pom.xml @@ -6,7 +6,6 @@ com.mockrunner mockrunner 2.0.0-SNAPSHOT - .. mockrunner-jms-spring diff --git a/mockrunner-jms/pom.xml b/mockrunner-jms/pom.xml index c594db51b..550bd9443 100644 --- a/mockrunner-jms/pom.xml +++ b/mockrunner-jms/pom.xml @@ -6,7 +6,6 @@ com.mockrunner mockrunner 2.0.7-SNAPSHOT - .. mockrunner-jms diff --git a/mockrunner-servlet/pom.xml b/mockrunner-servlet/pom.xml index 5163d2cc8..5c2d1e425 100644 --- a/mockrunner-servlet/pom.xml +++ b/mockrunner-servlet/pom.xml @@ -6,7 +6,6 @@ com.mockrunner mockrunner 2.0.7-SNAPSHOT - .. mockrunner-servlet diff --git a/mockrunner-servlet/src/main/java/com/mockrunner/base/BasicHTMLOutputTestCase.java b/mockrunner-servlet/src/main/java/com/mockrunner/base/BasicHTMLOutputTestCase.java index 16fd09b43..7859ffc09 100644 --- a/mockrunner-servlet/src/main/java/com/mockrunner/base/BasicHTMLOutputTestCase.java +++ b/mockrunner-servlet/src/main/java/com/mockrunner/base/BasicHTMLOutputTestCase.java @@ -56,7 +56,7 @@ protected org.w3c.dom.Document getOutputAsW3CDocument() /** * Delegates to {@link HTMLOutputModule#getOutputAsJDOMDocument} */ - protected org.jdom.Document getOutputAsJDOMDocument() + protected org.jdom2.Document getOutputAsJDOMDocument() { return getHTMLOutputModule().getOutputAsJDOMDocument(); } diff --git a/mockrunner-servlet/src/main/java/com/mockrunner/base/HTMLOutputModule.java b/mockrunner-servlet/src/main/java/com/mockrunner/base/HTMLOutputModule.java index f6d0777da..269590782 100644 --- a/mockrunner-servlet/src/main/java/com/mockrunner/base/HTMLOutputModule.java +++ b/mockrunner-servlet/src/main/java/com/mockrunner/base/HTMLOutputModule.java @@ -66,10 +66,10 @@ public org.w3c.dom.Document getOutputAsW3CDocument() * to parse the string output yourself. Please note that * HTML parsing is not very fast and may slow down * your test suite. - * @return the output as org.jdom.Document + * @return the output as org.jdom2.Document * @throws RuntimeException if a parsing error occurs */ - public org.jdom.Document getOutputAsJDOMDocument() + public org.jdom2.Document getOutputAsJDOMDocument() { return XmlUtil.createJDOMDocument(getOutputAsW3CDocument()); } diff --git a/mockrunner-servlet/src/main/java/com/mockrunner/example/servlet/RedirectServletTest.java b/mockrunner-servlet/src/main/java/com/mockrunner/example/servlet/RedirectServletTest.java index 2589ee6dd..1d5f69ecb 100644 --- a/mockrunner-servlet/src/main/java/com/mockrunner/example/servlet/RedirectServletTest.java +++ b/mockrunner-servlet/src/main/java/com/mockrunner/example/servlet/RedirectServletTest.java @@ -4,7 +4,7 @@ import java.io.BufferedReader; -import org.jdom.Element; +import org.jdom2.Element; import org.junit.Before; import org.junit.Test; diff --git a/mockrunner-tag/pom.xml b/mockrunner-tag/pom.xml index 3eed1af44..d4fa06ed6 100644 --- a/mockrunner-tag/pom.xml +++ b/mockrunner-tag/pom.xml @@ -6,7 +6,6 @@ com.mockrunner mockrunner 2.0.7-SNAPSHOT - .. mockrunner-tag diff --git a/pom.xml b/pom.xml index a97d38b6a..63a47a42f 100644 --- a/pom.xml +++ b/pom.xml @@ -147,9 +147,9 @@ 2.0.8 - jdom - jdom - 1.0 + org.jdom + jdom2 + 2.0.6.1 junit @@ -493,7 +493,7 @@ - /usr/bin/javadoc + ${env.JAVA_HOME}/bin/javadoc @@ -505,7 +505,7 @@ - /usr/bin/javadoc + ${env.JAVA_HOME}/bin/javadoc From 90dd2e34fbd8115bde192cd7da9eb490cf438d95 Mon Sep 17 00:00:00 2001 From: cemartins Date: Sun, 23 Jul 2023 20:51:24 +0000 Subject: [PATCH 02/21] [maven-release-plugin] prepare release mockrunner-2.0.7 --- mockrunner-all/pom.xml | 28 ++++++++++++++-------------- mockrunner-core/pom.xml | 2 +- mockrunner-ejb/pom.xml | 2 +- mockrunner-jca/pom.xml | 2 +- mockrunner-jdbc/pom.xml | 2 +- mockrunner-jms/pom.xml | 2 +- mockrunner-servlet/pom.xml | 2 +- mockrunner-struts/pom.xml | 2 +- mockrunner-tag/pom.xml | 2 +- pom.xml | 4 ++-- 10 files changed, 24 insertions(+), 24 deletions(-) diff --git a/mockrunner-all/pom.xml b/mockrunner-all/pom.xml index 6fbffaceb..4a26fe470 100644 --- a/mockrunner-all/pom.xml +++ b/mockrunner-all/pom.xml @@ -5,7 +5,7 @@ com.mockrunner mockrunner - 2.0.7-SNAPSHOT + 2.0.7 mockrunner-all @@ -16,75 +16,75 @@ com.mockrunner mockrunner-core - 2.0.7-SNAPSHOT + 2.0.7 com.mockrunner mockrunner-jms - 2.0.7-SNAPSHOT + 2.0.7 com.mockrunner mockrunner-jms - 2.0.7-SNAPSHOT + 2.0.7 tests test com.mockrunner mockrunner-ejb - 2.0.7-SNAPSHOT + 2.0.7 com.mockrunner mockrunner-ejb - 2.0.7-SNAPSHOT + 2.0.7 tests test com.mockrunner mockrunner-jdbc - 2.0.7-SNAPSHOT + 2.0.7 com.mockrunner mockrunner-jdbc - 2.0.7-SNAPSHOT + 2.0.7 tests test com.mockrunner mockrunner-jca - 2.0.7-SNAPSHOT + 2.0.7 com.mockrunner mockrunner-servlet - 2.0.7-SNAPSHOT + 2.0.7 com.mockrunner mockrunner-servlet - 2.0.7-SNAPSHOT + 2.0.7 tests test com.mockrunner mockrunner-tag - 2.0.7-SNAPSHOT + 2.0.7 com.mockrunner mockrunner-struts - 2.0.7-SNAPSHOT + 2.0.7 com.mockrunner mockrunner-struts - 2.0.7-SNAPSHOT + 2.0.7 tests test diff --git a/mockrunner-core/pom.xml b/mockrunner-core/pom.xml index 35b448c81..d4bf85bcc 100644 --- a/mockrunner-core/pom.xml +++ b/mockrunner-core/pom.xml @@ -5,7 +5,7 @@ com.mockrunner mockrunner - 2.0.7-SNAPSHOT + 2.0.7 mockrunner-core diff --git a/mockrunner-ejb/pom.xml b/mockrunner-ejb/pom.xml index e787cb3e6..1edd8335c 100644 --- a/mockrunner-ejb/pom.xml +++ b/mockrunner-ejb/pom.xml @@ -5,7 +5,7 @@ com.mockrunner mockrunner - 2.0.7-SNAPSHOT + 2.0.7 mockrunner-ejb diff --git a/mockrunner-jca/pom.xml b/mockrunner-jca/pom.xml index 8d805b9c9..f47110a7a 100644 --- a/mockrunner-jca/pom.xml +++ b/mockrunner-jca/pom.xml @@ -5,7 +5,7 @@ com.mockrunner mockrunner - 2.0.7-SNAPSHOT + 2.0.7 mockrunner-jca diff --git a/mockrunner-jdbc/pom.xml b/mockrunner-jdbc/pom.xml index 56e5d75b4..7989d043f 100644 --- a/mockrunner-jdbc/pom.xml +++ b/mockrunner-jdbc/pom.xml @@ -5,7 +5,7 @@ com.mockrunner mockrunner - 2.0.7-SNAPSHOT + 2.0.7 mockrunner-jdbc diff --git a/mockrunner-jms/pom.xml b/mockrunner-jms/pom.xml index 550bd9443..818187a9e 100644 --- a/mockrunner-jms/pom.xml +++ b/mockrunner-jms/pom.xml @@ -5,7 +5,7 @@ com.mockrunner mockrunner - 2.0.7-SNAPSHOT + 2.0.7 mockrunner-jms diff --git a/mockrunner-servlet/pom.xml b/mockrunner-servlet/pom.xml index 5c2d1e425..c52fb601d 100644 --- a/mockrunner-servlet/pom.xml +++ b/mockrunner-servlet/pom.xml @@ -5,7 +5,7 @@ com.mockrunner mockrunner - 2.0.7-SNAPSHOT + 2.0.7 mockrunner-servlet diff --git a/mockrunner-struts/pom.xml b/mockrunner-struts/pom.xml index f867618be..cd1576705 100644 --- a/mockrunner-struts/pom.xml +++ b/mockrunner-struts/pom.xml @@ -5,7 +5,7 @@ com.mockrunner mockrunner - 2.0.7-SNAPSHOT + 2.0.7 .. diff --git a/mockrunner-tag/pom.xml b/mockrunner-tag/pom.xml index d4fa06ed6..7365c5d92 100644 --- a/mockrunner-tag/pom.xml +++ b/mockrunner-tag/pom.xml @@ -5,7 +5,7 @@ com.mockrunner mockrunner - 2.0.7-SNAPSHOT + 2.0.7 mockrunner-tag diff --git a/pom.xml b/pom.xml index 63a47a42f..c53c1dc12 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ com.mockrunner mockrunner - 2.0.7-SNAPSHOT + 2.0.7 pom MockRunner http://mockrunner.github.io @@ -56,7 +56,7 @@ scm:git:https://github.com/mockrunner/mockrunner.git https://github.com/mockrunner/mockrunner scm:git:https://github.com/mockrunner/mockrunner.git - HEAD + mockrunner-2.0.7 From 9458528325336a22109b7a3bf54b2ba65944631a Mon Sep 17 00:00:00 2001 From: cemartins Date: Sun, 23 Jul 2023 20:51:26 +0000 Subject: [PATCH 03/21] [maven-release-plugin] prepare for next development iteration --- mockrunner-all/pom.xml | 28 ++++++++++++++-------------- mockrunner-core/pom.xml | 2 +- mockrunner-ejb/pom.xml | 2 +- mockrunner-jca/pom.xml | 2 +- mockrunner-jdbc/pom.xml | 2 +- mockrunner-jms/pom.xml | 2 +- mockrunner-servlet/pom.xml | 2 +- mockrunner-struts/pom.xml | 2 +- mockrunner-tag/pom.xml | 2 +- pom.xml | 4 ++-- 10 files changed, 24 insertions(+), 24 deletions(-) diff --git a/mockrunner-all/pom.xml b/mockrunner-all/pom.xml index 4a26fe470..dfce1e1d2 100644 --- a/mockrunner-all/pom.xml +++ b/mockrunner-all/pom.xml @@ -5,7 +5,7 @@ com.mockrunner mockrunner - 2.0.7 + 2.0.8-SNAPSHOT mockrunner-all @@ -16,75 +16,75 @@ com.mockrunner mockrunner-core - 2.0.7 + 2.0.8-SNAPSHOT com.mockrunner mockrunner-jms - 2.0.7 + 2.0.8-SNAPSHOT com.mockrunner mockrunner-jms - 2.0.7 + 2.0.8-SNAPSHOT tests test com.mockrunner mockrunner-ejb - 2.0.7 + 2.0.8-SNAPSHOT com.mockrunner mockrunner-ejb - 2.0.7 + 2.0.8-SNAPSHOT tests test com.mockrunner mockrunner-jdbc - 2.0.7 + 2.0.8-SNAPSHOT com.mockrunner mockrunner-jdbc - 2.0.7 + 2.0.8-SNAPSHOT tests test com.mockrunner mockrunner-jca - 2.0.7 + 2.0.8-SNAPSHOT com.mockrunner mockrunner-servlet - 2.0.7 + 2.0.8-SNAPSHOT com.mockrunner mockrunner-servlet - 2.0.7 + 2.0.8-SNAPSHOT tests test com.mockrunner mockrunner-tag - 2.0.7 + 2.0.8-SNAPSHOT com.mockrunner mockrunner-struts - 2.0.7 + 2.0.8-SNAPSHOT com.mockrunner mockrunner-struts - 2.0.7 + 2.0.8-SNAPSHOT tests test diff --git a/mockrunner-core/pom.xml b/mockrunner-core/pom.xml index d4bf85bcc..b28165348 100644 --- a/mockrunner-core/pom.xml +++ b/mockrunner-core/pom.xml @@ -5,7 +5,7 @@ com.mockrunner mockrunner - 2.0.7 + 2.0.8-SNAPSHOT mockrunner-core diff --git a/mockrunner-ejb/pom.xml b/mockrunner-ejb/pom.xml index 1edd8335c..209eccff7 100644 --- a/mockrunner-ejb/pom.xml +++ b/mockrunner-ejb/pom.xml @@ -5,7 +5,7 @@ com.mockrunner mockrunner - 2.0.7 + 2.0.8-SNAPSHOT mockrunner-ejb diff --git a/mockrunner-jca/pom.xml b/mockrunner-jca/pom.xml index f47110a7a..c531475a1 100644 --- a/mockrunner-jca/pom.xml +++ b/mockrunner-jca/pom.xml @@ -5,7 +5,7 @@ com.mockrunner mockrunner - 2.0.7 + 2.0.8-SNAPSHOT mockrunner-jca diff --git a/mockrunner-jdbc/pom.xml b/mockrunner-jdbc/pom.xml index 7989d043f..a595cf37f 100644 --- a/mockrunner-jdbc/pom.xml +++ b/mockrunner-jdbc/pom.xml @@ -5,7 +5,7 @@ com.mockrunner mockrunner - 2.0.7 + 2.0.8-SNAPSHOT mockrunner-jdbc diff --git a/mockrunner-jms/pom.xml b/mockrunner-jms/pom.xml index 818187a9e..d87583470 100644 --- a/mockrunner-jms/pom.xml +++ b/mockrunner-jms/pom.xml @@ -5,7 +5,7 @@ com.mockrunner mockrunner - 2.0.7 + 2.0.8-SNAPSHOT mockrunner-jms diff --git a/mockrunner-servlet/pom.xml b/mockrunner-servlet/pom.xml index c52fb601d..07d76db82 100644 --- a/mockrunner-servlet/pom.xml +++ b/mockrunner-servlet/pom.xml @@ -5,7 +5,7 @@ com.mockrunner mockrunner - 2.0.7 + 2.0.8-SNAPSHOT mockrunner-servlet diff --git a/mockrunner-struts/pom.xml b/mockrunner-struts/pom.xml index cd1576705..92ceb4019 100644 --- a/mockrunner-struts/pom.xml +++ b/mockrunner-struts/pom.xml @@ -5,7 +5,7 @@ com.mockrunner mockrunner - 2.0.7 + 2.0.8-SNAPSHOT .. diff --git a/mockrunner-tag/pom.xml b/mockrunner-tag/pom.xml index 7365c5d92..949e26509 100644 --- a/mockrunner-tag/pom.xml +++ b/mockrunner-tag/pom.xml @@ -5,7 +5,7 @@ com.mockrunner mockrunner - 2.0.7 + 2.0.8-SNAPSHOT mockrunner-tag diff --git a/pom.xml b/pom.xml index c53c1dc12..3e24b1f80 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ com.mockrunner mockrunner - 2.0.7 + 2.0.8-SNAPSHOT pom MockRunner http://mockrunner.github.io @@ -56,7 +56,7 @@ scm:git:https://github.com/mockrunner/mockrunner.git https://github.com/mockrunner/mockrunner scm:git:https://github.com/mockrunner/mockrunner.git - mockrunner-2.0.7 + HEAD From 60d3a5012a62016dbb8d003c0905cb8ff1c57f50 Mon Sep 17 00:00:00 2001 From: Steinar Bang Date: Tue, 28 May 2024 17:24:54 +0200 Subject: [PATCH 04/21] Add .editorconfig file to keep formatting consistent --- .editorconfig | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 .editorconfig diff --git a/.editorconfig b/.editorconfig new file mode 100644 index 000000000..c59c447bf --- /dev/null +++ b/.editorconfig @@ -0,0 +1,12 @@ +root = true + +[*] +indent_style = tab +indent_size = 4 +end_of_line = lf +charset = utf-8 +trim_trailing_whitespace = true +insert_final_newline = true + +[*.md] +trim_trailing_whitespace = false From b6c86079a9bc557c4613fc9df550d94998243e26 Mon Sep 17 00:00:00 2001 From: Steinar Bang Date: Tue, 28 May 2024 17:44:44 +0200 Subject: [PATCH 05/21] Use version 4.4.6 of karaf-maven-plugin --- pom.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index 3e24b1f80..951233059 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ Europe/Berlin - + Steinar Bang @@ -316,7 +316,7 @@ org.apache.karaf.tooling karaf-maven-plugin - 4.1.7 + 4.4.6 true 80 @@ -429,7 +429,7 @@ - + @@ -572,7 +572,7 @@ mockrunner-core - org.apache.maven.plugins maven-release-plugin - 2.5.3 true release @@ -371,7 +367,6 @@ org.apache.maven.plugins maven-deploy-plugin - 2.8.2 org.apache.maven.plugins maven-gpg-plugin - 1.6 com.github.github site-maven-plugin - 0.12 Creating site for ${project.artifactId}, ${project.version} From 90f7c98c852404c1ab3d9b7f5de74244b8cb2cc3 Mon Sep 17 00:00:00 2001 From: Carlos Martins Date: Mon, 3 Jun 2024 22:59:45 +0200 Subject: [PATCH 14/21] Build with java 17 --- .github/workflows/build.yml | 4 ++-- .github/workflows/release.yml | 2 +- pom.xml | 7 +++---- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index a786d212a..90bbb2996 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -16,9 +16,9 @@ jobs: steps: - uses: actions/checkout@v2 - - name: Set up JDK 1.8 + - name: Set up JDK 17 uses: actions/setup-java@v1 with: - java-version: 1.8 + java-version: 17 - name: Build with Maven run: mvn -B package --file pom.xml diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index ea630d0af..8db82886f 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -14,7 +14,7 @@ jobs: - name: Install Java and Maven uses: actions/setup-java@v1 with: - java-version: 1.8 + java-version: 17 - name: Setup GPG env: diff --git a/pom.xml b/pom.xml index 5b4633973..fccb7c125 100644 --- a/pom.xml +++ b/pom.xml @@ -414,11 +414,10 @@ org.apache.maven.plugins maven-compiler-plugin - 3.7.0 - 1.8 - 1.8 - 1.8 + 17 + 17 + 17 -Xlint:all true true From f674a805cba4667682f40a3524b1e2059d736b51 Mon Sep 17 00:00:00 2001 From: Carlos Martins Date: Mon, 3 Jun 2024 23:07:09 +0200 Subject: [PATCH 15/21] Revert "Build with java 17" This reverts commit 90f7c98c852404c1ab3d9b7f5de74244b8cb2cc3. --- .github/workflows/build.yml | 4 ++-- .github/workflows/release.yml | 2 +- pom.xml | 7 ++++--- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 90bbb2996..a786d212a 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -16,9 +16,9 @@ jobs: steps: - uses: actions/checkout@v2 - - name: Set up JDK 17 + - name: Set up JDK 1.8 uses: actions/setup-java@v1 with: - java-version: 17 + java-version: 1.8 - name: Build with Maven run: mvn -B package --file pom.xml diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 8db82886f..ea630d0af 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -14,7 +14,7 @@ jobs: - name: Install Java and Maven uses: actions/setup-java@v1 with: - java-version: 17 + java-version: 1.8 - name: Setup GPG env: diff --git a/pom.xml b/pom.xml index fccb7c125..5b4633973 100644 --- a/pom.xml +++ b/pom.xml @@ -414,10 +414,11 @@ org.apache.maven.plugins maven-compiler-plugin + 3.7.0 - 17 - 17 - 17 + 1.8 + 1.8 + 1.8 -Xlint:all true true From 200c9bffb22d90282be2103fed05ee5b9fd32c41 Mon Sep 17 00:00:00 2001 From: Carlos Martins Date: Mon, 3 Jun 2024 23:08:25 +0200 Subject: [PATCH 16/21] Build with java 8 and increased surefire memory args --- pom.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/pom.xml b/pom.xml index 5b4633973..7d0016877 100644 --- a/pom.xml +++ b/pom.xml @@ -352,6 +352,7 @@ maven-surefire-plugin false + -Xmx1024m -XX:MaxPermSize=256m From 663c80418af076345b4fafe77e1c9ff2fbbe7d9d Mon Sep 17 00:00:00 2001 From: Carlos Martins Date: Mon, 3 Jun 2024 23:12:45 +0200 Subject: [PATCH 17/21] Build with java 17 and increased surefire memory args --- .github/workflows/build.yml | 4 ++-- .github/workflows/release.yml | 2 +- pom.xml | 8 ++++---- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index a786d212a..90bbb2996 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -16,9 +16,9 @@ jobs: steps: - uses: actions/checkout@v2 - - name: Set up JDK 1.8 + - name: Set up JDK 17 uses: actions/setup-java@v1 with: - java-version: 1.8 + java-version: 17 - name: Build with Maven run: mvn -B package --file pom.xml diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index ea630d0af..8db82886f 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -14,7 +14,7 @@ jobs: - name: Install Java and Maven uses: actions/setup-java@v1 with: - java-version: 1.8 + java-version: 17 - name: Setup GPG env: diff --git a/pom.xml b/pom.xml index 7d0016877..c0a512999 100644 --- a/pom.xml +++ b/pom.xml @@ -352,7 +352,7 @@ maven-surefire-plugin false - -Xmx1024m -XX:MaxPermSize=256m + -Xmx1024m @@ -417,9 +417,9 @@ maven-compiler-plugin 3.7.0 - 1.8 - 1.8 - 1.8 + 17 + 17 + 17 -Xlint:all true true From 2ab2067921814f3d24f60202aae6cc72ae6fee8c Mon Sep 17 00:00:00 2001 From: Carlos Martins Date: Mon, 3 Jun 2024 23:24:16 +0200 Subject: [PATCH 18/21] Update github actions versions --- .github/workflows/build.yml | 5 +++-- .github/workflows/release.yml | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 90bbb2996..48b34a9c9 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -15,10 +15,11 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Set up JDK 17 - uses: actions/setup-java@v1 + uses: actions/setup-java@v4 with: + distribution: 'temurin' java-version: 17 - name: Build with Maven run: mvn -B package --file pom.xml diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 8db82886f..31c83c109 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -9,11 +9,12 @@ jobs: runs-on: ubuntu-latest steps: - name: Check out Git repository - uses: actions/checkout@v2 + uses: actions/checkout@v4 - name: Install Java and Maven - uses: actions/setup-java@v1 + uses: actions/setup-java@v4 with: + distribution: 'temurin' java-version: 17 - name: Setup GPG From f39a9f037c658716c20bea494e483c1842cc5759 Mon Sep 17 00:00:00 2001 From: Carlos Martins Date: Mon, 3 Jun 2024 23:32:19 +0200 Subject: [PATCH 19/21] More memory for surefire --- pom.xml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index c0a512999..026975577 100644 --- a/pom.xml +++ b/pom.xml @@ -352,7 +352,7 @@ maven-surefire-plugin false - -Xmx1024m + -Xmx2048m @@ -415,7 +415,6 @@ org.apache.maven.plugins maven-compiler-plugin - 3.7.0 17 17 From fc290039f5137a897d55a67f8e5a8c2cbb1723e2 Mon Sep 17 00:00:00 2001 From: Carlos Martins Date: Mon, 3 Jun 2024 23:46:51 +0200 Subject: [PATCH 20/21] Even more memory for surefire --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 026975577..5bec60b46 100644 --- a/pom.xml +++ b/pom.xml @@ -352,7 +352,7 @@ maven-surefire-plugin false - -Xmx2048m + -Xmx4096m From 6b8243d66bde5319692aa408b670c64ca34057fe Mon Sep 17 00:00:00 2001 From: Carlos Martins Date: Mon, 3 Jun 2024 23:49:01 +0200 Subject: [PATCH 21/21] Less memory for surefire --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 5bec60b46..5996f6cc1 100644 --- a/pom.xml +++ b/pom.xml @@ -352,7 +352,7 @@ maven-surefire-plugin false - -Xmx4096m + -Xmx384m