This is an automated email from the ASF dual-hosted git repository.
olamy pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/archiva.git
The following commit(s) were added to refs/heads/master by this push:
new e94d03728 use jetty bom to manage Jetty dependencies (#81)
e94d03728 is described below
commit e94d037281ca0b2f6bd06659d1c073b1f9e8d55b
Author: Olivier Lamy <[email protected]>
AuthorDate: Mon Apr 18 12:07:02 2022 +1000
use jetty bom to manage Jetty dependencies (#81)
* use jetty bom to manage Jetty dependencies
* simplify code and do write in a log file in /tmp when running tests
Signed-off-by: Olivier Lamy <[email protected]>
---
.../rest/services/AbstractArchivaRestTest.java | 40 +++-------------------
.../src/test/resources/log4j2-test.xml | 18 ++--------
.../src/test/resources/log4j2-test.xml | 10 ------
pom.xml | 27 ++-------------
4 files changed, 11 insertions(+), 84 deletions(-)
diff --git
a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/AbstractArchivaRestTest.java
b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/AbstractArchivaRestTest.java
index efd48408d..439b9ffd8 100644
---
a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/AbstractArchivaRestTest.java
+++
b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/AbstractArchivaRestTest.java
@@ -46,7 +46,6 @@ import org.apache.commons.io.FileUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.cxf.jaxrs.client.JAXRSClientFactory;
import org.apache.cxf.jaxrs.client.WebClient;
-import org.junit.After;
import org.junit.Assume;
import org.junit.Before;
import org.junit.BeforeClass;
@@ -74,17 +73,6 @@ public abstract class AbstractArchivaRestTest
private AtomicReference<Path> appServerBase = new AtomicReference<>( );
private AtomicReference<Path> basePath = new AtomicReference<>( );
- private boolean reuseServer = true;
-
-
- protected void setReuseServer(boolean value) {
- this.reuseServer = value;
- }
-
- protected boolean isReuseServer() {
- return this.reuseServer;
- }
-
/*
* Used by tryAssert to allow to throw exceptions in the lambda expression.
*/
@@ -179,31 +167,13 @@ public abstract class AbstractArchivaRestTest
public void startServer()
throws Exception
{
- if ( (!isReuseServer()) || (isReuseServer() && !isServerRunning())) {
- log.info("Starting new server reuse={}, running={}, instance={},
server={}", isReuseServer(), isServerRunning(), this.hashCode(),
getServer()==null ? "" : getServer().hashCode());
- Path appServerBase = getAppserverBase( );
- removeAppsubFolder(appServerBase, "jcr");
- removeAppsubFolder(appServerBase, "conf");
- removeAppsubFolder(appServerBase, "data");
- super.startServer();
- } else {
- log.info("Reusing running server instance reuse={}, running={}",
isReuseServer(), isServerRunning());
- }
- }
+ Path appServerBase = getAppserverBase();
+ removeAppsubFolder(appServerBase, "jcr");
+ removeAppsubFolder(appServerBase, "conf");
+ removeAppsubFolder(appServerBase, "data");
+ super.startServer();
- @Override
- @After
- public void stopServer()
- throws Exception
- {
- if ( !isReuseServer() )
- {
- log.info("Stopping server reuse={}, running={}, instance={},
server={}", isReuseServer(), isServerRunning(), this.hashCode(),
getServer()==null ? "" : getServer().hashCode());
- super.stopServer();
- } else {
- log.info("Server not stopping reuse={}, running={}",
isReuseServer(), isServerRunning());
- }
}
diff --git
a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/resources/log4j2-test.xml
b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/resources/log4j2-test.xml
index c0414be38..c4093cb41 100644
---
a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/resources/log4j2-test.xml
+++
b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/resources/log4j2-test.xml
@@ -24,33 +24,21 @@
<Console name="console" target="SYSTEM_OUT">
<PatternLayout pattern="%highlight{%d{HH:mm:ss.SSS} [%L] [%t] %-5level
%logger{6} - %msg%n}" />
</Console>
- <RollingRandomAccessFile name="rolling" fileName="/tmp/archiva.log"
- filePattern="/tmp/archiva-%d{yyyyMMdd}.log"
- immediateFlush="true" append="true">
- <PatternLayout>
- <pattern>%d [%t] %-5p %c %x - %m%n</pattern>
- </PatternLayout>
- <Policies>
- <TimeBasedTriggeringPolicy />
- </Policies>
- </RollingRandomAccessFile>
</appenders>
<loggers>
<logger name="jaxrs" level="info" />
- <logger name="org.apache.cxf" level="debug" />
- <logger name="org.apache.archiva" level="debug" />
- <logger name="org.apache.archiva.redback" level="debug"/>
+ <logger name="org.apache.cxf" level="info" />
+ <logger name="org.apache.archiva" level="info" />
+ <logger name="org.apache.archiva.redback" level="info"/>
<logger name="com.fasterxml.jackson" level="info" />
<logger name="org.apache.archiva.components" level="error" />
- <logger name="JPOX" level="error"/>
<logger name="org.apache.archiva.rest.services" level="info"/>
<logger name="org.springframework" level="error"/>
<logger name="org.apache.commons.configuration" level="info"/>
<logger name="org.apache.archiva.metadata" level="error" />
- <logger name="org.apache.cxf" level="debug" />
<root level="info">
<appender-ref ref="console"/>
diff --git
a/archiva-modules/archiva-web/archiva-webdav/src/test/resources/log4j2-test.xml
b/archiva-modules/archiva-web/archiva-webdav/src/test/resources/log4j2-test.xml
index 254f26841..8641749d5 100644
---
a/archiva-modules/archiva-web/archiva-webdav/src/test/resources/log4j2-test.xml
+++
b/archiva-modules/archiva-web/archiva-webdav/src/test/resources/log4j2-test.xml
@@ -24,16 +24,6 @@
<Console name="console" target="SYSTEM_OUT">
<PatternLayout pattern="%highlight{%d{HH:mm:ss.SSS} [%L] [%t] %-5level
%logger{3} - %msg%n}" />
</Console>
- <RollingRandomAccessFile name="rolling" fileName="/tmp/archiva.log"
- filePattern="/tmp/archiva-%d{yyyyMMdd}.log"
- immediateFlush="true" append="true">
- <PatternLayout>
- <pattern>%d [%t] %-5p %c %x - %m%n</pattern>
- </PatternLayout>
- <Policies>
- <TimeBasedTriggeringPolicy />
- </Policies>
- </RollingRandomAccessFile>
</appenders>
<loggers>
diff --git a/pom.xml b/pom.xml
index 50ff533ab..4bea6c4ac 100644
--- a/pom.xml
+++ b/pom.xml
@@ -51,18 +51,12 @@
<redback.version>3.0.0-SNAPSHOT</redback.version>
<!-- Java Enterprise APIs -->
-
-
-
<maven3x.version>3.8.1</maven3x.version>
<maven.resolver.version>1.4.1</maven.resolver.version>
<maven.indexer.version>6.0.1-SNAPSHOT</maven.indexer.version>
<maven-model-converter.version>2.3</maven-model-converter.version>
<wagon.version>3.3.3</wagon.version>
-
-
-
<!-- dependencies of maven modules -->
<jsoup.version>1.14.2</jsoup.version>
<rome.version>1.16.0</rome.version>
@@ -1551,27 +1545,12 @@
<dependency>
<groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-server</artifactId>
- <version>${jetty.version}</version>
- <exclusions>
- <exclusion>
- <groupId>javax.servlet</groupId>
- <artifactId>javax.servlet-api</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-plus</artifactId>
- <version>${jetty.version}</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-servlet</artifactId>
+ <artifactId>jetty-bom</artifactId>
<version>${jetty.version}</version>
+ <type>pom</type>
+ <scope>import</scope>
</dependency>
-
<!-- JCR -->
<dependency>
<groupId>javax.jcr</groupId>
