Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix GitHub build #10

Open
wants to merge 25 commits into
base: master
Choose a base branch
from
Open

Fix GitHub build #10

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
8c168e3
Upgrade JDOM from 1.0 to 2.0.6.1
wborn Jul 14, 2023
e8589d2
Merge pull request #85 from wborn/upgrade-jdom
cemartins Jul 14, 2023
90dd2e3
[maven-release-plugin] prepare release mockrunner-2.0.7
cemartins Jul 23, 2023
9458528
[maven-release-plugin] prepare for next development iteration
cemartins Jul 23, 2023
b01cf2f
Merge branch 'steinarb:master' into master
cemartins Aug 27, 2023
60d3a50
Add .editorconfig file to keep formatting consistent
steinarb May 28, 2024
b6c8607
Use version 4.4.6 of karaf-maven-plugin
steinarb May 28, 2024
fbdc91f
Add maven test scope dependency providing javax.rmi to mockrunner-ejb…
steinarb May 28, 2024
76feb66
Suppress cglib-full transitive mockejb dependency from mockrunner-ejb…
steinarb May 28, 2024
8b1d8d0
Use version 3.2.5 of maven-surefire-plugin
steinarb May 28, 2024
b7a62c8
Add "--add-opens java.base/java.lang=ALL-UNNAMED" to maven-surefire-p…
steinarb May 28, 2024
0624324
Add jacorb 3.9 as a maven dependency of mocrunner-ejb
steinarb May 28, 2024
45a772f
Merge pull request #86 from steinarb/java17-build-fixes
cemartins May 28, 2024
23470c3
Revert "Add note to the readme.md that development has moved to githu…
steinarb May 31, 2024
c16b0fe
Remove mention of java 8/9 from readme.
steinarb May 31, 2024
fe28dbb
Merge pull request #88 from steinarb/fix-readme
cemartins Jun 1, 2024
0db8345
Use default maven plugin versions
Jun 3, 2024
90f7c98
Build with java 17
Jun 3, 2024
f674a80
Revert "Build with java 17"
Jun 3, 2024
200c9bf
Build with java 8 and increased surefire memory args
Jun 3, 2024
663c804
Build with java 17 and increased surefire memory args
Jun 3, 2024
2ab2067
Update github actions versions
Jun 3, 2024
f39a9f0
More memory for surefire
Jun 3, 2024
fc29003
Even more memory for surefire
Jun 3, 2024
6b8243d
Less memory for surefire
Jun 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions .editorconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
9 changes: 5 additions & 4 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,11 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2
- name: Set up JDK 1.8
uses: actions/setup-java@v1
- uses: actions/checkout@v4
- name: Set up JDK 17
uses: actions/setup-java@v4
with:
java-version: 1.8
distribution: 'temurin'
java-version: 17
- name: Build with Maven
run: mvn -B package --file pom.xml
7 changes: 4 additions & 3 deletions .github/workflows/release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,13 @@ 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:
java-version: 1.8
distribution: 'temurin'
java-version: 17

- name: Setup GPG
env:
Expand Down
35 changes: 19 additions & 16 deletions mockrunner-all/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,7 @@
<parent>
<groupId>com.mockrunner</groupId>
<artifactId>mockrunner</artifactId>
<version>2.0.7-SNAPSHOT</version>
<relativePath>..</relativePath>
<version>2.0.8-SNAPSHOT</version>
</parent>

