Skip to content
This repository was archived by the owner on Apr 25, 2024. It is now read-only.

Commit 6f4b08e

Browse files
olamyolamy
authored
add gh action, dependabot and release-drafter and get rid of travis (#65)
* add gh action, dependabot and release-drafter and get rid of travis * move owasp check in a separate profile Signed-off-by: Olivier Lamy <olamy@apache.org>
1 parent eb489a1 commit 6f4b08e

8 files changed

Lines changed: 109 additions & 66 deletions

File tree

‎.github/dependabot.yml‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,5 +31,13 @@ updates:
3131

3232
- package-ecosystem: "github-actions"
3333
directory: "/"
34+
target-branch: "archiva-2.x"
35+
schedule:
36+
interval: "daily"
37+
38+
- package-ecosystem: "github-actions"
39+
directory: "/"
40+
target-branch: "master"
3441
schedule:
3542
interval: "daily"
43+

‎.github/release-drafter.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,3 +16,4 @@
1616
# under the License.
1717

1818
_extends: archiva-parent
19+
tag-template: archiva-$NEXT_MINOR_VERSION

‎.github/workflows/maven.yml‎

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
# Licensed to the Apache Software Foundation (ASF) under one
2+
# or more contributor license agreements. See the NOTICE file
3+
# distributed with this work for additional information
4+
# regarding copyright ownership. The ASF licenses this file
5+
# to you under the Apache License, Version 2.0 (the
6+
# "License"); you may not use this file except in compliance
7+
# with the License. You may obtain a copy of the License at
8+
#
9+
# http://www.apache.org/licenses/LICENSE-2.0
10+
#
11+
# Unless required by applicable law or agreed to in writing,
12+
# software distributed under the License is distributed on an
13+
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
14+
# KIND, either express or implied. See the License for the
15+
# specific language governing permissions and limitations
16+
# under the License.
17+
18+
name: GitHub CI
19+
20+
on:
21+
push:
22+
pull_request:
23+
24+
25+
jobs:
26+
build:
27+
28+
strategy:
29+
matrix:
30+
os: [ubuntu-latest]
31+
java: [8, 11]
32+
fail-fast: false
33+
34+
runs-on: ${{ matrix.os }}
35+
36+
steps:
37+
- name: Checkout
38+
uses: actions/checkout@v2
39+
40+
- name: Set up JDK
41+
uses: actions/setup-java@v2.3.1
42+
with:
43+
distribution: temurin
44+
java-version: ${{ matrix.java }}
45+
cache: 'maven'
46+
47+
- name: Build with Maven
48+
run: mvn -e -B -V install -Pci-build -T2

‎.github/workflows/release-drafter.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,16 +14,16 @@
1414
# KIND, either express or implied. See the License for the
1515
# specific language governing permissions and limitations
1616
# under the License.
17-
1817
name: Release Drafter
1918
on:
2019
push:
2120
branches:
2221
- master
22+
- archiva-2.x
2323
jobs:
2424
update_release_draft:
2525
runs-on: ubuntu-latest
2626
steps:
27-
- uses: release-drafter/release-drafter@v5.18.1
27+
- uses: release-drafter/release-drafter@v5
2828
env:
2929
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

‎.travis.yml‎

Lines changed: 0 additions & 17 deletions
This file was deleted.

‎Jenkinsfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ pipeline {
149149
{
150150
sh "chmod 755 ./src/ci/scripts/prepareWorkspace.sh"
151151
sh "./src/ci/scripts/prepareWorkspace.sh"
152-
sh "mvn clean install -U -B -e -fae -Dorg.slf4j.simpleLogger.showThreadName=true -Dmaven.compiler.fork=true -Pci-build -T${THREADS}"
152+
sh "mvn clean install -U -B -e -fae -Dorg.slf4j.simpleLogger.showThreadName=true -Pci-build -T${THREADS}"
153153
}
154154
}
155155
}

‎archiva-modules/archiva-web/archiva-webapp/pom.xml‎

