Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
dariah
search-commons
Commits
d6dd6a38
Commit
d6dd6a38
authored
May 07, 2020
by
Gradl, Tobias
Browse files
Merging
parents
2e7bc5da
bea31cf3
Pipeline
#15413
canceled with stages
in 2 minutes and 10 seconds
Changes
49
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
.gitignore
View file @
d6dd6a38
# ---> Java
*.class
# Mobile Tools for Java (J2ME)
.mtj.tmp/
# Package Files #
*.jar
*.war
*.ear
# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
hs_err_pid*
# ---> Eclipse
*.pydevproject
### Eclipse ###
.metadata
.gradle
bin/
tmp/
*.tmp
...
...
@@ -25,9 +9,7 @@ tmp/
local.properties
.settings/
.loadpath
# Eclipse Core
.project
.recommenders
# External tool builders
.externalToolBuilders/
...
...
@@ -35,22 +17,100 @@ local.properties
# Locally stored "Eclipse launch configurations"
*.launch
# CDT-specific
# PyDev specific (Python IDE for Eclipse)
*.pydevproject
# CDT-specific (C/C++ Development Tooling)
.cproject
#
J
DT-
specific (Eclipse Java Development T
ools
)
.
classpath
#
C
DT-
autot
ools
.
autotools
# Java annotation processor (APT)
.factorypath
# PDT-specific
# PDT-specific
(PHP Development Tools)
.buildpath
# sbteclipse plugin
.target
# Tern plugin
.tern-project
# TeXlipse plugin
.texlipse
/target/
# STS (Spring Tool Suite)
.springBeans
# Code Recommenders
.recommenders/
# Annotation Processing
.apt_generated/
# Scala IDE specific (Scala & Java development for Eclipse)
.cache-main
.scala_dependencies
.worksheet
### Eclipse Patch ###
# Eclipse Core
.project
# JDT-specific (Eclipse Java Development Tools)
.classpath
# Annotation Processing
.apt_generated
.sts4-cache/
### Java ###
# Compiled class file
*.class
# Log file
*.log
# BlueJ files
*.ctxt
# Mobile Tools for Java (J2ME)
.mtj.tmp/
# Package Files #
*.jar
*.war
*.nar
*.ear
*.zip
*.tar.gz
*.rar
# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
hs_err_pid*
### Java-Web ###
## ignoring target file
target/
### Gradle ###
.gradle
build/
# Ignore Gradle GUI config
gradle-app.setting
# Avoid ignoring Gradle wrapper jar file (.jar files are usually ignored)
!gradle-wrapper.jar
# Cache of project
.gradletasknamecache
# # Work around https://youtrack.jetbrains.com/issue/IDEA-116898
# gradle/wrapper/gradle-wrapper.properties
### Gradle Patch ###
**/build/
.gitlab-ci.yml
View file @
d6dd6a38
image
:
m
av
en:latest
image
:
j
av
a:8-jdk
variables
:
MAVEN_CLI_OPTS
:
"
--batch-mode"
GRADLE_OPTS
:
"
-Dorg.gradle.daemon=false"
NEXUS_CREDENTIALS
:
"
-Pnexususer=$NEXUS_REPO_USER
-Pnexuspass=$NEXUS_REPO_PASS"
build
:
stage
:
build
script
:
-
mvn $MAVEN_CLI_OPTS compile
before_script
:
-
export GRADLE_USER_HOME=`pwd`/.gradle
-
./gradlew wrapper --gradle-version=5.6.4 --distribution-type=bin
test
:
stage
:
test
script
:
-
mvn $MAVEN_CLI_OPTS t
es
t
cache
:
paths
:
-
.gradle/wrapper
-
.gradle/cach
es
stages
:
-
build
-
deploy
build
:
stage
:
build
script
:
./gradlew assemble
deploy
:
stage
:
deploy
script
:
-
mvn $MAVEN_CLI_OPTS deploy
script
:
-
./gradlew publish -x test $NEXUS_CREDENTIALS
only
:
-
master
\ No newline at end of file
-
master
-
sru_opac_mww
build.gradle
0 → 100644
View file @
d6dd6a38
/*buildscript {
repositories {
maven { url 'https://repo.spring.io/plugins-snapshot' }
}
dependencies {
classpath 'io.spring.gradle:dependency-management-plugin'
}
}*/
plugins
{
id
'java'
//id 'io.spring.dependency-management' version '1.0.8.RELEASE'
id
'maven-publish'
id
'eclipse'
}
group
=
'eu.dariah.de.minfba'
version
=
'1.19.0-SNAPSHOT'
description
=
'DARIAH-DE Search Commons'
sourceCompatibility
=
'1.8'
repositories
{
mavenLocal
()
maven
{
url
=
'https://minfba.de.dariah.eu/nexus/repository/minfba-central/'
}
}
ext
{
coreVersion
=
"5.4.1-SNAPSHOT"
gtfVersion
=
"1.6.0-SNAPSHOT"
processingVersion
=
"3.9.2-SNAPSHOT"
colregModelVersion
=
"3.13.0-SNAPSHOT"
dariahSpVersion
=
"1.3.0-SNAPSHOT"
springVersion
=
"4.3.6.RELEASE"
jacksonVersion
=
"2.9.6"
slf4jVersion
=
"1.7.22"
commonsLangVersion
=
"3.3.2"
httpComponentsVersion
=
"4.5.5"
elasticsearchVersion
=
"7.3.0"
logbackVersion
=
"1.1.3"
}
dependencies
{
implementation
"de.unibamberg.minf.core:core-metamodel:$coreVersion"
implementation
"de.unibamberg.minf.core:core-web:$coreVersion"
implementation
"de.unibamberg.minf.core:core-util:$coreVersion"
implementation
"de.unibamberg.minf.gtf:gtf-base:$gtfVersion"
implementation
"de.unibamberg.minf.gtf:gtf-core:$gtfVersion"
implementation
"de.unibamberg.minf.gtf:gtf-extension-file:$gtfVersion"
implementation
"de.unibamberg.minf.gtf:gtf-extension-wiki:$gtfVersion"
implementation
"de.unibamberg.minf.gtf:gtf-extension-geo:$gtfVersion"
implementation
"de.unibamberg.minf.gtf:gtf-extension-nlp:$gtfVersion"
implementation
"de.unibamberg.minf.gtf:gtf-extension-vocabulary:$gtfVersion"
implementation
"de.unibamberg.minf.gtf:gtf-extension-dai:$gtfVersion"
implementation
"de.unibamberg.minf.processing:processing:$processingVersion"
implementation
"eu.dariah.de:colreg-model:$colregModelVersion"
implementation
"eu.dariah.de:dariahsp-core:$dariahSpVersion"
implementation
"org.springframework:spring-context:$springVersion"
implementation
"org.springframework:spring-beans:$springVersion"
implementation
"org.springframework:spring-core:$springVersion"
implementation
"org.apache.httpcomponents:httpclient:$httpComponentsVersion"
implementation
"org.elasticsearch:elasticsearch:$elasticsearchVersion"
implementation
"org.elasticsearch.client:elasticsearch-rest-high-level-client:$elasticsearchVersion"
implementation
"org.springframework.data:spring-data-mongodb:1.10.0.RELEASE"
implementation
"org.slf4j:slf4j-api:$slf4jVersion"
implementation
"joda-time:joda-time:2.9.9"
implementation
"joda-time:joda-time-jsptags:1.1.1"
implementation
"commons-io:commons-io:2.5"
implementation
"org.apache.commons:commons-compress:1.15"
implementation
"com.fasterxml.jackson.core:jackson-core:$jacksonVersion"
implementation
"com.fasterxml.jackson.core:jackson-databind:$jacksonVersion"
implementation
"com.fasterxml.jackson.core:jackson-annotations:$jacksonVersion"
implementation
"com.fasterxml.jackson.dataformat:jackson-dataformat-xml:$jacksonVersion"
implementation
"com.fasterxml.jackson.datatype:jackson-datatype-joda:$jacksonVersion"
implementation
"org.skyscreamer:jsonassert:1.4.0"
implementation
"org.apache.tika:tika-core:1.22"
implementation
"org.apache.tika:tika-parsers:1.22"
testImplementation
"org.springframework:spring-test:$springVersion"
testImplementation
"junit:junit:4.12"
testImplementation
"org.mockito:mockito-all:1.10.19"
testImplementation
"org.elasticsearch.plugin:transport-netty4-client:$elasticsearchVersion"
testImplementation
"org.slf4j:jcl-over-slf4j:$slf4jVersion"
testImplementation
"org.slf4j:log4j-over-slf4j:$slf4jVersion"
testImplementation
"ch.qos.logback:logback-core:$logbackVersion"
testImplementation
"ch.qos.logback:logback-classic:$logbackVersion"
compileOnly
"javax.servlet:servlet-api:2.5"
}
java
{
sourceCompatibility
=
JavaVersion
.
VERSION_1_8
}
tasks
.
withType
(
JavaCompile
)
{
options
.
encoding
=
'UTF-8'
}
task
sourcesJar
(
type:
Jar
,
dependsOn:
classes
)
{
classifier
=
'sources'
from
sourceSets
.
main
.
allSource
}
task
javadocJar
(
type:
Jar
,
dependsOn:
javadoc
)
{
classifier
=
'javadoc'
from
javadoc
.
destinationDir
}
artifacts
{
archives
sourcesJar
archives
javadocJar
}
publishing
{
publications
{
maven
(
MavenPublication
)
{
from
(
components
.
java
)
artifact
(
sourcesJar
)
{}
artifact
(
javadocJar
)
{}
pom
{
name
=
'DARIAH-DE Search Commons Library'
description
=
'Common libraries for DARIAH based search services'
url
=
'https://gitlab.rz.uni-bamberg.de/dariah/search-commons'
licenses
{
license
{
name
=
'The Apache License, Version 2.0'
url
=
'http://www.apache.org/licenses/LICENSE-2.0.txt'
}
}
developers
{
developer
{
id
=
'tgradl'
name
=
'Tobias Gradl'
email
=
'tobias.gradl@uni-bamberg.de'
}
}
scm
{
connection
=
'scm:git:git://gitlab.rz.uni-bamberg.de/dariah/search-commons'
developerConnection
=
'scm:git:ssh://gitlab.rz.uni-bamberg.de/dariah/search-commons'
url
=
'https://gitlab.rz.uni-bamberg.de/dariah/search-commons'
}
issueManagement
{
system
=
'GitLab'
url
=
'https://gitlab.rz.uni-bamberg.de/dariah/search-commons/issues'
}
}
}
}
repositories
{
maven
{
def
releasesRepoUrl
=
"https://minfba.de.dariah.eu/nexus/repository/minfba-releases/"
def
snapshotsRepoUrl
=
"https://minfba.de.dariah.eu/nexus/repository/minfba-snapshots/"
if
(
version
.
endsWith
(
'SNAPSHOT'
)
||
version
.
endsWith
(
'RELEASE'
))
{
credentials
{
username
project
.
hasProperty
(
'nexususer'
)
?
project
.
getProperty
(
'nexususer'
)
:
''
password
project
.
hasProperty
(
'nexuspass'
)
?
project
.
getProperty
(
'nexuspass'
)
:
''
}
url
=
version
.
endsWith
(
'SNAPSHOT'
)
?
snapshotsRepoUrl
:
releasesRepoUrl
}
else
{
// Have a local test repo under buildDir to be able to test publish but only actually do publish when the version ending matches
url
=
"$buildDir/repo/"
}
}
}
}
gradle/wrapper/gradle-wrapper.jar
0 → 100644
View file @
d6dd6a38
File added
gradle/wrapper/gradle-wrapper.properties
0 → 100644
View file @
d6dd6a38
distributionBase
=
GRADLE_USER_HOME
distributionPath
=
wrapper/dists
distributionUrl
=
https
\:
//services.gradle.org/distributions/gradle-6.0.1-bin.zip
zipStoreBase
=
GRADLE_USER_HOME
zipStorePath
=
wrapper/dists
gradlew
0 → 100755
View file @
d6dd6a38
#!/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
;;
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
"
"
$@
"
gradlew.bat
0 → 100644
View file @
d6dd6a38
@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 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
init
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 init
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
:init
@rem Get command-line arguments, handling Windows variants
if not "
%OS%
" == "
Windows_NT
" goto win9xME_args
:win9xME_args
@rem Slurp the command line arguments.
set CMD_LINE_ARGS=
set _SKIP=2
:win9xME_args_slurp
if "
x
%
~
1
" == "
x
" goto execute
set CMD_LINE_ARGS=
%
*
: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
%CMD_LINE_ARGS%
: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