diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index 2057a6a06..b6de61b8f 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -31,5 +31,13 @@ updates:
- package-ecosystem: "github-actions"
directory: "/"
+ target-branch: "archiva-2.x"
schedule:
interval: "daily"
+
+ - package-ecosystem: "github-actions"
+ directory: "/"
+ target-branch: "master"
+ schedule:
+ interval: "daily"
+
diff --git a/.github/release-drafter.yml b/.github/release-drafter.yml
index aad5e119c..356a9b584 100644
--- a/.github/release-drafter.yml
+++ b/.github/release-drafter.yml
@@ -16,3 +16,4 @@
# under the License.
_extends: archiva-parent
+tag-template: archiva-$NEXT_MINOR_VERSION
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
new file mode 100644
index 000000000..f7cccf536
--- /dev/null
+++ b/.github/workflows/maven.yml
@@ -0,0 +1,48 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+name: GitHub CI
+
+on:
+ push:
+ pull_request:
+
+
+jobs:
+ build:
+
+ strategy:
+ matrix:
+ os: [ubuntu-latest]
+ java: [8, 11]
+ fail-fast: false
+
+ runs-on: ${{ matrix.os }}
+
+ steps:
+ - name: Checkout
+ uses: actions/checkout@v2
+
+ - name: Set up JDK
+ uses: actions/setup-java@v2.3.1
+ with:
+ distribution: temurin
+ java-version: ${{ matrix.java }}
+ cache: 'maven'
+
+ - name: Build with Maven
+ run: mvn -e -B -V install -Pci-build -T2
diff --git a/.github/workflows/release-drafter.yml b/.github/workflows/release-drafter.yml
index 05e539157..bb5c0f388 100644
--- a/.github/workflows/release-drafter.yml
+++ b/.github/workflows/release-drafter.yml
@@ -14,16 +14,16 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
-
name: Release Drafter
on:
push:
branches:
- master
+ - archiva-2.x
jobs:
update_release_draft:
runs-on: ubuntu-latest
steps:
- - uses: release-drafter/release-drafter@v5.18.1
+ - uses: release-drafter/release-drafter@v5
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index a6e6ec9a2..000000000
--- a/.travis.yml
+++ /dev/null
@@ -1,17 +0,0 @@
-language: java
-dist: xenial
-jdk:
- - openjdk8
-
-install: "mvn clean install -DskipTests=true -B -V -Pci-build"
-
-script: "mvn clean install -B -V -Pci-build"
-
-cache:
- directories:
- - $HOME/.m2
-
-branches:
- except:
- - gh-pages
-
diff --git a/Jenkinsfile b/Jenkinsfile
index c15f75642..eaebba1bd 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -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 -Dorg.slf4j.simpleLogger.showThreadName=true -Dmaven.compiler.fork=true -Pci-build -T${THREADS}"
+ sh "mvn clean install -U -B -e -fae -Dorg.slf4j.simpleLogger.showThreadName=true -Pci-build -T${THREADS}"
}
}
}
diff --git a/archiva-modules/archiva-web/archiva-webapp/pom.xml b/archiva-modules/archiva-web/archiva-webapp/pom.xml
index 1418bec90..d3ca90441 100644
--- a/archiva-modules/archiva-web/archiva-webapp/pom.xml
+++ b/archiva-modules/archiva-web/archiva-webapp/pom.xml
@@ -840,30 +840,6 @@
-
-
-
-
-
- org.owasp
- dependency-check-maven
- 6.0.4
-
- true
- 8
- ${project.basedir}/src/main/resources/META-INF/owasp/cve-suppressions.xml
- false
- false
- false
-
-
-
-
- check
-
-
-
-
@@ -874,6 +850,33 @@
cassandra
+
+ owasp
+
+
+
+ org.owasp
+ dependency-check-maven
+ 6.0.4
+
+ true
+ 8
+ ${project.basedir}/src/main/resources/META-INF/owasp/cve-suppressions.xml
+ false
+ false
+ false
+
+
+
+
+ check
+
+
+
+
+
+
+
diff --git a/pom.xml b/pom.xml
index ffcd4be77..e3cbef7b4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2179,17 +2179,17 @@
true
-
- jetty.snapshots
- Jetty Snapshots
- https://oss.sonatype.org/content/repositories/jetty-snapshots/
-
- false
-
-
- true
-
-
+
+
+
+
+
+
+
+
+
+
+
@@ -2203,16 +2203,16 @@
true
-
- jetty.snapshots
- Jetty Snapshots
- https://oss.sonatype.org/content/repositories/jetty-snapshots/
-
- false
-
-
- true
-
-
+
+
+
+
+
+
+
+
+
+
+