Lines changed: 27 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -840,30 +840,6 @@
840840
</systemPropertyVariables>
841841
</configuration>
842842
</plugin>
843-
844-
845-
846-
847-
<plugin>
848-
<groupId>org.owasp</groupId>
849-
<artifactId>dependency-check-maven</artifactId>
850-
<version>6.0.4</version>
851-
<configuration>
852-
<skipProvidedScope>true</skipProvidedScope>
853-
<failBuildOnCVSS>8</failBuildOnCVSS>
854-
<suppressionFile>${project.basedir}/src/main/resources/META-INF/owasp/cve-suppressions.xml</suppressionFile>
855-
<ossindexAnalyzerEnabled>false</ossindexAnalyzerEnabled>
856-
<assemblyAnalyzerEnabled>false</assemblyAnalyzerEnabled>
857-
<nodeAnalyzerEnabled>false</nodeAnalyzerEnabled>
858-
</configuration>
859-
<executions>
860-
<execution>
861-
<goals>
862-
<goal>check</goal>
863-
</goals>
864-
</execution>
865-
</executions>
866-
</plugin>
867843
</plugins>
868844
</build>
869845

@@ -874,6 +850,33 @@
874850
<archiva.repositorySessionFactory.id>cassandra</archiva.repositorySessionFactory.id>
875851
</properties>
876852
</profile>
853+
<profile>
854+
<id>owasp</id>
855+
<build>
856+
<plugins>
857+
<plugin>
858+
<groupId>org.owasp</groupId>
859+
<artifactId>dependency-check-maven</artifactId>
860+
<version>6.0.4</version>
861+
<configuration>
862+
<skipProvidedScope>true</skipProvidedScope>
863+
<failBuildOnCVSS>8</failBuildOnCVSS>
864+
<suppressionFile>${project.basedir}/src/main/resources/META-INF/owasp/cve-suppressions.xml</suppressionFile>
865+
<ossindexAnalyzerEnabled>false</ossindexAnalyzerEnabled>
866+
<assemblyAnalyzerEnabled>false</assemblyAnalyzerEnabled>
867+
<nodeAnalyzerEnabled>false</nodeAnalyzerEnabled>
868+
</configuration>
869+
<executions>
870+
<execution>
871+
<goals>
872+
<goal>check</goal>
873+
</goals>
874+
</execution>
875+
</executions>
876+
</plugin>
877+
</plugins>
878+
</build>
879+
</profile>
877880
</profiles>
878881

879882
</project>

‎pom.xml‎

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -2179,17 +2179,17 @@
21792179
<enabled>true</enabled>
21802180
</snapshots>
21812181
</repository>
2182-
<repository>
2183-
<id>jetty.snapshots</id>
2184-
<name>Jetty Snapshots</name>
2185-
<url>https://oss.sonatype.org/content/repositories/jetty-snapshots/</url>
2186-
<releases>
2187-
<enabled>false</enabled>
2188-
</releases>
2189-
<snapshots>
2190-
<enabled>true</enabled>
2191-
</snapshots>
2192-
</repository>
2182+
<!-- <repository>-->
2183+
<!-- <id>jetty.snapshots</id>-->
2184+
<!-- <name>Jetty Snapshots</name>-->
2185+
<!-- <url>https://oss.sonatype.org/content/repositories/jetty-snapshots/</url>-->
2186+
<!-- <releases>-->
2187+
<!-- <enabled>false</enabled>-->
2188+
<!-- </releases>-->
2189+
<!-- <snapshots>-->
2190+
<!-- <enabled>true</enabled>-->
2191+
<!-- </snapshots>-->
2192+
<!-- </repository>-->
21932193
</repositories>
21942194
<pluginRepositories>
21952195
<pluginRepository>
@@ -2203,16 +2203,16 @@
22032203
<enabled>true</enabled>
22042204
</snapshots>
22052205
</pluginRepository>
2206-
<pluginRepository>
2207-
<id>jetty.snapshots</id>
2208-
<name>Jetty Snapshots</name>
2209-
<url>https://oss.sonatype.org/content/repositories/jetty-snapshots/</url>
2210-
<releases>
2211-
<enabled>false</enabled>
2212-
</releases>
2213-
<snapshots>
2214-
<enabled>true</enabled>
2215-
</snapshots>
2216-
</pluginRepository>
2206+
<!-- <pluginRepository>-->
2207+
<!-- <id>jetty.snapshots</id>-->
2208+
<!-- <name>Jetty Snapshots</name>-->
2209+
<!-- <url>https://oss.sonatype.org/content/repositories/jetty-snapshots/</url>-->
2210+
<!-- <releases>-->
2211+
<!-- <enabled>false</enabled>-->
2212+
<!-- </releases>-->
2213+
<!-- <snapshots>-->
2214+
<!-- <enabled>true</enabled>-->
2215+
<!-- </snapshots>-->
2216+
<!-- </pluginRepository>-->
22172217
</pluginRepositories>
22182218
</project>

0 commit comments

Comments
 (0)