This is an automated email from the ASF dual-hosted git repository.
rzo1 pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomee.git
The following commit(s) were added to refs/heads/main by this push:
new f76f62bedc fix the Dependabot alerts in the examples and the
Arquillian modules
f76f62bedc is described below
commit f76f62bedce7dff7a5ba8163539c08a523ebda72
Author: Richard Zowalla <[email protected]>
AuthorDate: Sun Sep 20 19:43:45 2026 +0200
fix the Dependabot alerts in the examples and the Arquillian modules
Upgrades where a patched version exists:
json-smart 1.3.3 -> 2.5.2 (3 mp-rest-jwt examples)
htmlunit 2.x -> org.htmlunit 4.4.0
handlebars 1.2.1 -> 4.7.7 (webjar)
bootstrap 3.4.0 -> 3.4.1 (webjar)
httpclient 4.2.2/4.3.6 -> 4.5.14
json-smart 2.x moves net.minidev.asm into accessors-smart, so the two
Arquillian deployments that package net.minidev.json need that package as
well, or the container fails with a NoClassDefFoundError for FieldFilter.
htmlunit changed both its groupId and its package name in 3.0.0. Imports
move to org.htmlunit, asText() becomes asNormalizedText() and
closeAllWindows() becomes close().
The webjar version appears in the request paths as well as in the pom, so
config.js and index.jsp are updated along with the dependency. bootstrap
was already out of sync there and asked for 3.1.0.
The rest have no patched release and are migrated or dropped:
log4j 1.2.17 is replaced with Log4j 2 in javamail-velocity, whose code logs
through SLF4J. It had no binding at all before, so neither the dependency
nor log4j.xml did anything; log4j2.xml replaces it. The server ships
slf4j-jdk14 for Quartz, which would be a second binding on the test class
path, so it is excluded there. In arquillian-tomee-moviefun-example nothing
refers to org.apache.log4j and the jar is only copied into the test war,
so it is removed rather than replaced.
commons-lang 2.6 is only used by moviefun, for StringUtils.isEmpty, which
migrates to commons-lang3. The other five declare it without ever
referencing it.
commons-httpclient 3.1 is rewritten to HttpClient 4.5.14 in
SessionScopeTest.
Each iteration keeps a client of its own, since the test relies on a fresh
cookie store to land in a new session. The war never needed the jar that was
being copied into it, only the client side of the test did.
selenium-server 2.53.1 goes with MoviesSeleniumTest, which drives the
com.thoughtworks.selenium RC API that Selenium 3 removed and has been
@Ignore'd.
While in these poms, cdi-realm and moviefun-rest move from jakartaee-api,
openejb-core and tomee-embedded to the server and API BOMs (TOMEE-3564,
TOMEE-3619).
---
.../arquillian-tomee-moviefun-example/pom.xml | 91 +--------------
.../org/superbiz/moviefun/MoviesHtmlUnitTest.java | 4 +-
.../org/superbiz/moviefun/MoviesSeleniumTest.java | 130 ---------------------
.../src/test/resources/arquillian.xml | 6 -
arquillian/arquillian-tomee-remote/pom.xml | 33 +-----
.../arquillian/session/SessionScopeTest.java | 32 +++--
arquillian/arquillian-tomee-tests/pom.xml | 2 +-
examples/activemq-multiple-brokers/pom.xml | 5 -
examples/cdi-realm/pom.xml | 8 +-
examples/javamail-velocity/pom.xml | 20 +++-
.../src/test/resources/{log4j.xml => log4j2.xml} | 30 +++--
examples/moviefun-rest/pom.xml | 25 ++--
.../moviefun-rest/src/main/webapp/app/config.js | 4 +-
examples/moviefun-rest/src/main/webapp/index.jsp | 2 +-
examples/moviefun/pom.xml | 10 +-
.../java/org/superbiz/moviefun/ActionServlet.java | 2 +-
.../moviefun/MoviesArquillianHtmlUnitTest.java | 8 +-
.../org/superbiz/moviefun/MoviesHtmlUnitTest.java | 8 +-
.../mp-jwt-bean-validation-strongly-typed/pom.xml | 5 -
examples/mp-jwt-bean-validation/pom.xml | 5 -
examples/mp-rest-jwt-jwk/pom.xml | 2 +-
.../test/java/org/superbiz/rest/ProductsTest.java | 2 +-
examples/mp-rest-jwt-principal/pom.xml | 2 +-
.../test/java/org/superbiz/store/OrdersTest.java | 2 +-
examples/mp-rest-jwt-public-key/pom.xml | 7 +-
.../reload-persistence-unit-properties/pom.xml | 6 -
examples/rest-on-ejb/pom.xml | 6 -
examples/security-custom-identitystore/pom.xml | 4 +-
.../test/java/org/superbiz/security/MovieTest.java | 8 +-
.../simple-ear/moviefun-functional-tests/pom.xml | 9 +-
.../moviefun/DeployInWebAppsDirectoryTest.java | 8 +-
.../moviefun/MoviesArquillianHtmlUnitTest.java | 8 +-
examples/simple-ear/moviefun-webapp/pom.xml | 7 --
33 files changed, 102 insertions(+), 399 deletions(-)
diff --git a/arquillian/arquillian-tomee-moviefun-example/pom.xml
b/arquillian/arquillian-tomee-moviefun-example/pom.xml
index 2ca56c311f..550e4b2638 100644
--- a/arquillian/arquillian-tomee-moviefun-example/pom.xml
+++ b/arquillian/arquillian-tomee-moviefun-example/pom.xml
@@ -24,8 +24,6 @@
<name>TomEE :: Arquillian Adaptors Parent :: Sample :: Moviefun</name>
<properties>
- <version.selenium>2.53.1</version.selenium>
- <version.drone>1.3.1.Final</version.drone>
</properties>
<build>
@@ -73,11 +71,6 @@
<artifactId>jakarta.servlet.jsp.jstl-api</artifactId>
<version>3.0.2</version>
</artifactItem>
- <artifactItem>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>1.2.17</version>
- </artifactItem>
<artifactItem>
<groupId>org.apache.myfaces.core</groupId>
<artifactId>myfaces-api</artifactId>
@@ -149,82 +142,6 @@
<version>${version.arquillian}</version>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.jboss.arquillian.extension</groupId>
- <artifactId>arquillian-drone-selenium</artifactId>
- <version>${version.drone}</version>
- <scope>test</scope>
- <exclusions>
- <exclusion>
- <groupId>org.jboss.arquillian.core</groupId>
- <artifactId>arquillian-core-spi</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.jboss.arquillian.config</groupId>
- <artifactId>arquillian-config-api</artifactId>
- </exclusion>
- <exclusion>
- <artifactId>arquillian-test-spi</artifactId>
- <groupId>org.jboss.arquillian.test</groupId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.seleniumhq.selenium</groupId>
- <artifactId>selenium-server</artifactId>
- <version>${version.selenium}</version>
- <scope>test</scope>
- <exclusions>
- <exclusion>
- <artifactId>httpclient</artifactId>
- <groupId>org.apache.httpcomponents</groupId>
- </exclusion>
- <exclusion>
- <artifactId>selenium-api</artifactId>
- <groupId>org.seleniumhq.selenium</groupId>
- </exclusion>
- <exclusion>
- <artifactId>htmlunit</artifactId>
- <groupId>net.sourceforge.htmlunit</groupId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.seleniumhq.selenium</groupId>
- <artifactId>selenium-api</artifactId>
- <version>${version.selenium}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.arquillian.extension</groupId>
- <artifactId>arquillian-drone-impl</artifactId>
- <version>${version.drone}</version>
- <scope>test</scope>
- <exclusions>
- <exclusion>
- <groupId>org.jboss.shrinkwrap.descriptors</groupId>
- <artifactId>shrinkwrap-descriptors-api</artifactId>
- </exclusion>
- <exclusion>
- <artifactId>arquillian-core-spi</artifactId>
- <groupId>org.jboss.arquillian.core</groupId>
- </exclusion>
- <exclusion>
- <artifactId>arquillian-config-api</artifactId>
- <groupId>org.jboss.arquillian.config</groupId>
- </exclusion>
- <exclusion>
- <artifactId>arquillian-test-spi</artifactId>
- <groupId>org.jboss.arquillian.test</groupId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.jboss.arquillian.extension</groupId>
- <artifactId>arquillian-drone-selenium-server</artifactId>
- <version>${version.drone}</version>
- <scope>test</scope>
- </dependency>
<dependency>
<groupId>org.jboss.arquillian.core</groupId>
<artifactId>arquillian-core-impl-base</artifactId>
@@ -247,10 +164,6 @@
<artifactId>shrinkwrap-descriptors-api-base</artifactId>
<version>${version.shrinkwrap.descriptor}</version>
</dependency>
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- </dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>tomee-embedded</artifactId>
@@ -259,9 +172,9 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>net.sourceforge.htmlunit</groupId>
+ <groupId>org.htmlunit</groupId>
<artifactId>htmlunit</artifactId>
- <version>2.70.0</version>
+ <version>4.4.0</version>
<type>jar</type>
<scope>test</scope>
</dependency>
diff --git
a/arquillian/arquillian-tomee-moviefun-example/src/test/java/org/superbiz/moviefun/MoviesHtmlUnitTest.java
b/arquillian/arquillian-tomee-moviefun-example/src/test/java/org/superbiz/moviefun/MoviesHtmlUnitTest.java
index 811f17130d..64d536f7dc 100644
---
a/arquillian/arquillian-tomee-moviefun-example/src/test/java/org/superbiz/moviefun/MoviesHtmlUnitTest.java
+++
b/arquillian/arquillian-tomee-moviefun-example/src/test/java/org/superbiz/moviefun/MoviesHtmlUnitTest.java
@@ -16,8 +16,8 @@
*/
package org.superbiz.moviefun;
-import com.gargoylesoftware.htmlunit.WebClient;
-import com.gargoylesoftware.htmlunit.html.HtmlPage;
+import org.htmlunit.WebClient;
+import org.htmlunit.html.HtmlPage;
import org.apache.commons.io.FileUtils;
import org.apache.tomee.embedded.EmbeddedTomEEContainer;
import org.junit.AfterClass;
diff --git
a/arquillian/arquillian-tomee-moviefun-example/src/test/java/org/superbiz/moviefun/MoviesSeleniumTest.java
b/arquillian/arquillian-tomee-moviefun-example/src/test/java/org/superbiz/moviefun/MoviesSeleniumTest.java
deleted file mode 100644
index d27cb03b7a..0000000000
---
a/arquillian/arquillian-tomee-moviefun-example/src/test/java/org/superbiz/moviefun/MoviesSeleniumTest.java
+++ /dev/null
@@ -1,130 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.superbiz.moviefun;
-
-import java.io.File;
-import java.net.URL;
-
-import org.junit.Assert;
-
-import org.jboss.arquillian.container.test.api.Deployment;
-import org.jboss.arquillian.drone.api.annotation.Drone;
-import org.jboss.arquillian.junit.Arquillian;
-import org.jboss.arquillian.test.api.ArquillianResource;
-import org.jboss.shrinkwrap.api.ShrinkWrap;
-import org.jboss.shrinkwrap.api.asset.ClassLoaderAsset;
-import org.jboss.shrinkwrap.api.asset.FileAsset;
-import org.jboss.shrinkwrap.api.spec.WebArchive;
-import org.junit.Ignore;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.superbiz.moviefun.setup.ExampleDataProducer;
-import org.superbiz.moviefun.setup.Examples;
-import org.superbiz.moviefun.setup.Setup;
-import org.superbiz.moviefun.util.JsfUtil;
-import org.superbiz.moviefun.util.PaginationHelper;
-
-import com.thoughtworks.selenium.DefaultSelenium;
-
-@RunWith(Arquillian.class)
-@Ignore
-public class MoviesSeleniumTest {
-
- @ArquillianResource
- private URL deploymentUrl;
-
- @Drone
- private DefaultSelenium driver;
-
- @Deployment(testable = false)
- public static WebArchive createDeployment() {
- WebArchive archive = ShrinkWrap.create(WebArchive.class,
"moviefun.war")
- .addClasses(ActionServlet.class, SetupServlet.class,
Movie.class, MovieController.class, Movies.class, MoviesImpl.class,
MoviesRemote.class, JsfUtil.class, PaginationHelper.class,
ExampleDataProducer.class, Examples.class, Setup.class)
- .addAsResource(new
ClassLoaderAsset("META-INF/ejb-jar.xml") , "META-INF/ejb-jar.xml")
- .addAsResource(new
ClassLoaderAsset("META-INF/persistence.xml") , "META-INF/persistence.xml")
- .addAsLibraries(new
File("target/test-libs/commons-beanutils.jar"),
- new
File("target/test-libs/commons-codec.jar"),
- new
File("target/test-libs/commons-collections.jar"),
- new
File("target/test-libs/commons-digester.jar"),
- new
File("target/test-libs/commons-logging.jar"),
- new File("target/test-libs/jstl.jar"),
- new File("target/test-libs/log4j.jar"),
- new
File("target/test-libs/standard.jar"));
-
- addResources("src/main/webapp", "", archive);
- System.out.println(archive.toString(true));
- return archive;
- }
-
- private static void addResources(String source, String target, WebArchive
archive) {
- File sourceFile = new File(source);
- if (! sourceFile.exists()) return;
- if (sourceFile.isFile()) {
- archive.add(new FileAsset(sourceFile), target);
- }
-
- if (sourceFile.isDirectory()) {
- final File[] files = sourceFile.listFiles();
- if (files != null) {
- for (File file : files) {
- if (file.getName().startsWith(".")) continue;
- addResources(source + File.separator + file.getName(),
target + File.separator + file.getName(), archive);
- }
- }
- }
- }
-
- @Test
- public void testShouldMakeSureWebappIsWorking() throws Exception {
- driver.open(deploymentUrl.toString());
- driver.click("link=Setup");
- driver.waitForPageToLoad("30000");
- Assert.assertTrue(driver.isTextPresent("Seeded Database with
the Following movies"));
- Assert.assertTrue(driver.isTextPresent("Wedding Crashers"));
- Assert.assertTrue(driver.isTextPresent("David Dobkin"));
- Assert.assertTrue(driver.isTextPresent("Comedy"));
- Assert.assertTrue(driver.isTextPresent("Starsky & Hutch"));
- Assert.assertTrue(driver.isTextPresent("Shanghai Knights"));
- Assert.assertTrue(driver.isTextPresent("I-Spy"));
- Assert.assertTrue(driver.isTextPresent("The Royal Tenenbaums"));
- Assert.assertTrue(driver.isTextPresent("Zoolander"));
- Assert.assertTrue(driver.isTextPresent("Shanghai Noon"));
- driver.click("link=Go to main app");
- driver.waitForPageToLoad("30000");
- driver.type("name=title", "Bad Boys");
- driver.type("name=director", "Michael Bay");
- driver.type("name=genre", "Action");
- driver.type("name=rating", "9");
- driver.type("name=year", "1995");
- driver.click("//input[@name='action' and @value='Add']");
- driver.waitForPageToLoad("30000");
- driver.click("css=input[name=\"action\"]");
- driver.waitForPageToLoad("30000");
- Assert.assertTrue(driver.isTextPresent("Bad Boys"));
- driver.select("name=action", "label=Genre");
- driver.type("name=key", "Comedy");
- driver.click("css=input[type=\"submit\"]");
- driver.waitForPageToLoad("30000");
- Assert.assertTrue(driver.isTextPresent("Wedding Crashers"));
- Assert.assertTrue(driver.isTextPresent("The Royal Tenenbaums"));
- Assert.assertTrue(driver.isTextPresent("Zoolander"));
- Assert.assertTrue(driver.isTextPresent("Shanghai Noon"));
- Assert.assertTrue(driver.isTextPresent("1 - 4 of 4"));
- driver.close();
- }
-
-}
diff --git
a/arquillian/arquillian-tomee-moviefun-example/src/test/resources/arquillian.xml
b/arquillian/arquillian-tomee-moviefun-example/src/test/resources/arquillian.xml
index 31635f449d..7b5a05ce94 100644
---
a/arquillian/arquillian-tomee-moviefun-example/src/test/resources/arquillian.xml
+++
b/arquillian/arquillian-tomee-moviefun-example/src/test/resources/arquillian.xml
@@ -30,10 +30,4 @@
<property
name="appWorkingDir">target/arquillian-test-working-dir</property>
</configuration>
</container>
-
- <extension qualifier="selenium-server">
- <configuration>
- <property name="enable">true</property>
- </configuration>
- </extension>
</arquillian>
\ No newline at end of file
diff --git a/arquillian/arquillian-tomee-remote/pom.xml
b/arquillian/arquillian-tomee-remote/pom.xml
index d47efa2a07..895b51d1ec 100644
--- a/arquillian/arquillian-tomee-remote/pom.xml
+++ b/arquillian/arquillian-tomee-remote/pom.xml
@@ -161,9 +161,9 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>commons-httpclient</groupId>
- <artifactId>commons-httpclient</artifactId>
- <version>3.1</version>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpclient</artifactId>
+ <version>4.5.14</version>
<scope>test</scope>
</dependency>
@@ -207,33 +207,6 @@
</testResource>
</testResources>
<plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-dependency-plugin</artifactId>
- <version>3.11.0</version>
- <executions>
- <execution>
- <id>copy-test-libs</id>
- <phase>process-test-resources</phase>
- <configuration>
- <artifactItems>
- <artifactItem>
- <groupId>commons-httpclient</groupId>
- <artifactId>commons-httpclient</artifactId>
- <version>3.1</version>
- </artifactItem>
- </artifactItems>
- <outputDirectory>
- ${project.build.directory}/test-libs
- </outputDirectory>
- <stripVersion>true</stripVersion>
- </configuration>
- <goals>
- <goal>copy</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
diff --git
a/arquillian/arquillian-tomee-remote/src/test/java/org/apache/openejb/arquillian/session/SessionScopeTest.java
b/arquillian/arquillian-tomee-remote/src/test/java/org/apache/openejb/arquillian/session/SessionScopeTest.java
index 8095f6d56c..e4949b885c 100644
---
a/arquillian/arquillian-tomee-remote/src/test/java/org/apache/openejb/arquillian/session/SessionScopeTest.java
+++
b/arquillian/arquillian-tomee-remote/src/test/java/org/apache/openejb/arquillian/session/SessionScopeTest.java
@@ -18,9 +18,11 @@
package org.apache.openejb.arquillian.session;
import java.net.URL;
-import org.apache.commons.httpclient.HttpClient;
-import org.apache.commons.httpclient.HttpMethod;
-import org.apache.commons.httpclient.methods.GetMethod;
+import org.apache.http.client.methods.CloseableHttpResponse;
+import org.apache.http.client.methods.HttpGet;
+import org.apache.http.impl.client.CloseableHttpClient;
+import org.apache.http.impl.client.HttpClients;
+import org.apache.http.util.EntityUtils;
import org.jboss.arquillian.container.test.api.Deployment;
import org.jboss.arquillian.junit.Arquillian;
import org.jboss.arquillian.test.api.ArquillianResource;
@@ -34,8 +36,6 @@ import
org.jboss.shrinkwrap.descriptor.api.webapp30.WebAppDescriptor;
import org.junit.Test;
import org.junit.runner.RunWith;
-import java.io.File;
-
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotSame;
@@ -48,7 +48,6 @@ public class SessionScopeTest {
public static WebArchive createDeployment() {
return ShrinkWrap.create(WebArchive.class, "SessionScopeTest.war")
.addClass(PojoSessionScoped.class).addClass(PojoSessionScopedServletWrapper.class)
- .addAsLibraries(new
File("target/test-libs/commons-httpclient.jar"))
.addAsWebInfResource(EmptyAsset.INSTANCE,
ArchivePaths.create("beans.xml"))
.setWebXML(new
StringAsset(Descriptors.create(WebAppDescriptor.class)
.version("3.0")
@@ -63,23 +62,22 @@ public class SessionScopeTest {
String[] sessionResult = new String[2];
for (int i = 0; i < sessionResult.length; i++) {
- HttpClient client = new HttpClient();
- HttpMethod get = new GetMethod(sessionUrl);
- String[] contents = new String[2];
- try {
+ // a client of its own, so that each iteration starts with an
empty cookie store
+ try (CloseableHttpClient client = HttpClients.createDefault()) {
+ String[] contents = new String[2];
for (int j = 0; j < contents.length; j++) {
- int out = client.executeMethod(get);
- if (out != 200) {
- throw new RuntimeException("get " + sessionUrl + "
returned " + out);
+ try (CloseableHttpResponse response = client.execute(new
HttpGet(sessionUrl))) {
+ final int out =
response.getStatusLine().getStatusCode();
+ if (out != 200) {
+ throw new RuntimeException("get " + sessionUrl + "
returned " + out);
+ }
+ contents[j] =
EntityUtils.toString(response.getEntity());
}
- contents[j] = get.getResponseBodyAsString();
}
assertEquals(contents[0], contents[1]);
- } finally {
- get.releaseConnection();
+ sessionResult[i] = contents[0];
}
- sessionResult[i] = contents[0];
}
assertNotSame(sessionResult[0], sessionResult[1]);
diff --git a/arquillian/arquillian-tomee-tests/pom.xml
b/arquillian/arquillian-tomee-tests/pom.xml
index 1ba762624e..53f82baa5b 100644
--- a/arquillian/arquillian-tomee-tests/pom.xml
+++ b/arquillian/arquillian-tomee-tests/pom.xml
@@ -86,7 +86,7 @@
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
- <version>4.2.2</version>
+ <version>4.5.14</version>
</dependency>
<dependency>
diff --git a/examples/activemq-multiple-brokers/pom.xml
b/examples/activemq-multiple-brokers/pom.xml
index e778ff1f2a..a16aab113d 100644
--- a/examples/activemq-multiple-brokers/pom.xml
+++ b/examples/activemq-multiple-brokers/pom.xml
@@ -115,11 +115,6 @@
<version>${tomee.version}</version>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- <version>2.6</version>
- </dependency>
<dependency>
<groupId>org.jboss.arquillian.junit</groupId>
<artifactId>arquillian-junit-container</artifactId>
diff --git a/examples/cdi-realm/pom.xml b/examples/cdi-realm/pom.xml
index a4b1a437c9..c7c0bc8559 100644
--- a/examples/cdi-realm/pom.xml
+++ b/examples/cdi-realm/pom.xml
@@ -65,9 +65,9 @@
</repositories>
<dependencies>
<dependency>
- <groupId>org.apache.tomee</groupId>
- <artifactId>jakartaee-api</artifactId>
- <version>11.0.0-M1</version>
+ <groupId>org.apache.tomee.bom</groupId>
+ <artifactId>tomee-plus-api</artifactId>
+ <version>${tomee.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
@@ -91,7 +91,7 @@
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
- <version>4.3.6</version>
+ <version>4.5.14</version>
<scope>test</scope>
</dependency>
</dependencies>
diff --git a/examples/javamail-velocity/pom.xml
b/examples/javamail-velocity/pom.xml
index ab31848de1..afa02e963a 100644
--- a/examples/javamail-velocity/pom.xml
+++ b/examples/javamail-velocity/pom.xml
@@ -25,6 +25,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<tomee.version>11.0.0-SNAPSHOT</tomee.version>
+ <version.log4j2>2.26.1</version.log4j2>
</properties>
<build>
<defaultGoal>install</defaultGoal>
@@ -94,9 +95,15 @@
<version>2.0.17</version>
</dependency>
<dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>1.2.17</version>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-slf4j2-impl</artifactId>
+ <version>${version.log4j2}</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-core</artifactId>
+ <version>${version.log4j2}</version>
<scope>runtime</scope>
</dependency>
<!-- test -->
@@ -117,6 +124,13 @@
<artifactId>tomee-plus</artifactId>
<version>${tomee.version}</version>
<scope>test</scope>
+ <exclusions>
+ <!-- the server ships the JUL binding for Quartz; this example binds
SLF4J to Log4j 2 -->
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-jdk14</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.tomee</groupId>
diff --git a/examples/javamail-velocity/src/test/resources/log4j.xml
b/examples/javamail-velocity/src/test/resources/log4j2.xml
similarity index 56%
rename from examples/javamail-velocity/src/test/resources/log4j.xml
rename to examples/javamail-velocity/src/test/resources/log4j2.xml
index 24ec87ca37..923c5a7aee 100644
--- a/examples/javamail-velocity/src/test/resources/log4j.xml
+++ b/examples/javamail-velocity/src/test/resources/log4j2.xml
@@ -16,24 +16,20 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<!DOCTYPE log4j:configuration SYSTEM
"http://logging.apache.org/log4j/1.2/apidocs/org/apache/log4j/xml/doc-files/log4j.dtd";>
-<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/";>
+<Configuration status="WARN">
- <appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender">
- <layout class="org.apache.log4j.PatternLayout">
- <param name="ConversionPattern"
- value="%d{ISO8601} %-5p [%t] %c{1}(%L): %m%n"/>
- </layout>
- </appender>
+ <Appenders>
+ <Console name="CONSOLE" target="SYSTEM_OUT">
+ <PatternLayout pattern="%d{ISO8601} %-5p [%t] %c{1}(%L): %m%n"/>
+ </Console>
+ </Appenders>
- <logger name="org.superbiz">
- <level value="INFO"/>
- </logger>
+ <Loggers>
+ <Logger name="org.superbiz" level="INFO"/>
+ <Root level="DEBUG">
+ <AppenderRef ref="CONSOLE"/>
+ </Root>
+ </Loggers>
- <root>
- <level value="DEBUG"/>
- <appender-ref ref="CONSOLE"/>
- </root>
-
-</log4j:configuration>
\ No newline at end of file
+</Configuration>
diff --git a/examples/moviefun-rest/pom.xml b/examples/moviefun-rest/pom.xml
index a371b97370..98fc2e22bb 100644
--- a/examples/moviefun-rest/pom.xml
+++ b/examples/moviefun-rest/pom.xml
@@ -132,9 +132,9 @@
</dependencyManagement>
<dependencies>
<dependency>
- <groupId>org.apache.tomee</groupId>
- <artifactId>jakartaee-api</artifactId>
- <version>11.0.0-M1</version>
+ <groupId>org.apache.tomee.bom</groupId>
+ <artifactId>tomee-plus-api</artifactId>
+ <version>${tomee.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
@@ -150,22 +150,11 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.tomee</groupId>
- <artifactId>openejb-core</artifactId>
- <version>${tomee.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.tomee</groupId>
- <artifactId>tomee-embedded</artifactId>
+ <groupId>org.apache.tomee.bom</groupId>
+ <artifactId>tomee-plus</artifactId>
<version>${tomee.version}</version>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- <version>2.6</version>
- </dependency>
<dependency>
<groupId>org.jboss.arquillian.junit</groupId>
<artifactId>arquillian-junit-container</artifactId>
@@ -191,12 +180,12 @@
<dependency>
<groupId>org.webjars</groupId>
<artifactId>bootstrap</artifactId>
- <version>3.4.0</version>
+ <version>3.4.1</version>
</dependency>
<dependency>
<groupId>org.webjars</groupId>
<artifactId>handlebars</artifactId>
- <version>1.2.1</version>
+ <version>4.7.7</version>
</dependency>
<dependency>
<groupId>org.webjars</groupId>
diff --git a/examples/moviefun-rest/src/main/webapp/app/config.js
b/examples/moviefun-rest/src/main/webapp/app/config.js
index bbdc5e1e33..e8128db905 100644
--- a/examples/moviefun-rest/src/main/webapp/app/config.js
+++ b/examples/moviefun-rest/src/main/webapp/app/config.js
@@ -22,8 +22,8 @@ var APP_CONFIG = {
'text': 'webjars/requirejs-text/2.0.10/text',
'lib/less': 'webjars/less/1.6.0/less.min',
'lib/jquery': 'webjars/jquery/2.1.0/jquery.min',
- 'lib/bootstrap': 'webjars/bootstrap/3.1.0/js/bootstrap.min',
- 'lib/handlebars': 'webjars/handlebars/1.2.1/handlebars.min',
+ 'lib/bootstrap': 'webjars/bootstrap/3.4.1/js/bootstrap.min',
+ 'lib/handlebars': 'webjars/handlebars/4.7.7/handlebars.min',
'lib/underscore': 'webjars/underscorejs/1.4.3/underscore-min',
'lib/json2': 'webjars/json2/20110223/json2.min',
'lib/backbone': 'webjars/backbonejs/1.0.0/backbone'
diff --git a/examples/moviefun-rest/src/main/webapp/index.jsp
b/examples/moviefun-rest/src/main/webapp/index.jsp
index 63d3e42fe9..cadebbfc98 100644
--- a/examples/moviefun-rest/src/main/webapp/index.jsp
+++ b/examples/moviefun-rest/src/main/webapp/index.jsp
@@ -21,7 +21,7 @@ limitations under the License.
<head>
<meta charset="utf-8">
<title>Moviefun</title>
- <link href="<c:url value='/webjars/bootstrap/3.1.0/css/bootstrap.min.css'/>"
rel="stylesheet">
+ <link href="<c:url value='/webjars/bootstrap/3.4.1/css/bootstrap.min.css'/>"
rel="stylesheet">
<link href="<c:url value='/app/app.less'/>" rel="stylesheet/less"
type="text/css">
<script src="<c:url
value='/webjars/requirejs/2.1.10/require.min.js'/>"></script>
<script type="text/javascript">
diff --git a/examples/moviefun/pom.xml b/examples/moviefun/pom.xml
index e566d922b3..bd721592b5 100644
--- a/examples/moviefun/pom.xml
+++ b/examples/moviefun/pom.xml
@@ -156,9 +156,9 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>net.sourceforge.htmlunit</groupId>
+ <groupId>org.htmlunit</groupId>
<artifactId>htmlunit</artifactId>
- <version>2.8</version>
+ <version>4.4.0</version>
<type>jar</type>
<scope>test</scope>
</dependency>
@@ -170,9 +170,9 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- <version>2.6</version>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-lang3</artifactId>
+ <version>3.20.0</version>
</dependency>
<dependency>
<groupId>org.jboss.arquillian.junit</groupId>
diff --git
a/examples/moviefun/src/main/java/org/superbiz/moviefun/ActionServlet.java
b/examples/moviefun/src/main/java/org/superbiz/moviefun/ActionServlet.java
index fa5d85081a..6873c55a9d 100644
--- a/examples/moviefun/src/main/java/org/superbiz/moviefun/ActionServlet.java
+++ b/examples/moviefun/src/main/java/org/superbiz/moviefun/ActionServlet.java
@@ -16,7 +16,7 @@
*/
package org.superbiz.moviefun;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import jakarta.ejb.EJB;
import jakarta.servlet.ServletException;
diff --git
a/examples/moviefun/src/test/java/org/superbiz/moviefun/MoviesArquillianHtmlUnitTest.java
b/examples/moviefun/src/test/java/org/superbiz/moviefun/MoviesArquillianHtmlUnitTest.java
index f955fbfd4f..9db8616103 100644
---
a/examples/moviefun/src/test/java/org/superbiz/moviefun/MoviesArquillianHtmlUnitTest.java
+++
b/examples/moviefun/src/test/java/org/superbiz/moviefun/MoviesArquillianHtmlUnitTest.java
@@ -16,8 +16,8 @@
*/
package org.superbiz.moviefun;
-import com.gargoylesoftware.htmlunit.WebClient;
-import com.gargoylesoftware.htmlunit.html.HtmlPage;
+import org.htmlunit.WebClient;
+import org.htmlunit.html.HtmlPage;
import org.jboss.arquillian.container.test.api.Deployment;
import org.jboss.arquillian.junit.Arquillian;
import org.jboss.arquillian.test.api.ArquillianResource;
@@ -77,11 +77,11 @@ public class MoviesArquillianHtmlUnitTest {
page = webClient.getPage(deploymentUrl + "/moviefun");
assertMoviesPresent(page);
- webClient.closeAllWindows();
+ webClient.close();
}
private void assertMoviesPresent(HtmlPage page) {
- String pageAsText = page.asText();
+ String pageAsText = page.asNormalizedText();
assertTrue(pageAsText.contains("Wedding Crashers"));
assertTrue(pageAsText.contains("Starsky & Hutch"));
assertTrue(pageAsText.contains("Shanghai Knights"));
diff --git
a/examples/moviefun/src/test/java/org/superbiz/moviefun/MoviesHtmlUnitTest.java
b/examples/moviefun/src/test/java/org/superbiz/moviefun/MoviesHtmlUnitTest.java
index dcc3ba0f45..0a47da60ec 100644
---
a/examples/moviefun/src/test/java/org/superbiz/moviefun/MoviesHtmlUnitTest.java
+++
b/examples/moviefun/src/test/java/org/superbiz/moviefun/MoviesHtmlUnitTest.java
@@ -16,8 +16,8 @@
*/
package org.superbiz.moviefun;
-import com.gargoylesoftware.htmlunit.WebClient;
-import com.gargoylesoftware.htmlunit.html.HtmlPage;
+import org.htmlunit.WebClient;
+import org.htmlunit.html.HtmlPage;
import org.apache.commons.io.FileUtils;
import org.apache.tomee.embedded.EmbeddedTomEEContainer;
import org.apache.ziplock.Archive;
@@ -89,11 +89,11 @@ public class MoviesHtmlUnitTest {
page = webClient.getPage("http://localhost:"; + port +
"/moviefun/moviefun");
assertMoviesPresent(page);
- webClient.closeAllWindows();
+ webClient.close();
}
private void assertMoviesPresent(HtmlPage page) {
- String pageAsText = page.asText();
+ String pageAsText = page.asNormalizedText();
assertTrue(pageAsText.contains("Wedding Crashers"));
assertTrue(pageAsText.contains("Starsky & Hutch"));
assertTrue(pageAsText.contains("Shanghai Knights"));
diff --git a/examples/mp-jwt-bean-validation-strongly-typed/pom.xml
b/examples/mp-jwt-bean-validation-strongly-typed/pom.xml
index fa2e701ecc..c1bd030a17 100644
--- a/examples/mp-jwt-bean-validation-strongly-typed/pom.xml
+++ b/examples/mp-jwt-bean-validation-strongly-typed/pom.xml
@@ -135,11 +135,6 @@
<version>${tomee.version}</version>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- <version>2.6</version>
- </dependency>
<dependency>
<groupId>org.jboss.arquillian.junit</groupId>
<artifactId>arquillian-junit-container</artifactId>
diff --git a/examples/mp-jwt-bean-validation/pom.xml
b/examples/mp-jwt-bean-validation/pom.xml
index b6585c97e4..29e0d2b172 100644
--- a/examples/mp-jwt-bean-validation/pom.xml
+++ b/examples/mp-jwt-bean-validation/pom.xml
@@ -135,11 +135,6 @@
<version>${tomee.version}</version>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- <version>2.6</version>
- </dependency>
<dependency>
<groupId>org.jboss.arquillian.junit</groupId>
<artifactId>arquillian-junit-container</artifactId>
diff --git a/examples/mp-rest-jwt-jwk/pom.xml b/examples/mp-rest-jwt-jwk/pom.xml
index e4c8a681dd..d82a61effc 100644
--- a/examples/mp-rest-jwt-jwk/pom.xml
+++ b/examples/mp-rest-jwt-jwk/pom.xml
@@ -108,7 +108,7 @@
<dependency>
<groupId>net.minidev</groupId>
<artifactId>json-smart</artifactId>
- <version>1.3.3</version>
+ <version>2.5.2</version>
<scope>test</scope>
</dependency>
<dependency>
diff --git
a/examples/mp-rest-jwt-jwk/src/test/java/org/superbiz/rest/ProductsTest.java
b/examples/mp-rest-jwt-jwk/src/test/java/org/superbiz/rest/ProductsTest.java
index b1d35b09aa..82cfabb985 100644
--- a/examples/mp-rest-jwt-jwk/src/test/java/org/superbiz/rest/ProductsTest.java
+++ b/examples/mp-rest-jwt-jwk/src/test/java/org/superbiz/rest/ProductsTest.java
@@ -48,7 +48,7 @@ public class ProductsTest {
.addClasses(Product.class)
.addClass(ProductService.class)
.addClasses(ProductRestClient.class, TokenUtils.class)
- .addPackages(true, "com.nimbusds", "net.minidev.json")
+ .addPackages(true, "com.nimbusds", "net.minidev.json",
"net.minidev.asm")
.addAsWebInfResource(new StringAsset("<beans/>"), "beans.xml")
.addAsResource("META-INF/microprofile-config.properties")
.addAsResource("jwt-john.json")
diff --git a/examples/mp-rest-jwt-principal/pom.xml
b/examples/mp-rest-jwt-principal/pom.xml
index 7def160c94..cadc4db8f1 100644
--- a/examples/mp-rest-jwt-principal/pom.xml
+++ b/examples/mp-rest-jwt-principal/pom.xml
@@ -99,7 +99,7 @@
<dependency>
<groupId>net.minidev</groupId>
<artifactId>json-smart</artifactId>
- <version>1.3.3</version>
+ <version>2.5.2</version>
<scope>test</scope>
</dependency>
<dependency>
diff --git
a/examples/mp-rest-jwt-principal/src/test/java/org/superbiz/store/OrdersTest.java
b/examples/mp-rest-jwt-principal/src/test/java/org/superbiz/store/OrdersTest.java
index fb20a69c5a..4ba8cce0c2 100644
---
a/examples/mp-rest-jwt-principal/src/test/java/org/superbiz/store/OrdersTest.java
+++
b/examples/mp-rest-jwt-principal/src/test/java/org/superbiz/store/OrdersTest.java
@@ -56,7 +56,7 @@ public class OrdersTest {
.addClasses(Order.class, Product.class)
.addClass(OrderService.class)
.addClasses(OrderRestClient.class, TokenUtils.class)
- .addPackages(true, "com.nimbusds", "net.minidev.json")
+ .addPackages(true, "com.nimbusds", "net.minidev.json",
"net.minidev.asm")
.addAsWebInfResource(new StringAsset("<beans/>"), "beans.xml")
.addAsResource("META-INF/microprofile-config.properties")
.addAsResource("john-doe-jwt.json")
diff --git a/examples/mp-rest-jwt-public-key/pom.xml
b/examples/mp-rest-jwt-public-key/pom.xml
index 7833e24e19..42343f9f02 100644
--- a/examples/mp-rest-jwt-public-key/pom.xml
+++ b/examples/mp-rest-jwt-public-key/pom.xml
@@ -125,7 +125,7 @@
<dependency>
<groupId>net.minidev</groupId>
<artifactId>json-smart</artifactId>
- <version>1.3.3</version>
+ <version>2.5.2</version>
<scope>test</scope>
</dependency>
@@ -146,11 +146,6 @@
<version>${tomee.version}</version>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- <version>2.6</version>
- </dependency>
<dependency>
<groupId>org.jboss.arquillian.junit</groupId>
<artifactId>arquillian-junit-container</artifactId>
diff --git a/examples/reload-persistence-unit-properties/pom.xml
b/examples/reload-persistence-unit-properties/pom.xml
index cff229e1a9..58ecba0cbf 100644
--- a/examples/reload-persistence-unit-properties/pom.xml
+++ b/examples/reload-persistence-unit-properties/pom.xml
@@ -81,12 +81,6 @@
<version>11.0.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>1.2.17</version>
- <scope>test</scope>
- </dependency>
</dependencies>
<!--
This section allows you to configure where to publish libraries for sharing.
diff --git a/examples/rest-on-ejb/pom.xml b/examples/rest-on-ejb/pom.xml
index a1162b3fcf..d52c0afa7f 100644
--- a/examples/rest-on-ejb/pom.xml
+++ b/examples/rest-on-ejb/pom.xml
@@ -88,12 +88,6 @@
<version>${tomee.version}</version>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>commons-httpclient</groupId>
- <artifactId>commons-httpclient</artifactId>
- <version>3.1</version>
- <scope>test</scope>
- </dependency>
</dependencies>
<!--
This section allows you to configure where to publish libraries for sharing.
diff --git a/examples/security-custom-identitystore/pom.xml
b/examples/security-custom-identitystore/pom.xml
index 312ad40e94..1907d17955 100644
--- a/examples/security-custom-identitystore/pom.xml
+++ b/examples/security-custom-identitystore/pom.xml
@@ -43,9 +43,9 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>net.sourceforge.htmlunit</groupId>
+ <groupId>org.htmlunit</groupId>
<artifactId>htmlunit</artifactId>
- <version>2.50.0</version>
+ <version>4.4.0</version>
<scope>test</scope>
</dependency>
</dependencies>
diff --git
a/examples/security-custom-identitystore/src/test/java/org/superbiz/security/MovieTest.java
b/examples/security-custom-identitystore/src/test/java/org/superbiz/security/MovieTest.java
index 5d79b88d72..f34c5c8dee 100644
---
a/examples/security-custom-identitystore/src/test/java/org/superbiz/security/MovieTest.java
+++
b/examples/security-custom-identitystore/src/test/java/org/superbiz/security/MovieTest.java
@@ -16,10 +16,10 @@
*/
package org.superbiz.security;
-import com.gargoylesoftware.htmlunit.DefaultCredentialsProvider;
-import com.gargoylesoftware.htmlunit.FailingHttpStatusCodeException;
-import com.gargoylesoftware.htmlunit.WebClient;
-import com.gargoylesoftware.htmlunit.html.HtmlPage;
+import org.htmlunit.DefaultCredentialsProvider;
+import org.htmlunit.FailingHttpStatusCodeException;
+import org.htmlunit.WebClient;
+import org.htmlunit.html.HtmlPage;
import org.apache.tomee.bootstrap.Archive;
import org.apache.tomee.bootstrap.Server;
import org.junit.Assert;
diff --git a/examples/simple-ear/moviefun-functional-tests/pom.xml
b/examples/simple-ear/moviefun-functional-tests/pom.xml
index 138ad40147..25ed634b0a 100644
--- a/examples/simple-ear/moviefun-functional-tests/pom.xml
+++ b/examples/simple-ear/moviefun-functional-tests/pom.xml
@@ -90,9 +90,9 @@
<version>11.0.0-SNAPSHOT</version>
</dependency>
<dependency>
- <groupId>net.sourceforge.htmlunit</groupId>
+ <groupId>org.htmlunit</groupId>
<artifactId>htmlunit</artifactId>
- <version>2.8</version>
+ <version>4.4.0</version>
<type>jar</type>
<scope>test</scope>
</dependency>
@@ -103,11 +103,6 @@
<!--<classifier>uber</classifier> -->
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- <version>2.6</version>
- </dependency>
<dependency>
<groupId>org.jboss.arquillian.junit</groupId>
<artifactId>arquillian-junit-container</artifactId>
diff --git
a/examples/simple-ear/moviefun-functional-tests/src/test/java/org/superbiz/moviefun/DeployInWebAppsDirectoryTest.java
b/examples/simple-ear/moviefun-functional-tests/src/test/java/org/superbiz/moviefun/DeployInWebAppsDirectoryTest.java
index 34069e1379..8c51c307d0 100644
---
a/examples/simple-ear/moviefun-functional-tests/src/test/java/org/superbiz/moviefun/DeployInWebAppsDirectoryTest.java
+++
b/examples/simple-ear/moviefun-functional-tests/src/test/java/org/superbiz/moviefun/DeployInWebAppsDirectoryTest.java
@@ -16,8 +16,8 @@
*/
package org.superbiz.moviefun;
-import com.gargoylesoftware.htmlunit.WebClient;
-import com.gargoylesoftware.htmlunit.html.HtmlPage;
+import org.htmlunit.WebClient;
+import org.htmlunit.html.HtmlPage;
import org.apache.openejb.loader.IO;
import org.apache.tomee.arquillian.remote.RemoteTomEEConfiguration;
import org.apache.tomee.arquillian.remote.RemoteTomEEContainer;
@@ -92,7 +92,7 @@ public class DeployInWebAppsDirectoryTest {
page = webClient.getPage(appUrl + "/moviefun");
assertMoviesPresent(page);
- webClient.closeAllWindows();
+ webClient.close();
}
private <T> T attempt(final Callable<T> callable, int numberOfAttempts) {
@@ -120,7 +120,7 @@ public class DeployInWebAppsDirectoryTest {
}
private void assertMoviesPresent(HtmlPage page) {
- String pageAsText = page.asText();
+ String pageAsText = page.asNormalizedText();
assertTrue(pageAsText.contains("Wedding Crashers"));
assertTrue(pageAsText.contains("Starsky & Hutch"));
assertTrue(pageAsText.contains("Shanghai Knights"));
diff --git
a/examples/simple-ear/moviefun-functional-tests/src/test/java/org/superbiz/moviefun/MoviesArquillianHtmlUnitTest.java
b/examples/simple-ear/moviefun-functional-tests/src/test/java/org/superbiz/moviefun/MoviesArquillianHtmlUnitTest.java
index 98fa3a264c..29da5c0d17 100644
---
a/examples/simple-ear/moviefun-functional-tests/src/test/java/org/superbiz/moviefun/MoviesArquillianHtmlUnitTest.java
+++
b/examples/simple-ear/moviefun-functional-tests/src/test/java/org/superbiz/moviefun/MoviesArquillianHtmlUnitTest.java
@@ -16,8 +16,8 @@
*/
package org.superbiz.moviefun;
-import com.gargoylesoftware.htmlunit.WebClient;
-import com.gargoylesoftware.htmlunit.html.HtmlPage;
+import org.htmlunit.WebClient;
+import org.htmlunit.html.HtmlPage;
import org.jboss.arquillian.container.test.api.Deployment;
import org.jboss.arquillian.container.test.api.RunAsClient;
import org.jboss.arquillian.junit.Arquillian;
@@ -63,11 +63,11 @@ public class MoviesArquillianHtmlUnitTest {
page = webClient.getPage(url + "/moviefun");
assertMoviesPresent(page);
- webClient.closeAllWindows();
+ webClient.close();
}
private void assertMoviesPresent(HtmlPage page) {
- String pageAsText = page.asText();
+ String pageAsText = page.asNormalizedText();
assertTrue(pageAsText.contains("Wedding Crashers"));
assertTrue(pageAsText.contains("Starsky & Hutch"));
assertTrue(pageAsText.contains("Shanghai Knights"));
diff --git a/examples/simple-ear/moviefun-webapp/pom.xml
b/examples/simple-ear/moviefun-webapp/pom.xml
index 330835ab3b..20dc8d2940 100644
--- a/examples/simple-ear/moviefun-webapp/pom.xml
+++ b/examples/simple-ear/moviefun-webapp/pom.xml
@@ -67,13 +67,6 @@
<version>11.0.0-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
- <dependency>
- <groupId>net.sourceforge.htmlunit</groupId>
- <artifactId>htmlunit</artifactId>
- <version>2.8</version>
- <type>jar</type>
- <scope>test</scope>
- </dependency>
</dependencies>
<build>
