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

Fixing timeout value and adding thread output to maven build

This commit is contained in:
Martin Stockhammer 2021-08-29 11:38:19 +02:00
parent 502280dbbd
commit 699920cb89
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Jenkinsfile vendored
View File

@ -106,7 +106,7 @@ pipeline {
// -Dmaven.compiler.fork=true: Do compile in a separate forked process // -Dmaven.compiler.fork=true: Do compile in a separate forked process
// -Dmaven.test.failure.ignore=true: Do not stop, if some tests fail // -Dmaven.test.failure.ignore=true: Do not stop, if some tests fail
// -Pci-build: Profile for CI-Server // -Pci-build: Profile for CI-Server
sh "mvn ${cmdLine} -B -U -e -fae -Dmaven.compiler.fork=true -Pci-build -T${THREADS}" sh "mvn ${cmdLine} -B -U -e -fae -Dorg.slf4j.simpleLogger.showThreadName=true -Dmaven.compiler.fork=true -Pci-build -T${THREADS}"
} }
} }
} }
@ -149,7 +149,7 @@ pipeline {
{ {
sh "chmod 755 ./src/ci/scripts/prepareWorkspace.sh" sh "chmod 755 ./src/ci/scripts/prepareWorkspace.sh"
sh "./src/ci/scripts/prepareWorkspace.sh" sh "./src/ci/scripts/prepareWorkspace.sh"
sh "mvn clean install -U -B -e -fae -Dmaven.compiler.fork=true -Pci-build -T${THREADS}" sh "mvn clean install -U -B -e -fae -Dorg.slf4j.simpleLogger.showThreadName=true -Dmaven.compiler.fork=true -Pci-build -T${THREADS}"
} }
} }
} }

3
archiva-modules/metadata/metadata-store-provider/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/DefaultCassandraArchivaManager.java
View File

@ -38,6 +38,7 @@ import org.springframework.stereotype.Service;
import javax.annotation.PostConstruct; import javax.annotation.PostConstruct;
import javax.annotation.PreDestroy; import javax.annotation.PreDestroy;
import javax.inject.Inject; import javax.inject.Inject;
import java.time.Duration;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
import java.util.List; import java.util.List;
@ -185,7 +186,7 @@ public class DefaultCassandraArchivaManager
.withInt( DefaultDriverOption.CONNECTION_POOL_REMOTE_SIZE, maxActive ) .withInt( DefaultDriverOption.CONNECTION_POOL_REMOTE_SIZE, maxActive )
//.withInt( DefaultDriverOption.CONNECTION_MAX_REQUESTS, maxActive ) //.withInt( DefaultDriverOption.CONNECTION_MAX_REQUESTS, maxActive )
.withString( DefaultDriverOption.REQUEST_CONSISTENCY, readConsistencyLevel ) .withString( DefaultDriverOption.REQUEST_CONSISTENCY, readConsistencyLevel )
.withInt( DefaultDriverOption.REQUEST_TIMEOUT, 10 ) .withDuration( DefaultDriverOption.REQUEST_TIMEOUT, Duration.ofSeconds( 10 ) )
.build( ); .build( );
{ {