diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index 048fb743..ce3d6572 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -38,6 +38,6 @@ jobs: key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }} restore-keys: ${{ runner.os }}-m2 - name: Build with Maven - run: mvn -B clean package -s maven/cnaf-mirror-settings.xml + run: mvn -B clean package - name: Checkstyle with Maven - run: mvn clean compile -s maven/cnaf-mirror-settings.xml -U -Dmaven.test.failure.ignore -DfailIfNoTests=false checkstyle:check -Dcheckstyle.config.location=google_checks.xml + run: mvn clean compile -U -Dmaven.test.failure.ignore -DfailIfNoTests=false checkstyle:check -Dcheckstyle.config.location=google_checks.xml diff --git a/.github/workflows/sonar.yml b/.github/workflows/sonar.yml index 6f4f5747..d231dc4d 100644 --- a/.github/workflows/sonar.yml +++ b/.github/workflows/sonar.yml @@ -34,4 +34,4 @@ jobs: env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # Needed to get PR information, if any SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} - run: mvn -s maven/cnaf-mirror-settings.xml -B -U install org.sonarsource.scanner.maven:sonar-maven-plugin:sonar -Dsonar.projectKey=italiangrid_storm-webdav + run: mvn -B -U install org.sonarsource.scanner.maven:sonar-maven-plugin:sonar -Dsonar.projectKey=italiangrid_storm-webdav diff --git a/Dockerfile b/Dockerfile index 21fd5b1d..9d3b7ce3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,13 +3,12 @@ FROM eclipse-temurin:11-jdk-alpine as build WORKDIR /workspace/app RUN apk add maven COPY pom.xml . -COPY maven maven -RUN mvn dependency:resolve -s maven/cnaf-mirror-settings.xml -RUN mvn dependency:resolve-plugins -s maven/cnaf-mirror-settings.xml +RUN mvn dependency:resolve +RUN mvn dependency:resolve-plugins COPY .git .git COPY etc etc COPY src src -RUN mvn package -s maven/cnaf-mirror-settings.xml -Dmaven.test.skip +RUN mvn package -Dmaven.test.skip RUN mkdir -p target/dependency && (cd target/dependency; jar -xf ../*.jar) FROM eclipse-temurin:11-centos7 diff --git a/cnaf-mirror-settings.xml b/cnaf-mirror-settings.xml deleted file mode 100644 index 3280e381..00000000 --- a/cnaf-mirror-settings.xml +++ /dev/null @@ -1,46 +0,0 @@ - - - - - false - - - nexus - CNAF maven mirror - https://repo.cloud.cnaf.infn.it/repository/maven-public - * - - - - - nexus - - - central - http://central - true - true - - - - - - nexus - - diff --git a/maven/cnaf-mirror-settings.xml b/maven/cnaf-mirror-settings.xml deleted file mode 100644 index 3280e381..00000000 --- a/maven/cnaf-mirror-settings.xml +++ /dev/null @@ -1,46 +0,0 @@ - - - - - false - - - nexus - CNAF maven mirror - https://repo.cloud.cnaf.infn.it/repository/maven-public - * - - - - - nexus - - - central - http://central - true - true - - - - - - nexus - - diff --git a/pom.xml b/pom.xml index cf3874ed..2e04fa6f 100644 --- a/pom.xml +++ b/pom.xml @@ -125,7 +125,6 @@ src/main/resources/static/** src/main/resources/META-INF/spring.factories maven/** - cnaf-mirror-settings.xml sonar-project.properties true diff --git a/travis/build.sh b/travis/build.sh deleted file mode 100644 index f51cf154..00000000 --- a/travis/build.sh +++ /dev/null @@ -1,24 +0,0 @@ -#!/bin/bash -# -# Copyright (c) Istituto Nazionale di Fisica Nucleare, 2014-2023. -# -# Licensed 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. -# - -set -e - -mvn -B clean compile -echo "storm-webdav build completed succesfully" - -mvn -B clean test -echo "storm-webdav tests completed succesfully" diff --git a/travis/install-deps.sh b/travis/install-deps.sh deleted file mode 100644 index 68846397..00000000 --- a/travis/install-deps.sh +++ /dev/null @@ -1,25 +0,0 @@ -#!/bin/bash -# -# Copyright (c) Istituto Nazionale di Fisica Nucleare, 2014-2023. -# -# Licensed 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. -# - -set -ex - -pwd - -sudo apt-get install -y wget -wget https://raw.githubusercontent.com/italiangrid/build-settings/master/maven/cnaf-mirror-settings.xml - -mv cnaf-mirror-settings.xml ~/.m2/settings.xml