<artifactId>mockrunner-all</artifactId>
Expand All @@ -17,75 +16,75 @@
<dependency>
<groupId>com.mockrunner</groupId>
<artifactId>mockrunner-core</artifactId>
<version>2.0.7-SNAPSHOT</version>
<version>2.0.8-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.mockrunner</groupId>
<artifactId>mockrunner-jms</artifactId>
<version>2.0.7-SNAPSHOT</version>
<version>2.0.8-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.mockrunner</groupId>
<artifactId>mockrunner-jms</artifactId>
<version>2.0.7-SNAPSHOT</version>
<version>2.0.8-SNAPSHOT</version>
<classifier>tests</classifier>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.mockrunner</groupId>
<artifactId>mockrunner-ejb</artifactId>
<version>2.0.7-SNAPSHOT</version>
<version>2.0.8-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.mockrunner</groupId>
<artifactId>mockrunner-ejb</artifactId>
<version>2.0.7-SNAPSHOT</version>
<version>2.0.8-SNAPSHOT</version>
<classifier>tests</classifier>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.mockrunner</groupId>
<artifactId>mockrunner-jdbc</artifactId>
<version>2.0.7-SNAPSHOT</version>
<version>2.0.8-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.mockrunner</groupId>
<artifactId>mockrunner-jdbc</artifactId>
<version>2.0.7-SNAPSHOT</version>
<version>2.0.8-SNAPSHOT</version>
<classifier>tests</classifier>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.mockrunner</groupId>
<artifactId>mockrunner-jca</artifactId>
<version>2.0.7-SNAPSHOT</version>
<version>2.0.8-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.mockrunner</groupId>
<artifactId>mockrunner-servlet</artifactId>
<version>2.0.7-SNAPSHOT</version>
<version>2.0.8-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.mockrunner</groupId>
<artifactId>mockrunner-servlet</artifactId>
<version>2.0.7-SNAPSHOT</version>
<version>2.0.8-SNAPSHOT</version>
<classifier>tests</classifier>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.mockrunner</groupId>
<artifactId>mockrunner-tag</artifactId>
<version>2.0.7-SNAPSHOT</version>
<version>2.0.8-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.mockrunner</groupId>
<artifactId>mockrunner-struts</artifactId>
<version>2.0.7-SNAPSHOT</version>
<version>2.0.8-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.mockrunner</groupId>
<artifactId>mockrunner-struts</artifactId>
<version>2.0.7-SNAPSHOT</version>
<version>2.0.8-SNAPSHOT</version>
<classifier>tests</classifier>
<scope>test</scope>
</dependency>
Expand All @@ -105,6 +104,10 @@
<groupId>jboss</groupId>
<artifactId>jboss-j2ee</artifactId>
</dependency>
<dependency>
<groupId>org.jboss.spec.javax.rmi</groupId>
<artifactId>jboss-rmi-api_1.0_spec</artifactId>
</dependency>
</dependencies>
<build>
<plugins>
Expand Down Expand Up @@ -154,7 +157,7 @@
</plugin>
</plugins>
</build>

