Apache
/
archiva
mirror of https://github.com/apache/archiva.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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 <olamy@apache.org>
This commit is contained in:
Olivier Lamy 2022-04-18 12:07:02 +10:00 committed by GitHub
parent e6a08c7517
commit e94d037281
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 11 additions and 84 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/AbstractArchivaRestTest.java
View File

@ -46,7 +46,6 @@ import org.apache.commons.io.FileUtils;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.apache.cxf.jaxrs.client.JAXRSClientFactory; import org.apache.cxf.jaxrs.client.JAXRSClientFactory;
import org.apache.cxf.jaxrs.client.WebClient; import org.apache.cxf.jaxrs.client.WebClient;
import org.junit.After;
import org.junit.Assume; import org.junit.Assume;
import org.junit.Before; import org.junit.Before;
import org.junit.BeforeClass; import org.junit.BeforeClass;
@ -74,17 +73,6 @@ public abstract class AbstractArchivaRestTest
private AtomicReference<Path> appServerBase = new AtomicReference<>( ); private AtomicReference<Path> appServerBase = new AtomicReference<>( );
private AtomicReference<Path> basePath = 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. * Used by tryAssert to allow to throw exceptions in the lambda expression.
*/ */
@ -179,31 +167,13 @@ public abstract class AbstractArchivaRestTest
public void startServer() public void startServer()
throws Exception 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"); Path appServerBase = getAppserverBase();
removeAppsubFolder(appServerBase, "conf"); removeAppsubFolder(appServerBase, "jcr");
removeAppsubFolder(appServerBase, "data"); removeAppsubFolder(appServerBase, "conf");
super.startServer(); removeAppsubFolder(appServerBase, "data");
} else { super.startServer();
log.info("Reusing running server instance reuse={}, running={}", isReuseServer(), isServerRunning());
}
}
@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());
}
} }

18
archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/resources/log4j2-test.xml
View File

@ -24,33 +24,21 @@
<Console name="console" target="SYSTEM_OUT"> <Console name="console" target="SYSTEM_OUT">
<PatternLayout pattern="%highlight{%d{HH:mm:ss.SSS} [%L] [%t] %-5level %logger{6} - %msg%n}" /> <PatternLayout pattern="%highlight{%d{HH:mm:ss.SSS} [%L] [%t] %-5level %logger{6} - %msg%n}" />
</Console> </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> </appenders>
<loggers> <loggers>
<logger name="jaxrs" level="info" /> <logger name="jaxrs" level="info" />
<logger name="org.apache.cxf" level="debug" /> <logger name="org.apache.cxf" level="info" />
<logger name="org.apache.archiva" level="debug" /> <logger name="org.apache.archiva" level="info" />
<logger name="org.apache.archiva.redback" level="debug"/> <logger name="org.apache.archiva.redback" level="info"/>
<logger name="com.fasterxml.jackson" level="info" /> <logger name="com.fasterxml.jackson" level="info" />
<logger name="org.apache.archiva.components" level="error" /> <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.apache.archiva.rest.services" level="info"/>
<logger name="org.springframework" level="error"/> <logger name="org.springframework" level="error"/>
<logger name="org.apache.commons.configuration" level="info"/> <logger name="org.apache.commons.configuration" level="info"/>
<logger name="org.apache.archiva.metadata" level="error" /> <logger name="org.apache.archiva.metadata" level="error" />
<logger name="org.apache.cxf" level="debug" />
<root level="info"> <root level="info">
<appender-ref ref="console"/> <appender-ref ref="console"/>

10
archiva-modules/archiva-web/archiva-webdav/src/test/resources/log4j2-test.xml
View File

@ -24,16 +24,6 @@
<Console name="console" target="SYSTEM_OUT"> <Console name="console" target="SYSTEM_OUT">
<PatternLayout pattern="%highlight{%d{HH:mm:ss.SSS} [%L] [%t] %-5level %logger{3} - %msg%n}" /> <PatternLayout pattern="%highlight{%d{HH:mm:ss.SSS} [%L] [%t] %-5level %logger{3} - %msg%n}" />
</Console> </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> </appenders>
<loggers> <loggers>

27
pom.xml
View File

@ -51,18 +51,12 @@
<redback.version>3.0.0-SNAPSHOT</redback.version> <redback.version>3.0.0-SNAPSHOT</redback.version>
<!-- Java Enterprise APIs --> <!-- Java Enterprise APIs -->
<maven3x.version>3.8.1</maven3x.version> <maven3x.version>3.8.1</maven3x.version>
<maven.resolver.version>1.4.1</maven.resolver.version> <maven.resolver.version>1.4.1</maven.resolver.version>
<maven.indexer.version>6.0.1-SNAPSHOT</maven.indexer.version> <maven.indexer.version>6.0.1-SNAPSHOT</maven.indexer.version>
<maven-model-converter.version>2.3</maven-model-converter.version> <maven-model-converter.version>2.3</maven-model-converter.version>
<wagon.version>3.3.3</wagon.version> <wagon.version>3.3.3</wagon.version>
<!-- dependencies of maven modules --> <!-- dependencies of maven modules -->
<jsoup.version>1.14.2</jsoup.version> <jsoup.version>1.14.2</jsoup.version>
<rome.version>1.16.0</rome.version> <rome.version>1.16.0</rome.version>
@ -1551,26 +1545,11 @@
<dependency> <dependency>
<groupId>org.eclipse.jetty</groupId> <groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-server</artifactId> <artifactId>jetty-bom</artifactId>
<version>${jetty.version}</version> <version>${jetty.version}</version>
<exclusions> <type>pom</type>
<exclusion> <scope>import</scope>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
</exclusion>
</exclusions>
</dependency> </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>
<version>${jetty.version}</version>
</dependency>
<!-- JCR --> <!-- JCR -->
<dependency> <dependency>