diff --git a/build.gradle b/build.gradle index 92f9609fb..4f7af3156 100644 --- a/build.gradle +++ b/build.gradle @@ -16,9 +16,6 @@ apply plugin: 'application' apply plugin: "org.mini2Dx.parcl" repositories { - flatDir { - dirs 'lib' - } mavenCentral() } @@ -74,18 +71,111 @@ tasks.withType(JavaCompile) { } dependencies { - implementation(fileTree(dir : "lib", include : "*.jar")) + implementation project ('libbuild:J7Zip-modified') // support library in libbuild - // need at least one entry to make references to configuragtion.xxxx work in combination with local lib directory implementation 'org.apache.james:apache-mime4j:0.6' implementation 'org.apache.calcite.avatica:avatica-core:1.13.0' implementation 'org.bouncycastle:bcmail-jdk15on:1.69' + implementation 'org.bouncycastle:bcpkix-jdk15on:1.69' + implementation 'org.bouncycastle:bcprov-jdk15on:1.69' + implementation 'org.bouncycastle:bcutil-jdk15on:1.69' + implementation 'org.apache.calcite:calcite-core:1.18.0' + implementation 'org.apache.calcite:calcite-linq4j:1.18.0' + implementation 'net.sourceforge.jchardet:jchardet:1.0' + implementation 'com.twelvemonkeys.common:common-image:3.3.2' + implementation 'com.twelvemonkeys.common:common-io:3.3.2' + implementation 'com.twelvemonkeys.common:common-lang:3.3.2' implementation 'commons-codec:commons-codec:1.14' + implementation 'org.apache.commons:commons-collections4:4.4' + implementation 'org.apache.commons:commons-compress:1.21' + implementation 'commons-fileupload:commons-fileupload:1.4' + implementation 'commons-io:commons-io:2.7' + implementation 'commons-lang:commons-lang:2.6' + implementation 'org.apache.commons:commons-lang3:3.12.0' + implementation 'commons-logging:commons-logging:1.2' + implementation 'org.apache.commons:commons-math3:3.4.1' + implementation 'org.apache.pdfbox:fontbox:2.0.15' + implementation 'com.google.guava:guava:25.1-jre' + implementation 'com.hazelcast:hazelcast:4.2' + implementation 'org.eclipse.jetty.http2:http2-client:9.4.34.v20201102' + implementation 'org.eclipse.jetty.http2:http2-common:9.4.34.v20201102' + implementation 'org.eclipse.jetty.http2:http2-http-client-transport:9.4.34.v20201102' + implementation 'org.apache.httpcomponents:httpclient:4.5.12' + implementation 'org.apache.httpcomponents:httpcore:4.4.13' + implementation 'org.apache.httpcomponents:httpmime:4.5.12' implementation 'com.ibm.icu:icu4j:63.1' + implementation 'com.twelvemonkeys.imageio:imageio-bmp:3.3.2' + implementation 'com.twelvemonkeys.imageio:imageio-core:3.3.2' + implementation 'com.twelvemonkeys.imageio:imageio-metadata:3.3.2' + implementation 'com.twelvemonkeys.imageio:imageio-tiff:3.3.2' + implementation 'com.fasterxml.jackson.core:jackson-annotations:2.11.2' + implementation 'com.fasterxml.jackson.core:jackson-core:2.11.2' + implementation 'com.fasterxml.jackson.core:jackson-databind:2.11.2' + implementation 'oro:oro:2.0.8' + implementation 'net.jthink:jaudiotagger:2.2.5' + implementation 'jcifs:jcifs:1.3.17' + implementation 'org.slf4j:jcl-over-slf4j:1.7.25' + implementation 'javax.servlet:javax.servlet-api:3.1.0' + implementation 'org.eclipse.jetty:jetty-client:9.4.35.v20201120' + implementation 'org.eclipse.jetty:jetty-continuation:9.4.35.v20201120' + implementation 'org.eclipse.jetty:jetty-deploy:9.4.35.v20201120' + implementation 'org.eclipse.jetty:jetty-http:9.4.35.v20201120' + implementation 'org.eclipse.jetty:jetty-io:9.4.35.v20201120' + implementation 'org.eclipse.jetty:jetty-jmx:9.4.35.v20201120' + implementation 'org.eclipse.jetty:jetty-proxy:9.4.35.v20201120' + implementation 'org.eclipse.jetty:jetty-security:9.4.35.v20201120' + implementation 'org.eclipse.jetty:jetty-server:9.4.35.v20201120' + implementation 'org.eclipse.jetty:jetty-servlet:9.4.35.v20201120' + implementation 'org.eclipse.jetty:jetty-servlets:9.4.35.v20201120' + implementation 'org.eclipse.jetty:jetty-util:9.4.35.v20201120' + implementation 'org.eclipse.jetty:jetty-webapp:9.4.35.v20201120' + implementation 'org.eclipse.jetty:jetty-xml:9.4.35.v20201120' + implementation 'com.jcraft:jsch:0.1.54' + implementation 'com.googlecode.json-simple:json-simple:1.1.1' + implementation 'net.arnx:jsonic:1.3.10' + implementation 'org.jsoup:jsoup:1.14.2' + implementation 'org.jwat:jwat-archive-common:1.1.1' + implementation 'org.jwat:jwat-common:1.1.1' + implementation 'org.jwat:jwat-gzip:1.1.1' + implementation 'org.jwat:jwat-warc:1.1.1' + implementation 'com.cybozu.labs:langdetect:1.1-20120112' + implementation 'org.slf4j:log4j-over-slf4j:1.7.32' + implementation 'org.slf4j:jcl-over-slf4j:1.7.25' + implementation 'com.drewnoakes:metadata-extractor:2.11.0' + implementation 'io.dropwizard.metrics:metrics-core:3.2.2' + implementation 'io.dropwizard.metrics:metrics-jmx:4.1.5' + implementation 'io.opentracing:opentracing-api:0.33.0' + implementation 'io.opentracing:opentracing-noop:0.33.0' + implementation 'io.opentracing:opentracing-util:0.33.0' + implementation 'org.apache.pdfbox:pdfbox:2.0.15' + implementation 'org.apache.poi:poi:3.17' + implementation 'org.apache.poi:poi-scratchpad:3.17' + implementation 'org.rrd4j:rrd4j:3.2' + implementation 'org.slf4j:slf4j-api:1.7.32' + implementation 'org.slf4j:slf4j-jdk14:1.7.32' + implementation 'org.apache.solr:solr-core:8.8.1' + implementation 'org.apache.solr:solr-solrj:8.8.1' + implementation 'org.locationtech.spatial4j:spatial4j:0.6' + implementation 'org.codehaus.woodstox:stax2-api:3.1.4' + implementation 'org.bitlet:weupnp:0.1.4' + implementation 'org.codehaus.woodstox:woodstox-core-asl:4.4.1' + implementation 'xml-apis:xml-apis:1.4.01' + implementation 'com.adobe.xmp:xmpcore:5.1.3' + implementation 'org.tukaani:xz:1.8' + implementation 'org.apache.zookeeper:zookeeper:3.4.14' testImplementation('junit:junit:4.13.2') } +// exclude some unused/not needed automatic dependency imports +configurations.implementation { + exclude group: 'com.google.code.findbugs', module: 'jsr305' + exclude group: 'org.eclipse.jetty', module: 'jetty-alpn-client' + exclude group: 'org.eclipse.jetty', module: 'jetty-alpn-java-client' + exclude group: 'org.eclipse.jetty', module: 'jetty-alpn-java-server' + exclude group: 'org.eclipse.jetty', module: 'jetty-alpn-server' +} + // output to lib/yacycore.jar (like with ant with downside by determine class-path) jar { archiveFileName = 'yacycore.jar' @@ -93,7 +183,7 @@ jar { manifest { attributes( "Main-Class": mainClassName , - "Class-Path": configurations.compileClasspath.collect { it.name }.join(' ') + "Class-Path": configurations.runtimeClasspath.collect { it.name }.join(' ') ) } } @@ -102,6 +192,7 @@ shadowJar.zip64 = true // saw build error: Execution failed for task ':shadowJar // mimic current config with dependencies in lib directory // @TODO: maybe removed after complete Gradle migration +/** task copyDependenciesToLib(type: Copy) { def destination = project.file("lib") into destination @@ -113,7 +204,8 @@ task copyDependenciesToLib(type: Copy) { } build.dependsOn(copyDependenciesToLib) } - +*/ + // runs the support tool which creates gitbuildnumber.properties from info of local git repository task runGitComInf(type: JavaExec) { classpath = files('libbuild/GitComInf-all.jar') diff --git a/libbuild/J7Zip-modified/.gitignore b/libbuild/J7Zip-modified/.gitignore index 4c49457dd..118023bf0 100755 --- a/libbuild/J7Zip-modified/.gitignore +++ b/libbuild/J7Zip-modified/.gitignore @@ -3,3 +3,4 @@ /.project /.settings/ /.gitignore +/build/ diff --git a/libbuild/J7Zip-modified/build.gradle b/libbuild/J7Zip-modified/build.gradle new file mode 100644 index 000000000..9b6c9de16 --- /dev/null +++ b/libbuild/J7Zip-modified/build.gradle @@ -0,0 +1,24 @@ + + +plugins { + id 'java-library' +} + +/** Port of older support library to be build with Gradle +previous Maven Info + net.yacy.extlib + J7Zip-modified + jar + 1.02 + J7Zip library for YaCy sevenzipParser (not available in external maven repository) +*/ + +sourceSets { + main { + java { + srcDirs = ['src'] + } + } +} + +version = '1.02' diff --git a/libbuild/J7Zip-modified/gradle/wrapper/gradle-wrapper.jar b/libbuild/J7Zip-modified/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 000000000..7454180f2 Binary files /dev/null and b/libbuild/J7Zip-modified/gradle/wrapper/gradle-wrapper.jar differ diff --git a/libbuild/J7Zip-modified/gradle/wrapper/gradle-wrapper.properties b/libbuild/J7Zip-modified/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 000000000..e750102e0 --- /dev/null +++ b/libbuild/J7Zip-modified/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,5 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-7.3-bin.zip +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/libbuild/J7Zip-modified/gradlew b/libbuild/J7Zip-modified/gradlew new file mode 100644 index 000000000..c53aefaa5 --- /dev/null +++ b/libbuild/J7Zip-modified/gradlew @@ -0,0 +1,234 @@ +#!/bin/sh + +# +# Copyright © 2015-2021 the original authors. +# +# 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 +# +# https://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. +# + +############################################################################## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# 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 +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# +############################################################################## + +# Attempt to set APP_HOME + +# Resolve links: $0 may be a link +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac +done + +APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit + +APP_NAME="Gradle" +APP_BASE_NAME=${0##*/} + +# 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"' + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD=maximum + +warn () { + echo "$*" +} >&2 + +die () { + echo + echo "$*" + echo + exit 1 +} >&2 + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD=$JAVA_HOME/jre/sh/java + else + JAVACMD=$JAVA_HOME/bin/java + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD=java + which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." +fi + +# Increase the maximum file descriptors if we can. +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac +fi + +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. + +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + + # Now convert the arguments - kludge to limit ourselves to /bin/sh + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) + fi + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg + done +fi + +# Collect all arguments for the java command; +# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of +# shell script including quotes and variable substitutions, so put them in +# double quotes to make sure that they get re-expanded; and +# * put everything else in single quotes, so that it's not re-expanded. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' + +exec "$JAVACMD" "$@" diff --git a/libbuild/J7Zip-modified/gradlew.bat b/libbuild/J7Zip-modified/gradlew.bat new file mode 100644 index 000000000..107acd32c --- /dev/null +++ b/libbuild/J7Zip-modified/gradlew.bat @@ -0,0 +1,89 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem + +@if "%DEBUG%" == "" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if "%ERRORLEVEL%" == "0" goto execute + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="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 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/libbuild/J7Zip-modified/settings.gradle b/libbuild/J7Zip-modified/settings.gradle new file mode 100644 index 000000000..6ba1b9c00 --- /dev/null +++ b/libbuild/J7Zip-modified/settings.gradle @@ -0,0 +1,11 @@ +/* + * This file was generated by the Gradle 'init' task. + * + * The settings file is used to specify which projects to include in your build. + * + * Detailed information about configuring a multi-project build in Gradle can be found + * in the user manual at https://docs.gradle.org/7.3/userguide/multi_project_builds.html + */ + +rootProject.name = 'J7Zip-modified' + diff --git a/settings.gradle b/settings.gradle index 528b2720a..da552e08c 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1 +1,3 @@ rootProject.name = 'yacycore' + +include ('libbuild:J7Zip-modified')