Distributed Peer-to-Peer Web Search Engine and Intranet Search Appliance
Java decentralizedintranet-searchintranet-search-enginep2pp2p-networkprivacyprivacy-protectionsearch-enginesearchenginewebweb-search-enginewebsearchwebseearch-engine
Some Gradle build script cleanup
reger246c5b28291930
diff --git a/.classpath b/.classpathindex 74026e4dc..4082ac44a 100644--- a/.classpath+++ b/.classpath@@ -126,6 +126,6 @@<classpathentry kind="src" path="htroot/yacy"/><classpathentry kind="src" path="source"/><classpathentry kind="src" path="test/java"/>- <classpathentry kind="lib" path="lib/J7Zip-modified.jar"/>+ <classpathentry kind="lib" path="lib/J7Zip-modified-1.0.2.jar"/><classpathentry kind="output" path="gen"/></classpath>diff --git a/README.md b/README.mdindex d74c16792..a2df7762c 100644--- a/README.md+++ b/README.md@@ -1,6 +1,6 @@# YaCy[](https://gitter.im/yacy/yacy_search_server?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)-[](https://travis-ci.org/yacy/yacy_search_server)+[](https://travis-ci.com/yacy/yacy_search_server)[](https://heroku.com/deploy)diff --git a/build.gradle b/build.gradleindex 84949fdc3..fa3183bac 100644--- a/build.gradle+++ b/build.gradle@@ -82,10 +82,10 @@ tasks.withType(JavaCompile) {}dependencies {- // used by YaCy code+// used by YaCy code// implementation project ('libbuild:J7Zip-modified') // support library in libbuild (fyi: downside groovy/gradle use internal *.class instead of *.jar = trouble in task packageDist)-// implementation 'net.yacy.extlib:J7Zip-modified:1.02' // alternatively support library from mavenLocal() repo (use publishToMavenLocal in subproject first)- implementation fileTree(dir: 'lib', include: 'J7Zip-modified.jar') // switched back to use local lib/jar for this one library (avoiding sub-project execution w/o need)+// implementation 'net.yacy.extlib:J7Zip-modified:1.0.2' // alternatively support library from mavenLocal() repo (use publishToMavenLocal in subproject first)+ implementation fileTree(dir: 'lib', include: 'J7Zip-modified-1.0.2.jar') // switched back to use local lib/jar for this one library (avoiding sub-project execution w/o need)implementation group: 'org.bouncycastle', name: 'bcmail-jdk15on', version: '1.69'implementation group: 'org.apache.commons', name: 'commons-compress', version: '1.21'implementation group: 'commons-fileupload', name: 'commons-fileupload', version: '1.4'@@ -417,7 +417,7 @@ task distWinInstaller (dependsOn:['copyFilesToDistDir','copyDependenciesForDistr// runs the support tool which creates gitbuildnumber.properties from info of local git repositorytask storeGitComInf(type: JavaExec) {mustRunAfter(build)- classpath = files('libbuild/GitComInf-all.jar')+ classpath = files('libbuild/GitComInf-1.0-all.jar')args = [project.projectDir.getPath(), project.projectDir.getPath() + "/gitbuildnumber.properties"]mainClass = 'GitComInf'}diff --git a/build.xml b/build.xmlindex 560bbb828..f22d91dd6 100644--- a/build.xml+++ b/build.xml@@ -170,7 +170,7 @@<!-- when changing paths here, please also update the paths in /addon/YaCy.app/Contents/Info.plist --><path id="project.class.path"><pathelement location="${build}" />- <pathelement location="${lib}/J7Zip-modified.jar" />+ <pathelement location="${lib}/J7Zip-modified-1.0.2.jar" /><pathelement location="${lib}/apache-mime4j-0.6.jar" /><pathelement location="${lib}/avatica-core-1.13.0.jar" /><pathelement location="${lib}/bcmail-jdk15on-1.69.jar" />diff --git a/lib/J7Zip-modified-1.0.2.jar b/lib/J7Zip-modified-1.0.2.jarnew file mode 100644index 000000000..c075f6f63Binary files /dev/null and b/lib/J7Zip-modified-1.0.2.jar differdiff --git a/lib/J7Zip-modified.jar b/lib/J7Zip-modified.jardeleted file mode 100644index f6bee9dcc..000000000Binary files a/lib/J7Zip-modified.jar and /dev/null differdiff --git a/libbuild/GitComInf-all.jar b/libbuild/GitComInf-1.0-all.jarsimilarity index 99%rename from libbuild/GitComInf-all.jarrename to libbuild/GitComInf-1.0-all.jarindex 91f5360bd..7c6e803d5 100644Binary files a/libbuild/GitComInf-all.jar and b/libbuild/GitComInf-1.0-all.jar differdiff --git a/libbuild/GitComInf/build.gradle b/libbuild/GitComInf/build.gradleindex 0fa757929..f71307792 100644--- a/libbuild/GitComInf/build.gradle+++ b/libbuild/GitComInf/build.gradle@@ -14,6 +14,7 @@ repositories {}mainClassName = "GitComInf"+version = "1.0"tasks.withType(JavaCompile) {options.encoding = 'UTF-8'@@ -35,10 +36,12 @@ jar {}*/// copy fat-jar to deploy location ..-task installJar (type:Copy, group: 'distribution') {- description 'Install jar in libbuild directory'- from 'build/libs'- include 'GitComInf-all.jar'+task installJarToRoot (type: Copy, dependsOn: shadowJar) {+ description 'Install jar in libbuild directory'+ from shadowJar.archiveFileinto project.projectDir.getParent()+ doLast {+ logger.lifecycle ("copied jar to ${projectDir.getParent()}/" + shadowJar.archiveFileName.get())+ }}diff --git a/libbuild/J7Zip-modified/build.gradle b/libbuild/J7Zip-modified/build.gradleindex e5a65da25..3599cb594 100644--- a/libbuild/J7Zip-modified/build.gradle+++ b/libbuild/J7Zip-modified/build.gradle@@ -1,5 +1,4 @@-plugins {id 'java-library'id 'maven-publish'@@ -22,7 +21,7 @@ sourceSets {}}-version = '1.02'+version = '1.0.2'group = 'net.yacy.extlib'publishing {@@ -62,3 +61,12 @@ publishing {}}+// copy jar to yacycore /lib directory (used as dependencies)+task installJarToRoot (type: Copy, dependsOn: jar) {+ from jar.archiveFile+ into "${projectDir.getParent()}/../lib"+ doLast {+ logger.lifecycle ("copied jar to ${projectDir.getParent()}/../lib/" + jar.archiveFileName.get())+ }+}+diff --git a/libbuild/build.gradle b/libbuild/build.gradlenew file mode 100644index 000000000..1dc185e3c--- /dev/null+++ b/libbuild/build.gradle@@ -0,0 +1,37 @@++allprojects {++ group = 'net.yacy.libbuild'++ repositories {+ mavenCentral()+ }+}++subprojects {+ apply plugin: 'java'+}++version = "1.0"+description = "Builds subprojects for yacycore and installs jars -> task: installExtLibJars"++dependencies {+ project("GitComInf")+ project("J7Zip-modified")+}++//--- build aliases : define a synonym here if you want a shortcut to run multiple targets+// workaround to run storeGitComInf after a build without adding arbitray dependencies+// this makes sure gitbuildnumber.properties is availabel and up-to-date+def buildAliases = [+ 'installExtLibJars' : ["J7Zip-modified:installJarToRoot","GitComInf:installJarToRoot"]+ ]+def expandedTaskList = []+gradle.startParameter.taskNames.each {+ expandedTaskList << (buildAliases[it] ? buildAliases[it] : it)+}+gradle.startParameter.taskNames = expandedTaskList.flatten()++task installExtLibJars ( group: 'build') {+ // we use above startParameter to install GitComInf.jar, as the shadow (uber) jar is used (not avail in normal subproject properties)+}\ No newline at end of filediff --git a/libbuild/gradle.properties b/libbuild/gradle.propertiesnew file mode 100644index 000000000..3ecbaebf0--- /dev/null+++ b/libbuild/gradle.properties@@ -0,0 +1,7 @@+# Generally it is better to set the version only for release builds, build time+# from command line using -Pversion=1.0+#+# Only use SNAPSHOT versions if you need to contribute your binaries to a+# local Maven project.+version=1.0+diff --git a/libbuild/gradlew b/libbuild/gradlewnew file mode 100644index 000000000..c53aefaa5--- /dev/null+++ b/libbuild/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/gradlew.bat b/libbuild/gradlew.batnew file mode 100644index 000000000..107acd32c--- /dev/null+++ b/libbuild/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++:omegadiff --git a/libbuild/settings.gradle b/libbuild/settings.gradlenew file mode 100644index 000000000..a02c53a39--- /dev/null+++ b/libbuild/settings.gradle@@ -0,0 +1,5 @@++rootProject.name = 'libbuild'++include 'GitComInf'+include 'J7Zip-modified'\ No newline at end of file