You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@roller.apache.org by mb...@apache.org on 2021/06/14 19:09:07 UTC
[roller] branch master updated: fixed selenium test classpath +
maven updates.
This is an automated email from the ASF dual-hosted git repository.
mbien pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/roller.git
The following commit(s) were added to refs/heads/master by this push:
new bb20abe fixed selenium test classpath + maven updates.
bb20abe is described below
commit bb20abe179e08a64d19e5120838a5dc72e0407e0
Author: Michael Bien <mb...@gmail.com>
AuthorDate: Fri Jun 11 20:47:17 2021 +0200
fixed selenium test classpath + maven updates.
- class path is now properly set up for the selenium tests (no jetty warnings anymore, significantly faster startup)
- some maven cleanup to fix duplicate libraries in classpath
- removed unused dependencies
- updated maven dependencies
- added -Xlint:deprecation as compiler arg for future cleanups
---
app/pom.xml | 77 ++++++++++++++++++++++++-----------------------------
it-selenium/pom.xml | 7 ++++-
pom.xml | 8 +++---
3 files changed, 45 insertions(+), 47 deletions(-)
diff --git a/app/pom.xml b/app/pom.xml
index f5d65bb..eeaab68 100644
--- a/app/pom.xml
+++ b/app/pom.xml
@@ -39,11 +39,10 @@ limitations under the License.
<java-mail.version>1.4.7</java-mail.version>
<jstl.version>1.2</jstl.version>
<angular.version>1.7.8</angular.version>
- <ant.version>1.10.9</ant.version>
+ <ant.version>1.10.10</ant.version>
<asm.version>9.1</asm.version>
<commons-validator.version>1.7</commons-validator.version>
<commons-beanutils.version>1.9.4</commons-beanutils.version>
- <commons-httpclient.version>3.1</commons-httpclient.version>
<commons-codec.version>1.15</commons-codec.version>
<eclipse-link.version>2.7.8</eclipse-link.version>
<guice.version>5.0.1</guice.version>
@@ -55,13 +54,12 @@ limitations under the License.
<maven-antrun.version>1.0b3</maven-antrun.version>
<rome.version>1.15.0</rome.version>
<slf4j.version>1.7.30</slf4j.version>
- <spring.version>5.3.7</spring.version>
+ <spring.version>5.3.8</spring.version>
<spring.security.version>5.4.6</spring.security.version>
<struts.version>2.5.26</struts.version>
<velocity.version>2.3</velocity.version>
<webjars.version>1.5</webjars.version>
<ws-commons-util.version>1.0.2</ws-commons-util.version>
- <xml-security.version>1.3.0</xml-security.version>
<xmlrpc-version>3.1.3</xmlrpc-version>
</properties>
@@ -186,12 +184,6 @@ limitations under the License.
<version>${velocity.version}</version>
</dependency>
- <dependency>
- <groupId>commons-collections</groupId>
- <artifactId>commons-collections</artifactId>
- <version>3.2.2</version>
- </dependency>
-
<!-- explicitly adding newest asm lib to improve compatibility with latest JDKs -->
<dependency>
@@ -359,18 +351,6 @@ limitations under the License.
</dependency>
<dependency>
- <groupId>commons-httpclient</groupId>
- <artifactId>commons-httpclient</artifactId>
- <version>${commons-httpclient.version}</version>
- <exclusions>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
<version>${commons-codec.version}</version>
@@ -383,12 +363,6 @@ limitations under the License.
</dependency>
<dependency>
- <groupId>xml-security</groupId>
- <artifactId>xmlsec</artifactId>
- <version>${xml-security.version}</version>
- </dependency>
-
- <dependency>
<groupId>org.apache.xmlrpc</groupId>
<artifactId>xmlrpc-common</artifactId>
<version>${xmlrpc-version}</version>
@@ -406,10 +380,6 @@ limitations under the License.
<version>${xmlrpc-version}</version>
<exclusions>
<exclusion>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- </exclusion>
- <exclusion>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
</exclusion>
@@ -440,6 +410,13 @@ limitations under the License.
<groupId>org.springframework</groupId>
<artifactId>spring-web</artifactId>
<version>${spring.version}</version>
+ <exclusions>
+ <!-- in jcl-over-slf4j -->
+ <exclusion>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-jcl</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
@@ -452,6 +429,14 @@ limitations under the License.
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-config</artifactId>
<version>${spring.security.version}</version>
+ <exclusions>
+ <!-- all classes of spring-security-crypto-x.x.x.jar are already in
+ spring-security-core-x.x.x.jar -->
+ <exclusion>
+ <groupId>org.springframework.security</groupId>
+ <artifactId>spring-security-crypto</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
@@ -505,13 +490,18 @@ limitations under the License.
<groupId>aopalliance</groupId>
<artifactId>aopalliance</artifactId>
</exclusion>
+ <!-- this removes an empty jar guava depends on -->
+ <exclusion>
+ <groupId>com.google.guava</groupId>
+ <artifactId>listenablefuture</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>com.jgeppert.struts2.bootstrap</groupId>
<artifactId>struts2-bootstrap-plugin</artifactId>
- <version>2.5.2</version>
+ <version>4.0.0</version>
</dependency>
<dependency>
@@ -519,8 +509,15 @@ limitations under the License.
<artifactId>rome-fetcher</artifactId>
<version>${rome.version}</version>
<scope>compile</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
+ <!-- todo: remove/replace propono -->
<dependency>
<groupId>com.rometools</groupId>
<artifactId>rome-propono</artifactId>
@@ -528,12 +525,8 @@ limitations under the License.
<scope>compile</scope>
<exclusions>
<exclusion>
- <groupId>xmlrpc</groupId>
- <artifactId>xmlrpc-common</artifactId>
- </exclusion>
- <exclusion>
- <groupId>xmlrpc</groupId>
- <artifactId>xmlrpc-client</artifactId>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
</exclusion>
</exclusions>
</dependency>
@@ -675,7 +668,7 @@ limitations under the License.
<plugin>
<artifactId>maven-resources-plugin</artifactId>
- <version>2.6</version>
+ <version>3.2.0</version>
<executions>
@@ -757,7 +750,7 @@ limitations under the License.
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
- <version>1.8</version>
+ <version>3.0.0</version>
<dependencies>
<dependency>
<groupId>ant-contrib</groupId>
@@ -815,7 +808,7 @@ limitations under the License.
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>buildnumber-maven-plugin</artifactId>
- <version>1.3</version>
+ <version>1.4</version>
<executions>
<execution>
<phase>validate</phase>
diff --git a/it-selenium/pom.xml b/it-selenium/pom.xml
index 5c94bac..9ec24a4 100644
--- a/it-selenium/pom.xml
+++ b/it-selenium/pom.xml
@@ -55,6 +55,7 @@
<artifactId>commons-lang3</artifactId>
</exclusion>
</exclusions>
+ <scope>test</scope>
</dependency>
<dependency>
@@ -75,6 +76,7 @@
<artifactId>xalan</artifactId>
</exclusion>
</exclusions>
+ <scope>test</scope>
</dependency>
<dependency>
@@ -88,6 +90,7 @@
<artifactId>javax.activation-api</artifactId>
</exclusion>
</exclusions>
+ <scope>test</scope>
</dependency>
<!-- Will bring in once we configure a Chrome option -->
@@ -100,7 +103,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.13</version>
+ <version>4.13.2</version>
<scope>test</scope>
</dependency>
@@ -212,6 +215,8 @@
<goal>start</goal>
</goals>
<configuration>
+ <!-- great for debugging classpath issues -->
+ <dumpOnStart>false</dumpOnStart>
</configuration>
</execution>
<execution>
diff --git a/pom.xml b/pom.xml
index 4f22568..7cf3922 100644
--- a/pom.xml
+++ b/pom.xml
@@ -44,7 +44,7 @@ limitations under the License.
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<derby.version>10.11.1.1</derby.version>
<jaxb.version>2.3.1</jaxb.version>
- <jetty.version>10.0.0</jetty.version>
+ <jetty.version>10.0.3</jetty.version>
<roller.version>6.1.0-SNAPSHOT</roller.version>
</properties>
@@ -61,9 +61,9 @@ limitations under the License.
<artifactId>maven-compiler-plugin</artifactId>
<version>3.8.1</version>
<configuration>
- <source>11</source>
- <target>11</target>
+ <release>11</release>
<fork>true</fork>
+ <compilerArgument>-Xlint:deprecation</compilerArgument>
<encoding>${project.build.sourceEncoding}</encoding>
</configuration>
</plugin>
@@ -106,7 +106,7 @@ limitations under the License.
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-engine</artifactId>
- <version>5.7.1</version>
+ <version>5.7.2</version>
<scope>test</scope>
</dependency>
</dependencies>