Skip to content
Snippets Groups Projects
Commit 8be23835 authored by anttil's avatar anttil
Browse files

SWE-22 / SP-641: Compilation of project 'openbis' now done in gradle. Tests do... 

SWE-22 / SP-641: Compilation of project 'openbis' now done in gradle. Tests do not work yet. Project dependencies changed to be non-transitive in all projects.

SVN: 28970
parent deac6d75
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 412 additions and 16 deletions
authentication/build.gradle
+ 18
− 2
View file @ 8be23835
apply from: 'http://svncisd.ethz.ch/repos/cisd/gradle/trunk/javaproject.gradle' apply from: 'http://svncisd.ethz.ch/repos/cisd/gradle/trunk/javaproject.gradle'
dependencies { dependencies {
compile project(':common') compile (project(':common')) {
transitive = false
}
testCompile project(path: ':common', configuration: 'tests') compile 'rinn:restrictions:1.0.1',
'cisd:cisd-base:r27861',
'apache:log4j:1.2.15',
'python:jython:2.5.2',
'apache:commons-httpclient:3.1',
'cisd:cisd-args4j:9.11.2'
testCompile (project(path: ':common', configuration: 'tests')) {
transitive = false
}
testCompile 'testng:testng:6.8-CISD',
'jmock:jmock:2.5.1'
testRuntime 'fjelmer:classycle:1.4'
} }
dbmigration/build.gradle
+ 21
− 5
View file @ 8be23835
apply from: 'http://svncisd.ethz.ch/repos/cisd/gradle/trunk/javaproject.gradle' apply from: 'http://svncisd.ethz.ch/repos/cisd/gradle/trunk/javaproject.gradle'
dependencies { dependencies {
compile project(':common'), compile (project(':common')) {
'springframework:spring-jdbc:2.5.6.SEC01', transitive = false
}
compile 'springframework:spring-jdbc:2.5.6.SEC01',
'apache:commons-dbcp:1.3-CISD', 'apache:commons-dbcp:1.3-CISD',
'h2database:h2:1.1.115', 'h2database:h2:1.1.115',
'postgresql:postgresql:9.2-1000.jdbc4' 'postgresql:postgresql:9.2-1000.jdbc4',
testCompile project(path: ':common', configuration: 'tests'), 'cisd:cisd-base:r27861',
'startnet:apgdiff:2.3' 'apache:log4j:1.2.15',
'apache:commons-lang:2.4',
'rinn:restrictions:1.0.1'
testCompile (project(path: ':common', configuration: 'tests')) {
transitive = false
}
testCompile 'startnet:apgdiff:2.3',
'jmock:jmock:2.5.1',
'testng:testng:6.8-CISD'
testRuntime 'fjelmer:classycle:1.4'
} }
openbis-common/build.gradle
+ 28
− 6
View file @ 8be23835
apply from: 'http://svncisd.ethz.ch/repos/cisd/gradle/trunk/javaproject.gradle' apply from: 'http://svncisd.ethz.ch/repos/cisd/gradle/trunk/javaproject.gradle'
dependencies { dependencies {
compile project(':common'), compile (project(':common')) {
'googlecode:jsonrpc4j:0.24-CISD', transitive = false
}
compile 'googlecode:jsonrpc4j:0.24-CISD',
'reflections:reflections:0.9.5', 'reflections:reflections:0.9.5',
'cisd:cisd-jhdf5:r28568', 'cisd:cisd-jhdf5:r28568',
'lemnik:eodsql:2.2-CISD', 'lemnik:eodsql:2.2-CISD',
'springframework:spring-jdbc:2.5.6.SEC01'
'springframework:spring-jdbc:2.5.6.SEC01',
'apache:commons-lang:2.4',
'rinn:restrictions:1.0.1',
'springframework:spring-webmvc:2.5.6.SEC01-CISD',
'javax:servlet-api:3.0',
'apache:log4j:1.2.15',
'google:gwt-servlet:2.4',
'cisd:cisd-base:r27861',
'springframework:spring-aop:2.5.6.SEC01'
testCompile (project(path: ':common', configuration: 'tests')) {
transitive = false
}
testCompile 'hamcrest:hamcrest-integration:1.1',
'eclipse:jetty-servlet:8.1.8.v20121106',
'testng:testng:6.8-CISD',
'jmock:jmock:2.5.1'
testCompile project(path: ':common', configuration: 'tests'), testRuntime 'fjelmer:classycle:1.4',
'hamcrest:hamcrest-integration:1.1', 'marathon:marathon-spring-util:1.2.3',
'eclipse:jetty-servlet:8.1.8.v20121106' 'apache:commons-httpclient:3.1'
} }
\ No newline at end of file
openbis/build.gradle 0 → 100644
+ 71
− 0
View file @ 8be23835
apply from: 'http://svncisd.ethz.ch/repos/cisd/gradle/trunk/javaproject.gradle'
dependencies {
compile (project(':common')) {
transitive = false
}
compile (project(':openbis_api')) {
transitive = false
}
compile (project(':openbis-common')) {
transitive = false
}
compile (project(':authentication')) {
transitive = false
}
compile (project(':dbmigration')) {
transitive = false
}
compile 'cisd:cisd-base:r27861',
'javax:servlet-api:3.0',
'apache:log4j:1.2.15',
'cisd:cisd-args4j:9.11.2',
'springframework:spring-webmvc:2.5.6.SEC01-CISD',
'apache:poi:3.8-20120326',
'fasterxml:jackson-annotations:2.0.2',
'python:jython:2.5.2',
'google:gwt-user:2.4',
'sencha:gxt:2.2.5',
'springframework:spring-aop:2.5.6.SEC01',
'apache:commons-collections:4.01',
'google:gwt-debug-panel:1.0',
'javax:mail:1.4.3',
'springframework:spring-jdbc:2.5.6.SEC01',
'cisd:cisd-hotdeploy:13.01.0',
'hibernate:hibernate-core:3.6.10.Final-CISD',
'springframework:spring-orm:2.5.6.SEC01',
'googlecode:jsonrpc4j:0.24-CISD',
'lemnik:eodsql:2.2-CISD',
'unimi:fastutil:5.1.5',
'apache:commons-dbcp:1.3-CISD',
'javax:validation-api:1.0.0.GA',
'hibernate:hibernate-search:3.4.2.Final',
'lucene:lucene-highlighter:3.1.0',
'eclipse:jetty-util:8.1.8.v20121106',
'hibernate:hibernate-validator:4.2.0.Final',
'eclipse:jetty-deploy:8.1.8.v20121106',
'apache:poi-ooxml:3.8-20120326'
testCompile (project(path: ':common', configuration: 'tests')) {
transitive = false
}
testCompile (project(path: ':dbmigration', configuration: 'tests')) {
transitive = false
}
testCompile 'springframework:spring-test:2.5.6.SEC01',
'testng:testng:6.8-CISD',
'hamcrest:hamcrest-library:1.1',
'hamcrest:hamcrest-integration:1.1',
'jmock:jmock:2.5.1'
testRuntime 'fjelmer:classycle:1.4'
}
openbis/gradle/wrapper/gradle-wrapper.jar 0 → 100644
+ 0
− 0
View file @ 8be23835
File added
openbis/gradle/wrapper/gradle-wrapper.properties 0 → 100644
+ 6
− 0
View file @ 8be23835
#Thu May 02 11:59:26 CEST 2013
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=http\://svncisd.ethz.ch/repos/cisd/ivy-repository/trunk/gradle/distribution/1.5/gradle-1.5-bin.zip
openbis/gradlew 0 → 100755
+ 164
− 0
View file @ 8be23835
#!/usr/bin/env bash
##############################################################################
##
## Gradle start up script for UN*X
##
##############################################################################
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
DEFAULT_JVM_OPTS=""
APP_NAME="Gradle"
APP_BASE_NAME=`basename "$0"`
# 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
case "`uname`" in
CYGWIN* )
cygwin=true
;;
Darwin* )
darwin=true
;;
MINGW* )
msys=true
;;
esac
# For Cygwin, ensure paths are in UNIX format before anything is touched.
if $cygwin ; then
[ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
fi
# 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\"`/" >&-
APP_HOME="`pwd -P`"
cd "$SAVED" >&-
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" ] ; 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, switch paths to Windows format before running java
if $cygwin ; then
APP_HOME=`cygpath --path --mixed "$APP_HOME"`
CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
# 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=$((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
# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
function splitJvmOpts() {
JVM_OPTS=("$@")
}
eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
openbis/gradlew.bat 0 → 100644
+ 90
− 0
View file @ 8be23835
@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
@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=
set DIRNAME=%~dp0
if "%DIRNAME%" == "" set DIRNAME=.
set APP_BASE_NAME=%~n0
set APP_HOME=%DIRNAME%
@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 Windowz variants
if not "%OS%" == "Windows_NT" goto win9xME_args
if "%@eval[2+2]" == "4" goto 4NT_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=%*
goto execute
:4NT_args
@rem Get arguments from the 4NT Shell from JP Software
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
:mainEnd
if "%OS%"=="Windows_NT" endlocal
:omega
openbis/settings.gradle 0 → 100644
+ 6
− 0
View file @ 8be23835
includeFlat 'common', 'openbis_api', 'openbis-common', 'authentication', 'dbmigration'
project(':common').projectDir = new File(settingsDir, '../common')
project(':openbis_api').projectDir = new File(settingsDir, '../openbis_api')
project(':openbis-common').projectDir = new File(settingsDir, '../openbis-common')
project(':authentication').projectDir = new File(settingsDir, '../authentication')
project(':dbmigration').projectDir = new File(settingsDir, '../dbmigration')
openbis_api/build.gradle
+ 8
− 3
View file @ 8be23835
apply from: 'http://svncisd.ethz.ch/repos/cisd/gradle/trunk/javaproject.gradle' apply from: 'http://svncisd.ethz.ch/repos/cisd/gradle/trunk/javaproject.gradle'
dependencies { dependencies {
compile project(':common'), compile (project(':common')) {
'fasterxml:jackson-core:2.0.2', transitive = false
'fasterxml:jackson-annotations:2.0.2' }
compile 'fasterxml:jackson-core:2.0.2',
'fasterxml:jackson-annotations:2.0.2',
'cisd:cisd-base:r27861'
} }
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment