This is an automated email from the ASF dual-hosted git repository.
lewismc pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nutch.git
The following commit(s) were added to refs/heads/master by this push:
new 85fea6e46 NUTCH-3024 Remove flaky 'dependency check' target (#795)
85fea6e46 is described below
commit 85fea6e46475cb74c61c13193fff008a7e7e6a37
Author: Lewis John McGibbney <[email protected]>
AuthorDate: Fri Nov 24 12:33:50 2023 -0800
NUTCH-3024 Remove flaky 'dependency check' target (#795)
---
.github/workflows/dependency-check.yml | 37 --------------------------
build.xml | 47 ----------------------------------
2 files changed, 84 deletions(-)
diff --git a/.github/workflows/dependency-check.yml
b/.github/workflows/dependency-check.yml
deleted file mode 100644
index f07f746a0..000000000
--- a/.github/workflows/dependency-check.yml
+++ /dev/null
@@ -1,37 +0,0 @@
-# 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: master pr build
-
-on:
- schedule:
- - cron: '0 0 * * *' # every day at midnight
-
-jobs:
- dependency-check:
- strategy:
- matrix:
- java: ['11']
- os: [ubuntu-latest]
- runs-on: ${{ matrix.os }}
- steps:
- - uses: actions/checkout@v4
- - name: Set up JDK ${{ matrix.java }}
- uses: actions/setup-java@v3
- with:
- java-version: ${{ matrix.java }}
- distribution: 'temurin'
- - name: Dependency check
- run: ant clean dependency-check -buildfile build.xml
diff --git a/build.xml b/build.xml
index dd9797302..70c8e8a9e 100644
--- a/build.xml
+++ b/build.xml
@@ -38,10 +38,6 @@
<property name="maven-javadoc-jar"
value="${release.dir}/${artifactId}-${version}-javadoc.jar" />
<property name="maven-sources-jar"
value="${release.dir}/${artifactId}-${version}-sources.jar" />
- <property name="dependency-check-ant.version" value="8.4.2" />
- <property name="dependency-check-ant.home"
value="${ivy.dir}/dependency-check-ant" />
- <property name="dependency-check-ant.jar"
value="${dependency-check-ant.home}/dependency-check-ant.jar" />
-
<property environment="env"/>
<property name="spotbugs.version" value="4.2.0" />
@@ -615,49 +611,6 @@
</fail>
</target>
- <!-- Check dependencies for security vulnerabilities
-->
- <target name="dependency-check-ant-download" description="--> download
dependency-check-ant jar">
- <available file="${dependency-check-ant.jar}"
property="dependency-check-ant.jar.found"/>
- <antcall target="dependency-check-ant-download-unchecked"/>
- </target>
-
- <target name="dependency-check-ant-download-unchecked"
unless="dependency-check-ant.jar.found"
- description="--> downloads the dependency-check-ant binary
(dependency-check-ant-*.zip).">
- <get
src="https://github.com/jeremylong/DependencyCheck/releases/download/v${dependency-check-ant.version}/dependency-check-ant-${dependency-check-ant.version}-release.zip";
-
dest="${ivy.dir}/dependency-check-ant-${dependency-check-ant.version}-release.zip"
usetimestamp="false" />
-
- <unzip
src="${ivy.dir}/dependency-check-ant-${dependency-check-ant.version}-release.zip"
- dest="${ivy.dir}">
- </unzip>
-
- <delete
file="${ivy.dir}/dependency-check-ant-${dependency-check-ant.version}-release.zip"
/>
- </target>
-
- <path id="dependency-check-ant.path">
- <pathelement
location="${dependency-check-ant.home}/dependency-check-ant.jar"/>
- <fileset dir="${dependency-check-ant.home}/lib">
- <include name="*.jar"/>
- </fileset>
- </path>
-
- <target name="dependency-check" depends="jar, compile-plugins,
dependency-check-ant-download" description="--> check dependencies for security
vulnerabilities">
- <taskdef resource="dependency-check-taskdefs.properties">
- <classpath refid="dependency-check-ant.path" />
- </taskdef>
- <dependency-check projectname="${name}"
- reportoutputdirectory="${dependency-check-ant.home}"
- reportformat="ALL"
- assemblyAnalyzerEnabled="false"
- failBuildOnCVSS="1">
- <suppressionfile
path="${dependency-check-ant.home}/dependency-check-suppressions.xml" />
- <retirejsFilter regex="copyright.*jeremy long" />
- <fileset dir="${build.dir}">
- <include name="lib/*.jar"/>
- <include name="plugins/*/*.jar"/>
- </fileset>
- </dependency-check>
- </target>
-
<!-- ================================================================== -->
<!-- Documentation -->
<!-- ================================================================== -->
