[archiva] branch master updated: Fixing timeout value and adding thread output to maven build

[martin_s]

This is an automated email from the ASF dual-hosted git repository.

martin_s 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 699920c  Fixing timeout value and adding thread output to maven build
699920c is described below

commit 699920cb8958b4436cbb16d27616d30ca98ba59b
Author: Martin Stockhammer <marti...@apache.org>
AuthorDate: Sun Aug 29 11:38:19 2021 +0200

    Fixing timeout value and adding thread output to maven build
---
 Jenkinsfile                                                           | 4 ++--
 .../metadata/repository/cassandra/DefaultCassandraArchivaManager.java | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 56dc1c6..3f937f0 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -106,7 +106,7 @@ pipeline {
                                 // -Dmaven.compiler.fork=true: Do compile in a 
separate forked process
                                 // -Dmaven.test.failure.ignore=true: Do not 
stop, if some tests fail
                                 // -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 
"./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}"
                                         }
                             }
                         }
diff --git 
a/archiva-modules/metadata/metadata-store-provider/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/DefaultCassandraArchivaManager.java
 
b/archiva-modules/metadata/metadata-store-provider/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/DefaultCassandraArchivaManager.java
index 5b5da70..085f3e2 100644
--- 
a/archiva-modules/metadata/metadata-store-provider/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/DefaultCassandraArchivaManager.java
+++ 
b/archiva-modules/metadata/metadata-store-provider/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/DefaultCassandraArchivaManager.java
@@ -38,6 +38,7 @@ import org.springframework.stereotype.Service;
 import javax.annotation.PostConstruct;
 import javax.annotation.PreDestroy;
 import javax.inject.Inject;
+import java.time.Duration;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
@@ -185,7 +186,7 @@ public class DefaultCassandraArchivaManager
                 .withInt( DefaultDriverOption.CONNECTION_POOL_REMOTE_SIZE, 
maxActive )
                 //.withInt( DefaultDriverOption.CONNECTION_MAX_REQUESTS, 
maxActive )
                 .withString( DefaultDriverOption.REQUEST_CONSISTENCY, 
readConsistencyLevel )
-                .withInt( DefaultDriverOption.REQUEST_TIMEOUT, 10 )
+                .withDuration( DefaultDriverOption.REQUEST_TIMEOUT, 
Duration.ofSeconds( 10 ) )
                 .build( );
 
         {