<profiles>
<profile>
<id>release-module-exclusives</id>
Expand Down
2 changes: 1 addition & 1 deletion mockrunner-all/src/main/java/com/mockrunner/base/HTMLOutputTestCase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
}
Expand Down
2 changes: 1 addition & 1 deletion mockrunner-all/src/main/java/com/mockrunner/example/ejb/LogAction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ public ActionForward execute(ActionMapping mapping,
{
InitialContext initialContext = new InitialContext();
Object home = initialContext.lookup("com/mockrunner/example/LogSession");
LogSessionHome logHome = (LogSessionHome)PortableRemoteObject.narrow(home, LogSessionHome.class);
LogSessionHome logHome = (LogSessionHome) PortableRemoteObject.narrow(home, LogSessionHome.class);
LogSession log = logHome.create();
log.logMessage(message);
log.remove();
Expand Down
2 changes: 1 addition & 1 deletion mockrunner-all/src/test/java/com/mockrunner/test/web/HTMLOutputModuleTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
7 changes: 3 additions & 4 deletions mockrunner-core/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,7 @@
<parent>
<groupId>com.mockrunner</groupId>
<artifactId>mockrunner</artifactId>
<version>2.0.7-SNAPSHOT</version>
<relativePath>..</relativePath>
<version>2.0.8-SNAPSHOT</version>
</parent>

<artifactId>mockrunner-core</artifactId>
Expand All @@ -31,8 +30,8 @@

<!-- needed for XML Util -->
<dependency>
<groupId>jdom</groupId>
<artifactId>jdom</artifactId>
<groupId>org.jdom</groupId>
<artifactId>jdom2</artifactId>
</dependency>

<!-- needed for StringUtil (Perl5Compiler) -->
Expand Down
4 changes: 2 additions & 2 deletions mockrunner-core/src/main/java/com/mockrunner/test/util/XmlUtilTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
20 changes: 10 additions & 10 deletions mockrunner-core/src/main/java/com/mockrunner/util/web/XmlUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -34,10 +34,10 @@ public class XmlUtil
* </pre>
*
* the method returns the h1 tag as <code>Element</code>.
* @param document the <code>org.jdom.Document</code>
* @param document the <code>org.jdom2.Document</code>
* @return the body <code>Element</code>
*/
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)
Expand All @@ -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 <code>org.jdom.Document</code>
* @param document the <code>org.jdom2.Document</code>
* @return the output as string
*/
public static String createStringFromJDOMDocument(org.jdom.Document document)
public static String createStringFromJDOMDocument(org.jdom2.Document document)
{
try
{
Expand All @@ -83,9 +83,9 @@ public static String createStringFromJDOMDocument(org.jdom.Document document)
* Creates a JDOM <code>Document</code> from a specified
* W3C <code>Document</code>.
* @param document the <code>org.w3c.dom.Document</code>
* @return the <code>org.jdom.Document</code>
* @return the <code>org.jdom2.Document</code>
*/
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);
}
Expand Down
33 changes: 30 additions & 3 deletions mockrunner-ejb/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,7 @@
<parent>
<groupId>com.mockrunner</groupId>
<artifactId>mockrunner</artifactId>
<version>2.0.7-SNAPSHOT</version>
<relativePath>..</relativePath>
<version>2.0.8-SNAPSHOT</version>
</parent>

<artifactId>mockrunner-ejb</artifactId>
Expand All @@ -30,12 +29,33 @@
<dependency>
<groupId>org.mockejb</groupId>
<artifactId>mockejb</artifactId>
<exclusions>
<exclusion>
<groupId>cglib</groupId>
<artifactId>cglib-full</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>cglib</groupId>
<artifactId>cglib-nodep</artifactId>
<version>3.3.0</version>
</dependency>
<dependency>
<groupId>org.jacorb</groupId>
<artifactId>jacorb</artifactId>
<version>3.9</version>
</dependency>
<dependency>
<groupId>jboss</groupId>
<artifactId>jboss-j2ee</artifactId>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.jboss.spec.javax.rmi</groupId>
<artifactId>jboss-rmi-api_1.0_spec</artifactId>
<scope>test</scope>
</dependency>
</dependencies>

<build>
Expand Down Expand Up @@ -76,9 +96,16 @@
<additionalOptions>-Xdoclint:none</additionalOptions>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<argLine>--add-opens java.base/java.lang=ALL-UNNAMED</argLine>
</configuration>
</plugin>
</plugins>
</build>

<profiles>
<profile>
<id>release-module-exclusives</id>
Expand Down
3 changes: 1 addition & 2 deletions mockrunner-jca/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,7 @@
<parent>
<groupId>com.mockrunner</groupId>
<artifactId>mockrunner</artifactId>
<version>2.0.7-SNAPSHOT</version>
<relativePath>..</relativePath>
<version>2.0.8-SNAPSHOT</version>
</parent>

<artifactId>mockrunner-jca</artifactId>
Expand Down
3 changes: 1 addition & 2 deletions mockrunner-jdbc/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,7 @@
<parent>
<groupId>com.mockrunner</groupId>
<artifactId>mockrunner</artifactId>
<version>2.0.7-SNAPSHOT</version>
<relativePath>..</relativePath>
<version>2.0.8-SNAPSHOT</version>
</parent>

<artifactId>mockrunner-jdbc</artifactId>
Expand Down
6 changes: 3 additions & 3 deletions mockrunner-jdbc/src/main/java/com/mockrunner/jdbc/XMLResultSetFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
6 changes: 3 additions & 3 deletions ...runner-jdbc/src/main/java/com/mockrunner/jdbc/XMLResultSetFactorySQLDeveloperSupport.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Loading
Loading