diff --git a/.gradle/7.1/dependencies-accessors/dependencies-accessors.lock b/.gradle/7.1/dependencies-accessors/dependencies-accessors.lock new file mode 100644 index 000000000..0b6609b89 Binary files /dev/null and b/.gradle/7.1/dependencies-accessors/dependencies-accessors.lock differ diff --git a/.gradle/7.1/dependencies-accessors/gc.properties b/.gradle/7.1/dependencies-accessors/gc.properties new file mode 100644 index 000000000..e69de29bb diff --git a/.gradle/7.1/executionHistory/executionHistory.bin b/.gradle/7.1/executionHistory/executionHistory.bin new file mode 100644 index 000000000..b16bc7438 Binary files /dev/null and b/.gradle/7.1/executionHistory/executionHistory.bin differ diff --git a/.gradle/7.1/executionHistory/executionHistory.lock b/.gradle/7.1/executionHistory/executionHistory.lock new file mode 100644 index 000000000..cac2c59ba Binary files /dev/null and b/.gradle/7.1/executionHistory/executionHistory.lock differ diff --git a/.gradle/7.1/fileChanges/last-build.bin b/.gradle/7.1/fileChanges/last-build.bin new file mode 100644 index 000000000..f76dd238a Binary files /dev/null and b/.gradle/7.1/fileChanges/last-build.bin differ diff --git a/.gradle/7.1/fileHashes/fileHashes.bin b/.gradle/7.1/fileHashes/fileHashes.bin new file mode 100644 index 000000000..d941ea5c4 Binary files /dev/null and b/.gradle/7.1/fileHashes/fileHashes.bin differ diff --git a/.gradle/7.1/fileHashes/fileHashes.lock b/.gradle/7.1/fileHashes/fileHashes.lock new file mode 100644 index 000000000..b7c457f53 Binary files /dev/null and b/.gradle/7.1/fileHashes/fileHashes.lock differ diff --git a/.gradle/7.1/fileHashes/resourceHashesCache.bin b/.gradle/7.1/fileHashes/resourceHashesCache.bin new file mode 100644 index 000000000..30d488d6c Binary files /dev/null and b/.gradle/7.1/fileHashes/resourceHashesCache.bin differ diff --git a/.gradle/7.1/gc.properties b/.gradle/7.1/gc.properties new file mode 100644 index 000000000..e69de29bb diff --git a/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/.gradle/buildOutputCleanup/buildOutputCleanup.lock new file mode 100644 index 000000000..7391ed3bf Binary files /dev/null and b/.gradle/buildOutputCleanup/buildOutputCleanup.lock differ diff --git a/.gradle/buildOutputCleanup/cache.properties b/.gradle/buildOutputCleanup/cache.properties new file mode 100644 index 000000000..3b26829ac --- /dev/null +++ b/.gradle/buildOutputCleanup/cache.properties @@ -0,0 +1,2 @@ +#Wed Jul 14 11:41:31 CEST 2021 +gradle.version=7.1 diff --git a/.gradle/buildOutputCleanup/outputFiles.bin b/.gradle/buildOutputCleanup/outputFiles.bin new file mode 100644 index 000000000..4b78a34e2 Binary files /dev/null and b/.gradle/buildOutputCleanup/outputFiles.bin differ diff --git a/.gradle/checksums/checksums.lock b/.gradle/checksums/checksums.lock new file mode 100644 index 000000000..b85dae70a Binary files /dev/null and b/.gradle/checksums/checksums.lock differ diff --git a/.gradle/checksums/md5-checksums.bin b/.gradle/checksums/md5-checksums.bin new file mode 100644 index 000000000..40ee77082 Binary files /dev/null and b/.gradle/checksums/md5-checksums.bin differ diff --git a/.gradle/checksums/sha1-checksums.bin b/.gradle/checksums/sha1-checksums.bin new file mode 100644 index 000000000..7185a45dd Binary files /dev/null and b/.gradle/checksums/sha1-checksums.bin differ diff --git a/.gradle/vcs-1/gc.properties b/.gradle/vcs-1/gc.properties new file mode 100644 index 000000000..e69de29bb diff --git a/assembly.xml b/assembly.xml deleted file mode 100644 index 0b5c1c857..000000000 --- a/assembly.xml +++ /dev/null @@ -1,91 +0,0 @@ - - - - bindistribution - - - tar.gz - - - - - yacy - - - - addon - addon - - - bin - bin - - - defaults - defaults - - - dictionaries - dictionaries - - - htroot - htroot - - - langdetect - langdetect - - - locales - locales - - - skins - skins - - - vocabularies - vocabularies - - - ${basedir} - - *.bat - *.sh - yacy.* - readme.txt - gpl.txt - lgpl21.txt - AUTHORS - COPYRIGHT - NOTICE - - . - - - - - - - true - - net.yacy:yacycore - - runtime - lib - ${artifact.artifactId}.${artifact.extension} - - - - false - false - runtime - lib - - - - \ No newline at end of file diff --git a/build.gradle b/build.gradle new file mode 100644 index 000000000..38cb375f8 --- /dev/null +++ b/build.gradle @@ -0,0 +1,55 @@ +plugins { + id 'java' + id 'maven-publish' + id 'com.github.johnrengelman.shadow' version '5.1.0' +} + +apply plugin: 'java' +//apply plugin: 'maven' +apply plugin: 'eclipse' +apply plugin: 'application' + +repositories { + flatDir { + dirs 'lib' + } +} + +sourceSets { + main { + java { + srcDirs = ['source'] + } + } +} + +group = 'net.yacy' +version = '1.925' +description = 'YaCy Search Server' +java.sourceCompatibility = JavaVersion.VERSION_1_8 +java.targetCompatibility = JavaVersion.VERSION_1_8 + +mainClassName = "net.yacy.yacy" +applicationDefaultJvmArgs = ["-Xmx1024m"] + +jar { + manifest { + attributes 'Main-Class': 'net.yacy.grid.mcp.MCP' + } +} + +publishing { + publications { + maven(MavenPublication) { + from(components.java) + } + } +} + +tasks.withType(JavaCompile) { + options.encoding = 'UTF-8' +} + +dependencies { + implementation(fileTree("lib")) +} \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 000000000..7454180f2 Binary files /dev/null and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 000000000..69a971507 --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,5 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-7.1-bin.zip +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew new file mode 100755 index 000000000..744e882ed --- /dev/null +++ b/gradlew @@ -0,0 +1,185 @@ +#!/usr/bin/env sh + +# +# Copyright 2015 the original author or 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 UN*X +## +############################################################################## + +# Attempt to set APP_HOME +# Resolve links: $0 may be a link +PRG="$0" +# Need this for relative symlinks. +while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG=`dirname "$PRG"`"/$link" + fi +done +SAVED="`pwd`" +cd "`dirname \"$PRG\"`/" >/dev/null +APP_HOME="`pwd -P`" +cd "$SAVED" >/dev/null + +APP_NAME="Gradle" +APP_BASE_NAME=`basename "$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 "$*" +} + +die () { + echo + echo "$*" + echo + exit 1 +} + +# 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" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then + MAX_FD_LIMIT=`ulimit -H -n` + if [ $? -eq 0 ] ; then + if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then + MAX_FD="$MAX_FD_LIMIT" + fi + ulimit -n $MAX_FD + if [ $? -ne 0 ] ; then + warn "Could not set maximum file descriptor limit: $MAX_FD" + fi + else + warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" + fi +fi + +# For Darwin, add options to specify how the application appears in the dock +if $darwin; then + GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" +fi + +# For Cygwin or MSYS, switch paths to Windows format before running java +if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then + APP_HOME=`cygpath --path --mixed "$APP_HOME"` + CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` + + JAVACMD=`cygpath --unix "$JAVACMD"` + + # We build the pattern for arguments to be converted via cygpath + ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` + SEP="" + for dir in $ROOTDIRSRAW ; do + ROOTDIRS="$ROOTDIRS$SEP$dir" + SEP="|" + done + OURCYGPATTERN="(^($ROOTDIRS))" + # Add a user-defined pattern to the cygpath arguments + if [ "$GRADLE_CYGPATTERN" != "" ] ; then + OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" + fi + # Now convert the arguments - kludge to limit ourselves to /bin/sh + i=0 + for arg in "$@" ; do + CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` + CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option + + if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition + eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` + else + eval `echo args$i`="\"$arg\"" + fi + i=`expr $i + 1` + done + case $i in + 0) set -- ;; + 1) set -- "$args0" ;; + 2) set -- "$args0" "$args1" ;; + 3) set -- "$args0" "$args1" "$args2" ;; + 4) set -- "$args0" "$args1" "$args2" "$args3" ;; + 5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; + 6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; + 7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; + 8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; + 9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; + esac +fi + +# Escape application args +save () { + for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done + echo " " +} +APP_ARGS=`save "$@"` + +# Collect all arguments for the java command, following the shell quoting and substitution rules +eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" + +exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat new file mode 100644 index 000000000..ac1b06f93 --- /dev/null +++ b/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/pom.xml b/libbuild/pom.xml deleted file mode 100644 index 0d84143e5..000000000 --- a/libbuild/pom.xml +++ /dev/null @@ -1,32 +0,0 @@ - - 4.0.0 - - net.yacy - extlib - 1.0 - pom - YaCy - Build Library Utility - build artifacts/jars needed to compile and run YaCy and the main YaCy search server - - http://www.yacy.net - - - scm:git:https://github.com/yacy/yacy_search_server.git - https://github.com/yacy/yacy_search_server - - - - GitRevMavenTask - J7Zip-modified - - .. - - - - UTF-8 - 1.7 - 1.7 - - - diff --git a/pom.xml b/pom.xml deleted file mode 100644 index 61df7f170..000000000 --- a/pom.xml +++ /dev/null @@ -1,405 +0,0 @@ - - 4.0.0 - - net.yacy - yacycore - 1.922 - jar - YaCy - a Peer to Peer Web Search Engine - YaCy Search Server - http://www.yacy.net - - YaCy Bugtracker - https://github.com/yacy/yacy_search_server/issues - - - scm:git:https://github.com/yacy/yacy_search_server.git - https://github.com/yacy/yacy_search_server - - - - GNU General Public License - http://www.gnu.org/licenses/gpl-2.0 - - - - - Michael Peter Christen - - - - - UTF-8 - 1.8 - 1.8 - - 8.8.1 - - 9.4.35.v20201120 - - - ${DSTAMP} - yacy_v${project.version}_${DSTAMP}_${releaseNr}.tar.gz - ${project.version} - ${releaseNr} - . - false - /etc/init.d/yacy restart - - - - source - test/java - yacycore - - - - - org.apache.maven.plugins - maven-war-plugin - 2.6 - - htroot - - - - - org.apache.maven.plugins - maven-compiler-plugin - 3.7.0 - - - - net/yacy/peers/operation/*.java - - ${maven.compiler.source} - ${maven.compiler.target} - - - - - org.apache.maven.plugins - maven-jar-plugin - 2.6 - - - - net.yacy.yacy - true - true - - - ${project.version}-${releaseNr} - - - - - - - maven-clean-plugin - 2.6.1 - - - - - htroot - - **/*.class - - - - - test/DATA - - - - - - - - maven-antrun-plugin - 1.8 - - - compile-htroot - compile - - - - - - - - - - run - - - - - - - org.apache.maven.plugins - maven-javadoc-plugin - 2.10.4 - - javadoc - true - true - true - UTF-8 - UTF-8 - YaCy API: javadoc documentation - - ${project.build.directory}/*.java - - false - - - - - org.codehaus.mojo - templating-maven-plugin - 1.0.0 - - - filter-src - - filter-sources - - - - ${basedir}/source/net/yacy/peers/operation - ${project.build.directory}/generated-sources/java/net/yacy/peers/operation - - - - - - - - - - - - - - - - no-git - - - .git - - - - - 9000 - - - - git-rev-number - - - - .git - - - - - - - net.yacy - maven-plugin-gitrevisionnumber - 1.1 - - - initialize - - create - - - - - - - - - - - release-profile - - - - maven-assembly-plugin - 2.6 - - - assembly.xml - - yacy_v${project.version}_${DSTAMP}_${releaseNr} - RELEASE - false - - - - package - - single - - - - - - org.apache.maven.plugins - maven-source-plugin - 3.0.1 - - - org.apache.maven.plugins - maven-deploy-plugin - 2.8.2 - - - - - - - report - - - - org.owasp - dependency-check-maven - 1.4.5 - - - verify - - check - - - - - - org.apache.maven.plugins - maven-project-info-reports-plugin - 2.9 - - - - - - - org.owasp - dependency-check-maven - 1.4.5 - - - - - - - - - - jaudiotagger-repository - https://dl.bintray.com/ijabz/maven - - - - - org.tukaanixz1.8 - com.drewnoakesmetadata-extractor2.11.0jar - com.googlecode.json-simplejson-simple1.1.1 - com.ibm.icuicu4j63.1jar - com.jcraftjsch0.1.54jar - com.twelvemonkeys.imageioimageio-bmp3.3.2jar - com.twelvemonkeys.imageioimageio-tiff3.3.2jar - com.youcruit.com.cybozu.labslangdetect1.1.2-20151117 - commons-codeccommons-codec1.14jar - commons-fileuploadcommons-fileupload1.4jar - commons-iocommons-io2.7jar - commons-langcommons-lang2.6 - junitjunit4.13.1 - net.jthinkjaudiotagger2.2.5 - net.sourceforge.jchardetjchardet1.0 - net.yacy.extlibJ7Zip-modified1.02 - org.apache.commonscommons-compress1.20jar - org.apache.httpcomponentshttpmime4.5.12jar - org.apache.pdfboxpdfbox2.0.15jar - org.apache.poipoi-scratchpad3.17jar - org.apache.poipoi3.17jar - org.apache.solrsolr-core${solr.version} - org.apache.solrsolr-solrj${solr.version} - org.bitletweupnp0.1.4 - org.bouncycastlebcmail-jdk15on1.60 - org.bouncycastlebcpkix-jdk15on1.60 - org.bouncycastlebcprov-jdk15on1.60 - org.eclipse.jettyjetty-continuation${jetty.version} - org.eclipse.jettyjetty-deploy${jetty.version} - org.eclipse.jettyjetty-http${jetty.version} - org.eclipse.jettyjetty-io${jetty.version} - org.eclipse.jettyjetty-jmx${jetty.version} - org.eclipse.jettyjetty-proxy${jetty.version} - org.eclipse.jettyjetty-security${jetty.version} - org.eclipse.jettyjetty-server${jetty.version} - org.eclipse.jettyjetty-servlet${jetty.version} - org.eclipse.jettyjetty-servlets${jetty.version} - org.eclipse.jettyjetty-util${jetty.version} - org.eclipse.jettyjetty-webapp${jetty.version} - org.eclipse.jettyjetty-xml${jetty.version} - org.hamcresthamcrest-library2.2 - org.hamcresthamcrest2.2 - org.jsoupjsoup1.12.1jar - org.jwatjwat-warc1.1.1jar - org.samba.jcifsjcifs1.3.3 - org.slf4jjcl-over-slf4j1.7.25jar - org.slf4jlog4j-over-slf4j1.7.25jar - org.slf4jslf4j-jdk141.7.25jar - orooro2.0.8 - saxsax2.0.1 - - diff --git a/settings.gradle b/settings.gradle new file mode 100644 index 000000000..528b2720a --- /dev/null +++ b/settings.gradle @@ -0,0 +1 @@ +rootProject.name = 'yacycore'