diff --git a/Jenkinsfile b/Jenkinsfile
index eb12ebf17f..39173ab389 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -64,15 +64,20 @@ node('docker') {
mvn 'clean install -DskipTests'
}
- stage('Unit Test') {
- mvn 'test -Pcoverage -Dmaven.test.failure.ignore=true'
- junit allowEmptyResults: true, testResults: '**/target/surefire-reports/TEST-*.xml,**/target/jest-reports/TEST-*.xml'
- }
-
- stage('Integration Test') {
- mvn 'verify -Pit -pl :scm-webapp,:scm-it -Dmaven.test.failure.ignore=true -Dscm.git.core.supportsatomicfilecreation=false'
- junit allowEmptyResults: true, testResults: '**/target/failsafe-reports/TEST-*.xml'
- }
+ parallel(
+ unitTest: {
+ stage('Unit Test') {
+ mvn 'test -DskipFrontendBuild -DskipTypecheck -Pcoverage -pl !scm-it -Dmaven.test.failure.ignore=true'
+ junit allowEmptyResults: true, testResults: '**/target/surefire-reports/TEST-*.xml,**/target/jest-reports/TEST-*.xml'
+ }
+ },
+ integrationTest: {
+ stage('Integration Test') {
+ mvn 'verify -Pit -DskipUnitTests -pl :scm-webapp,:scm-it -Dmaven.test.failure.ignore=true'
+ junit allowEmptyResults: true, testResults: '**/target/failsafe-reports/TEST-*.xml'
+ }
+ }
+ )
stage('SonarQube') {
@@ -203,6 +208,10 @@ String mainBranch
Maven setupMavenBuild() {
Maven mvn = new MavenWrapperInDocker(this, "scmmanager/java-build:11.0.6_10")
+ // disable logging durring the build
+ def logConf = "scm-webapp/src/main/resources/logback.ci.xml"
+ mvn.additionalArgs += " -Dlogback.configurationFile=${logConf}"
+ mvn.additionalArgs += " -Dscm-it.logbackConfiguration=${logConf}"
if (isMainBranch() || isReleaseBranch()) {
// Release starts javadoc, which takes very long, so do only for certain branches
diff --git a/pom.xml b/pom.xml
index 082fce6a0b..93ee2aa395 100644
--- a/pom.xml
+++ b/pom.xml
@@ -399,12 +399,6 @@
${jaxb.version}
-
- com.sun.xml.bind
- jaxb-impl
- ${jaxb.version}
-
-
org.glassfish.jaxb
jaxb-runtime
@@ -480,6 +474,13 @@
org.apache.maven.plugins
maven-surefire-plugin
2.22.0
+
+
+ ${skipUnitTests}
+
@@ -881,7 +882,9 @@
./scm-ui/target/frontend/buildfrontend-node/node-v${nodejs.version}-linux-x64/bin/node
-
+
+ ${skipTests}
diff --git a/scm-core/pom.xml b/scm-core/pom.xml
index ec3b884fd6..3c7d67c2d8 100644
--- a/scm-core/pom.xml
+++ b/scm-core/pom.xml
@@ -152,11 +152,6 @@
jaxb-api
-
- com.sun.xml.bind
- jaxb-impl
-
-
org.glassfish.jaxb
jaxb-runtime
diff --git a/scm-it/pom.xml b/scm-it/pom.xml
index e2038e2816..6f41e1f1b6 100644
--- a/scm-it/pom.xml
+++ b/scm-it/pom.xml
@@ -212,6 +212,10 @@
sonia.scm.classloading.lifecycle
simple
+
+ logback.configurationFile
+ ${scm-it.logbackConfiguration}
+
/scm
@@ -245,10 +249,10 @@
DEVELOPMENT
target/scm-it
+ ${project.basedir}/../scm-webapp/src/main/resources/logback.default.xml
-
diff --git a/scm-ui/pom.xml b/scm-ui/pom.xml
index 851d2afd37..28b922cbc2 100644
--- a/scm-ui/pom.xml
+++ b/scm-ui/pom.xml
@@ -18,8 +18,9 @@
build
- false
false
+ ${skipTests}
+ false
typescript
ui-extensions/src,ui-components/src,ui-webapp/src
**/*.test.js,src/tests/**
@@ -88,6 +89,7 @@
run
+ ${skipFrontendBuild}
@@ -99,7 +101,7 @@
- ${skipTests}
+ ${skipFrontendTests}
diff --git a/scm-ui/ui-scripts/src/createPluginConfig.js b/scm-ui/ui-scripts/src/createPluginConfig.js
index 3e210fa022..6057ccc997 100644
--- a/scm-ui/ui-scripts/src/createPluginConfig.js
+++ b/scm-ui/ui-scripts/src/createPluginConfig.js
@@ -19,6 +19,7 @@ module.exports = function(mode) {
[name]: [path.resolve(__dirname, "webpack-public-path.js"), packageJSON.main || "src/main/js/index.js"]
},
mode,
+ stats: "minimal",
devtool: "source-map",
target: "web",
node: {
diff --git a/scm-ui/ui-scripts/src/webpack.config.js b/scm-ui/ui-scripts/src/webpack.config.js
index cf63c1da3c..e6cc362a67 100644
--- a/scm-ui/ui-scripts/src/webpack.config.js
+++ b/scm-ui/ui-scripts/src/webpack.config.js
@@ -25,6 +25,7 @@ console.log(`build ${mode} bundles`);
module.exports = [
{
mode,
+ stats: "minimal",
context: root,
entry: {
webapp: [path.resolve(__dirname, "webpack-public-path.js"), "./ui-webapp/src/index.tsx"]
diff --git a/scm-webapp/src/main/resources/logback.ci.xml b/scm-webapp/src/main/resources/logback.ci.xml
new file mode 100644
index 0000000000..428d3e1350
--- /dev/null
+++ b/scm-webapp/src/main/resources/logback.ci.xml
@@ -0,0 +1,39 @@
+
+
+
+
+
+
+
+