diff --git a/build.gradle b/build.gradle index 571b4187..6cd1aa59 100644 --- a/build.gradle +++ b/build.gradle @@ -7,15 +7,15 @@ buildscript { } } plugins { + id 'maven-publish' // https://github.com/researchgate/gradle-release - id 'net.researchgate.release' version '2.8.1' + id 'net.researchgate.release' version '3.0.2' id 'io.codearte.nexus-staging' version '0.30.0' } apply plugin: 'java' apply plugin: 'de.thetaphi.forbiddenapis' apply plugin: 'jacoco' -apply plugin: 'maven' apply plugin: 'signing' apply plugin: 'io.codearte.nexus-staging' @@ -60,7 +60,7 @@ dependencies { } wrapper { - gradleVersion = '6.9.2' + gradleVersion = '7.6' } test { @@ -93,8 +93,9 @@ task javadocJar(type: Jar) { from javadoc } -artifacts { - archives javadocJar, sourcesJar +java { + withJavadocJar() + withSourcesJar() } signing { @@ -106,6 +107,12 @@ signing { sign configurations.archives } +release { + git { + requireBranch.set('master') + } +} + //provide defaults so we do not need to specify them always if (!project.hasProperty('ossrhUsername')) { ext.ossrhUsername = '' @@ -114,52 +121,49 @@ if (!project.hasProperty('ossrhPassword')) { ext.ossrhPassword = '' } -uploadArchives { - repositories { - mavenDeployer { - //noinspection GrUnresolvedAccess - beforeDeployment { MavenDeployment deployment -> signing.signPom(deployment) } - - repository(url: 'https://oss.sonatype.org/service/local/staging/deploy/maven2/') { - authentication(userName: ossrhUsername, password: ossrhPassword) - } - - snapshotRepository(url: 'https://oss.sonatype.org/content/repositories/snapshots/') { - authentication(userName: ossrhUsername, password: ossrhPassword) - } - - pom.project { - name 'CommonCrawl Document Download' - packaging 'jar' - // optionally artifactId can be defined here - description 'Common utilities I find useful in many of my projects.' - url 'https://github.com/centic9/CommonCrawlDocumentDownload' - - scm { - connection 'scm:git@github.com:centic9/CommonCrawlDocumentDownload' - developerConnection 'scm:git@github.com:centic9/CommonCrawlDocumentDownload' - url 'https://github.com/centic9/CommonCrawlDocumentDownload' - } - - licenses { - license { - name 'BSD 2-Clause License' - url 'https://www.opensource.org/licenses/bsd-license.php' - } +publishing { + publications { + maven(MavenPublication) { + from components.java + + pom { + name = 'CommonCrawl Document Download' + description = 'Helper tools to download data from CommonCrawl archives' + url = 'https://github.com/centic9/CommonCrawlDocumentDownload' + licenses { + license { + name = 'BSD 2-Clause "Simplified" License' + url = 'https://github.com/centic9/CommonCrawlDocumentDownload/blob/master/LICENSE.md' + } + } + developers { + developer { + id = 'centic9' + name = 'Dominik Stadler' + } + } + scm { + connection = 'scm:git@github.com:centic9/CommonCrawlDocumentDownload' + developerConnection = 'scm:git@github.com:centic9/CommonCrawlDocumentDownload' + url = 'https://github.com/centic9/CommonCrawlDocumentDownload' + } + } } - - developers { - developer { - id 'centic9 ' - name 'Dominik Stadler' - } + } + repositories { + maven { + // change to point to your repo, e.g. http://my.org/repo + url = layout.buildDirectory.dir('repo') + //url = 'https://oss.sonatype.org/service/local/staging/deploy/maven2/' + // authentication(userName: ossrhUsername, password: ossrhPassword) + /* snapshotRepository(url: 'https://oss.sonatype.org/content/repositories/snapshots/') { + authentication(userName: ossrhUsername, password: ossrhPassword) + } */ } - } } - } } -afterReleaseBuild.dependsOn uploadArchives +//afterReleaseBuild.dependsOn uploadArchives task lookupURLs(type:JavaExec,dependsOn: compileJava) { description = 'Reads the current Common Crawl URL index data and extracts all URLs for interesting mime-types or file extensions' diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index e708b1c0..943f0cbf 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index ec991f9a..f398c33c 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.9.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip +networkTimeout=10000 zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index 1b6c7873..65dcd68d 100755 --- a/gradlew +++ b/gradlew @@ -55,7 +55,7 @@ # Darwin, MinGW, and NonStop. # # (3) This script is generated from the Groovy template -# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt # within the Gradle project. # # You can find Gradle at https://github.com/gradle/gradle/. @@ -80,10 +80,10 @@ do esac done -APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit - -APP_NAME="Gradle" +# This is normally unused +# shellcheck disable=SC2034 APP_BASE_NAME=${0##*/} +APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' @@ -143,12 +143,16 @@ fi if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then case $MAX_FD in #( max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC3045 MAX_FD=$( ulimit -H -n ) || warn "Could not query maximum file descriptor limit" esac case $MAX_FD in #( '' | soft) :;; #( *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC3045 ulimit -n "$MAX_FD" || warn "Could not set maximum file descriptor limit to $MAX_FD" esac @@ -205,6 +209,12 @@ set -- \ org.gradle.wrapper.GradleWrapperMain \ "$@" +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + # Use "xargs" to parse quoted args. # # With -n1 it outputs one arg per line, with the quotes and backslashes removed. diff --git a/gradlew.bat b/gradlew.bat index 107acd32..93e3f59f 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -14,7 +14,7 @@ @rem limitations under the License. @rem -@if "%DEBUG%" == "" @echo off +@if "%DEBUG%"=="" @echo off @rem ########################################################################## @rem @rem Gradle startup script for Windows @@ -25,7 +25,8 @@ if "%OS%"=="Windows_NT" setlocal set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused set APP_BASE_NAME=%~n0 set APP_HOME=%DIRNAME% @@ -40,7 +41,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome set JAVA_EXE=java.exe %JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto execute +if %ERRORLEVEL% equ 0 goto execute echo. echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. @@ -75,13 +76,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar :end @rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="0" goto mainEnd +if %ERRORLEVEL% equ 0 goto mainEnd :fail rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of rem the _cmd.exe /c_ return code! -if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 -exit /b 1 +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% :mainEnd if "%OS%"=="Windows_NT" endlocal