diff --git a/Dockerfile b/Dockerfile index 3d13417..eaffb73 100755 --- a/Dockerfile +++ b/Dockerfile @@ -1,10 +1,11 @@ -FROM env/jvmdev +FROM ubuntu:artful ARG JAR ENV JAR ${JAR} -RUN apt-get update && apt-get install -y openjdk-8-jdk axel maven jq nodejs npm gradle groovy2 && apt clean +RUN apt-get update && apt-get install -y openjdk-8-jdk groovy ENV TERM xterm RUN mkdir -p /opt/kvdn/{bin,lib} ADD $JAR /opt/kvdn.jar ADD Client /opt/kvdn/lib/Client +ADD examples/config /opt/kvdn/config ENV JAVA_HOME=/usr/lib/jvm/java-8-openjdk CMD java -Dvertx.logger-delegate-factory-class-name=io.vertx.core.logging.SLF4JLogDelegateFactory -jar /opt/kvdn.jar diff --git a/build.gradle b/build.gradle index 009f40e..e9eec52 100755 --- a/build.gradle +++ b/build.gradle @@ -24,9 +24,10 @@ plugins { id "net.ltgt.apt" version "0.6" } def strict = false -if(System.getenv("STRICT_TYPECHECKING") != null) +if(System.getenv("STRICT_TYPECHECKING") != null) { strict = true - + println "COMPILE STATIC & TYPECHECKED" +} compileGroovy { groovyOptions.javaAnnotationProcessing = true if(strict) @@ -38,11 +39,22 @@ compileGroovy { apply plugin: "co.riiid.gradle" apply plugin: 'distribution' apply plugin: 'idea' - +apply plugin: 'java' +apply plugin: 'groovy' def libversion = '3.5.0' if(System.getenv("VERTX_VERSION") != null) libversion = System.getenv("VERTX_VERSION") +sourceSets{ + main{ + groovy{ + exclude "net/iowntheinter/kvdn/storage/lock/*" + exclude "net/iowntheinter/kvdn/storage/queue/*" + exclude "net/iowntheinter/kvdn/storage/counter/*" + + } + } +} version = "$libversion-${new File('src/main/resources/_KVDN_VERSION.txt').text.trim()}" println("version $version") diff --git a/buildfresh.sh b/buildfresh.sh index e2cfa8d..79b38cd 100644 --- a/buildfresh.sh +++ b/buildfresh.sh @@ -1,4 +1,4 @@ -./gradlew clean util:jar util:publish;DISABLE_EXTENSIONS=true ./gradlew clean shadowJar publish test && echo built base && +./gradlew clean util:jar util:publish;DISABLE_EXTENSIONS=true ./gradlew --info clean shadowJar publish test && echo built base && ./gradlew service-proxy:generateserviceproxy service-proxy:shadowJar service-proxy:publish && echo built proxy && ./gradlew extensions/mapdb:shadowJar publish && ./gradlew server:clean server:shadowJar server:publish diff --git a/gradle/config.groovy b/gradle/config.groovy index 66d1a74..1e3233a 100644 --- a/gradle/config.groovy +++ b/gradle/config.groovy @@ -2,6 +2,6 @@ import groovy.transform.CompileStatic import groovy.transform.TypeChecked withConfig(configuration) { - //ast(CompileStatic) + ast(CompileStatic) ast(TypeChecked) } \ No newline at end of file diff --git a/run-mapdb.sh b/run-mapdb.sh old mode 100644 new mode 100755 index 8cba7a9..c4d6822 --- a/run-mapdb.sh +++ b/run-mapdb.sh @@ -1 +1 @@ -java -Dvertx.logger-delegate-factory-class-name=io.vertx.core.logging.SLF4JLogDelegateFactory -jar extensions/mapdb/build/libs/extensions/mapdb-3.5.0-1.9.5-b2-fat.jar --conf '{"kvdn":{"data_implementation":"net.iowntheinter.kvdn.mapdb.impl.mapdbDataImpl","key_provider":"net.iowntheinter.kvdn.mapdb.impl.mapdbKeyProvider","mapdb":{"dbPath":"/core/datasets/vr/dev/mapdb.db"}}}' +java -Dvertx.logger-delegate-factory-class-name=io.vertx.core.logging.SLF4JLogDelegateFactory -jar extensions/mapdb/build/libs/extensions/mapdb-*-fat.jar --conf '{"kvdn":{"data_implementation":"net.iowntheinter.kvdn.mapdb.impl.MapdbDataImpl","key_provider":"net.iowntheinter.kvdn.mapdb.impl.MapdbKeyProvider","mapdb":{"dbPath":"/core/datasets/vr/dev/mapdb.db"}}}' 2>&1