From 931841d6691e13f7641e22cfdf5aae5d3d6162ec Mon Sep 17 00:00:00 2001
From: brian <brian@brutex.de>
Date: Wed, 12 Oct 2022 12:03:08 +0200
Subject: [PATCH] Add jenkinsfile for pipeline build and dockerfile for build

---
 .docker/Dockerfile                         |  2 --
 build.gradle                               |  5 +++--
 build_requirements.md                      | 14 +++++++++++++-
 cavis-full/build.gradle                    |  3 ++-
 cavis-native/cavis-native-lib/build.gradle |  7 +++----
 5 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/.docker/Dockerfile b/.docker/Dockerfile
index a5508688e..4e2c0ece8 100644
--- a/.docker/Dockerfile
+++ b/.docker/Dockerfile
@@ -11,5 +11,3 @@ RUN wget -nv https://github.com/Kitware/CMake/releases/download/v3.24.2/cmake-3.
     rm cmake-3.24.2-linux-x86_64.sh
 
 
-RUN echo "nameserver 8.8.8.8" >> /etc/resolv.conf
-
diff --git a/build.gradle b/build.gradle
index ab3337562..cd5911461 100644
--- a/build.gradle
+++ b/build.gradle
@@ -44,6 +44,7 @@ ext {
 
     scalaVersion = "2.12"
     logger.quiet("Scala main version is set to {}", scalaVersion)
+    logger.quiet("Running java {}", JavaVersion.current())
 }
 
 configurations.all {
@@ -63,8 +64,8 @@ allprojects { Project proj ->
 
 
     plugins.withType(JavaPlugin) {
-         sourceCompatibility = 11
-         targetCompatibility = 1.8
+         sourceCompatibility = JavaVersion.VERSION_11
+         targetCompatibility = JavaVersion.VERSION_1_8
         tasks.withType(JavaCompile) {
             options.release = 8
         }
diff --git a/build_requirements.md b/build_requirements.md
index db6532203..602190b95 100644
--- a/build_requirements.md
+++ b/build_requirements.md
@@ -129,4 +129,16 @@ echo "nameserver 8.8.8.8" | sudo tee -a /etc/resolv.conf
  # Buildparameter: #
 
  -P\<xxx>\
- CAVIS_AVX_EXTENSION = {avx2 | avx512}, default is avx2
\ No newline at end of file
+ CAVIS_AVX_EXTENSION = {avx2 | avx512}, default is avx2
+ 
+# Zeppelin Spark dependencies #
+3
+
+
+To add the dependency to the language models, use the following format in the Dependencies section of the of the Spark Interpreter configuration (Interpreters -> Spark -> Edit -> Dependencies):
+
+groupId:artifactId:packaging:classifier:version
+
+In your case it should work with
+
+edu.stanford.nlp:stanford-corenlp:jar:models:3.8.0
\ No newline at end of file
diff --git a/cavis-full/build.gradle b/cavis-full/build.gradle
index 68e847fdf..659e119e2 100644
--- a/cavis-full/build.gradle
+++ b/cavis-full/build.gradle
@@ -16,7 +16,8 @@ dependencies {
     api "com.fasterxml.jackson.datatype:jackson-datatype-joda:2.10.5"
     api 'org.slf4j:slf4j-simple:2.0.3'
     api 'org.slf4j:slf4j-api:2.0.3'
-    //api group: "org.bytedeco", name: "javacpp", classifier: "linux-x64_86"
+    api group: "org.bytedeco", name: "javacpp", classifier: "linux-x64_86"
+    api group: 'net.brutex.cavis-native', name: 'cavis-native-lib', version: '1.0.0-SNAPSHOT', classifier: "linux-x86_64-avx2-cpu"
 
     rootProject.getAllprojects().each { Project sproj ->
         if(!sproj.name.equals(name) && !sproj.name.equals("cavis-common-platform")
diff --git a/cavis-native/cavis-native-lib/build.gradle b/cavis-native/cavis-native-lib/build.gradle
index 1d083f0ce..10648759d 100644
--- a/cavis-native/cavis-native-lib/build.gradle
+++ b/cavis-native/cavis-native-lib/build.gradle
@@ -84,7 +84,7 @@ chipList.each {thisChip ->
 }
 
 
-//if(osdetector.os.startsWith("windows")) {
+if(osdetector.os.startsWith("windows")) {
     sourceSets {
         main {
             java {
@@ -93,7 +93,7 @@ chipList.each {thisChip ->
             }
         }
     }
-//}
+}
 
 
 java {
@@ -212,7 +212,7 @@ tasks.withType(org.bytedeco.gradle.javacpp.BuildTask) {
 // Disable the standard javacpp generated tasks and use own
 // versions below. This allows to build for each variant
 [javacppBuildParser, javacppBuildCommand, javacppCompileJava, javacppBuildCompiler].each {
-    it.enabled false
+    it.enabled false;
 }
 
 chipList.each { thisChip ->
@@ -488,7 +488,6 @@ chipList.each { thisChip ->
     publishing {
         publications {
             mavenJava(MavenPublication) {
-                artifact jar
                 artifact tasks.getByName("${thisChip}SupportJar")
             }
         }