diff --git a/docker/Dockerfile b/docker/Dockerfile new file mode 100644 index 0000000..d18eebc --- /dev/null +++ b/docker/Dockerfile @@ -0,0 +1,14 @@ +FROM clearlinux:latest + +ARG HOME=/home/modelscoring +ARG MODEL_SCORING_PACKAGE + +RUN useradd modelscoring && swupd bundle-add java-basic && java -version && javac -version + +USER modelscoring +WORKDIR /home/modelscoring/ +ADD $MODEL_SCORING_PACKAGE . + +WORKDIR /home/modelscoring/ +ENTRYPOINT [ "bin/model-scoring.sh" ] + diff --git a/docker/build.sh b/docker/build.sh new file mode 100755 index 0000000..f325257 --- /dev/null +++ b/docker/build.sh @@ -0,0 +1,58 @@ +#!/bin/bash +# +# Copyright (c) 2016 Intel Corporation  +# +# 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 +# +#       http://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. +# + + +MODEL_SCORING_PACKAGE=$(find `pwd`/../ -name "model-scoring-java-*.zip" -type f ) + +echo PATH `pwd`/../ + +echo $MODEL_SCORING_PACKAGE + +if [ "$MODEL_SCORING_PACKAGE" == "" ]; then + echo "couldn't find model scoring java package" + exit 1 +fi + +echo MODEL_SCORING_PACKAGE $MODEL_SCORING_PACKAGE + +unzip -o $MODEL_SCORING_PACKAGE -d `pwd` + +NAME="`basename $MODEL_SCORING_PACKAGE`" + +echo Base name $NAME +NAME=${NAME//.zip/} +echo Base name $NAME + +echo docker build --file=Dockerfile --tag=scoring-engine \ + --build-arg HTTP_PROXY=$http_proxy \ + --build-arg HTTPS_PROXY=$http_proxy \ + --build-arg NO_PROXY=$no_proxy \ + --build-arg http_proxy=$http_proxy \ + --build-arg https_proxy=$http_proxy \ + --build-arg no_proxy=$no_proxy \ + --build-arg MODEL_SCORING_PACKAGE=$NAME \ + . +docker build --file=Dockerfile --tag=scoring-engine \ + --build-arg HTTP_PROXY=$http_proxy \ + --build-arg HTTPS_PROXY=$http_proxy \ + --build-arg NO_PROXY=$no_proxy \ + --build-arg http_proxy=$http_proxy \ + --build-arg https_proxy=$http_proxy \ + --build-arg no_proxy=$no_proxy \ + --build-arg MODEL_SCORING_PACKAGE=$NAME \ + . + diff --git a/docker/pom.xml b/docker/pom.xml new file mode 100644 index 0000000..1743e00 --- /dev/null +++ b/docker/pom.xml @@ -0,0 +1,55 @@ + + + 4.0.0 + + org.trustedanalytics + model-scoring + 1.0-SNAPSHOT + + + docker + 1.0-SNAPSHOT + pom + + + + + build-server + + + env.BUILD_NUMBER + + + + + + + org.codehaus.mojo + exec-maven-plugin + + + docker + package + + exec + + + bash + + build.sh + + + + + + + + + + + + + + \ No newline at end of file diff --git a/bin/cf.sh b/model-scoring-core/bin/cf.sh similarity index 70% rename from bin/cf.sh rename to model-scoring-core/bin/cf.sh index 62c952f..8e000f2 100755 --- a/bin/cf.sh +++ b/model-scoring-core/bin/cf.sh @@ -1,4 +1,20 @@ #!/bin/bash +# +# Copyright (c) 2016 Intel Corporation  +# +# 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 +# +#       http://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. +# + echo "Starting model scoring startup script" env diff --git a/bin/model-scoring.sh b/model-scoring-core/bin/model-scoring.sh similarity index 100% rename from bin/model-scoring.sh rename to model-scoring-core/bin/model-scoring.sh diff --git a/bin/scoring-server.sh b/model-scoring-core/bin/scoring-server.sh similarity index 100% rename from bin/scoring-server.sh rename to model-scoring-core/bin/scoring-server.sh diff --git a/conf/.gitignore b/model-scoring-core/conf/.gitignore similarity index 100% rename from conf/.gitignore rename to model-scoring-core/conf/.gitignore diff --git a/conf/README b/model-scoring-core/conf/README similarity index 100% rename from conf/README rename to model-scoring-core/conf/README diff --git a/conf/application.conf.cf b/model-scoring-core/conf/application.conf.cf similarity index 100% rename from conf/application.conf.cf rename to model-scoring-core/conf/application.conf.cf diff --git a/conf/application.conf.scoring b/model-scoring-core/conf/application.conf.scoring similarity index 100% rename from conf/application.conf.scoring rename to model-scoring-core/conf/application.conf.scoring diff --git a/conf/examples/application.conf.single-system.tpl b/model-scoring-core/conf/examples/application.conf.single-system.tpl similarity index 100% rename from conf/examples/application.conf.single-system.tpl rename to model-scoring-core/conf/examples/application.conf.single-system.tpl diff --git a/conf/examples/parcel.conf.tpl b/model-scoring-core/conf/examples/parcel.conf.tpl similarity index 100% rename from conf/examples/parcel.conf.tpl rename to model-scoring-core/conf/examples/parcel.conf.tpl diff --git a/conf/score.conf b/model-scoring-core/conf/score.conf similarity index 100% rename from conf/score.conf rename to model-scoring-core/conf/score.conf diff --git a/model-scoring-core/epom.xml b/model-scoring-core/epom.xml new file mode 100644 index 0000000..812cb33 --- /dev/null +++ b/model-scoring-core/epom.xml @@ -0,0 +1,1363 @@ + + + + + + + + + + + + + + + + + 4.0.0 + + org.trustedanalytics + model-scoring + 1.0-SNAPSHOT + + org.trustedanalytics + model-scoring-core + 1.0-SNAPSHOT + trusted analytics root pom + + TrustedAnalytics + http://trustedanalytics.org + + + + Apache License Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + + + + + tap-snapshots + https://tap.jfrog.io/tap/public + + + tap-snapshots-private + https://tap.jfrog.io/tap/private + + + + org.spark-project.akka + 2.2.3-shaded-protobuf + 2.4.4 + UTF-8 + 1.2.3 + cdh5.7.1 + 3.3.2 + 2016.2.181 + 0.1.0-spark1.6 + 2.6.0-cdh5.7.1 + 1.2.0-cdh5.7.1 + 1.1.0-cdh5.7.1 + 1.8 + 0.9-cdh5.7.1 + 3.1.1 + 2.1.16 + 0.8.0 + 1.5.0-cdh5.7.1 + 2.10.5 + 2.10 + 2.1.6 + 1.6.0-cdh5.7.1 + 1.6.0 + 1.6.0-cdh5.7.1 + 1.6.0-cdh5.7.1 + 1.2.1 + 3.4.5-cdh5.7.1 + + + + org.trustedanalytics + model-archive-format + 0.1.1 + compile + + + org.trustedanalytics + model-archive-interfaces + 0.1.1 + compile + + + com.typesafe + config + 1.2.1 + compile + + + log4j + log4j + 1.2.17 + compile + + + org.slf4j + jul-to-slf4j + 1.7.10 + compile + + + org.slf4j + slf4j-api + 1.7.10 + compile + + + org.slf4j + slf4j-log4j12 + 1.7.10 + compile + + + org.slf4j + jcl-over-slf4j + 1.7.5 + compile + + + joda-time + joda-time + 2.1 + compile + + + org.trustedanalytics + hadoop-utils + 0.6.2 + compile + + + netty + io.netty + + + + + org.jvnet.mimepull + mimepull + 1.9.4 + compile + + + org.apache.spark + spark-core_2.10 + 1.6.0-cdh5.7.1 + compile + + + org.apache.spark + spark-network-shuffle_2.10 + 1.6.0-cdh5.7.1 + compile + + + org.apache.spark + spark-network-common_2.10 + 1.6.0-cdh5.7.1 + compile + + + io.netty + netty-all + 4.0.29.Final + compile + + + io.netty + netty + 3.6.6.Final + compile + + + org.apache.spark + spark-unsafe_2.10 + 1.6.0 + compile + + + org.apache.spark + spark-launcher_2.10 + 1.6.0 + compile + + + org.apache.spark + spark-graphx_2.10 + 1.6.0-cdh5.7.1 + compile + + + org.apache.spark + spark-sql_2.10 + 1.6.0-cdh5.7.1 + compile + + + org.apache.spark + spark-catalyst_2.10 + 1.6.0-cdh5.7.1 + compile + + + org.apache.spark + spark-mllib_2.10 + 1.6.0-cdh5.7.1 + compile + + + com.codahale.metrics + metrics-core + 3.0.1 + compile + + + com.codahale.metrics + metrics-json + 3.0.1 + compile + + + org.json4s + json4s-core_2.10 + 3.2.10 + compile + + + org.json4s + json4s-ast_2.10 + 3.2.10 + compile + + + org.json4s + json4s-jackson_2.10 + 3.2.10 + compile + + + com.fasterxml.jackson.core + jackson-databind + 2.4.4 + compile + + + com.fasterxml.jackson.core + jackson-annotations + 2.4.4 + compile + + + com.fasterxml.jackson.core + jackson-core + 2.4.4 + compile + + + com.fasterxml.jackson.module + jackson-module-scala_2.10 + 2.4.4 + compile + + + com.thoughtworks.paranamer + paranamer + 2.6 + compile + + + org.apache.hadoop + hadoop-core + 2.6.0-mr1-cdh5.7.1 + compile + + + org.xerial.snappy + snappy-java + 1.1.0.1 + compile + + + org.apache.xbean + xbean-asm5-shaded + 3.17 + compile + + + com.esotericsoftware.kryo + kryo + 2.16 + compile + + + org.scala-lang.virtualized + scalap + 2.10.1-RC1 + compile + + + org.scala-lang + scala-compiler + 2.9.2 + compile + + + com.twitter + parquet-hadoop + 1.5.0-cdh5.7.1 + compile + + + com.twitter + parquet-common + 1.5.0-cdh5.7.1 + compile + + + com.twitter + parquet-format + 2.2.0 + compile + + + com.twitter + parquet-column + 1.5.0-cdh5.7.1 + compile + + + com.twitter + parquet-encoding + 1.3.0 + compile + + + org.codehaus.jackson + jackson-core-asl + 1.9.13 + compile + + + org.codehaus.jackson + jackson-mapper-asl + 1.8.8 + compile + + + org.codehaus.janino + janino + 2.7.8 + compile + + + org.codehaus.janino + commons-compiler + 2.7.8 + compile + + + org.scalanlp + breeze_2.10 + 0.11.2 + compile + + + com.google.protobuf + protobuf-java + 2.5.0 + compile + + + com.github.fommil.netlib + core + 1.1.2 + compile + + + net.sourceforge.f2j + arpack_combined_all + 0.1 + compile + + + org.scala-lang + scala-reflect + 2.10.5 + compile + + + com.chuusai + shapeless_2.10 + 1.2.4 + compile + + + org.mockito + mockito-all + 1.9.5 + test + + + org.spark-project.protobuf + protobuf-java + 2.4.1-shaded + compile + + + org.spark-project.akka + akka-remote_2.10 + 2.2.3-shaded-protobuf + compile + + + protobuf-java + com.google.protobuf + + + + + org.spark-project.akka + akka-actor_2.10 + 2.2.3-shaded-protobuf + compile + + + org.spark-project.akka + akka-slf4j_2.10 + 2.2.3-shaded-protobuf + compile + + + org.spark-project.akka + akka-testkit_2.10 + 2.2.3-shaded-protobuf + test + + + org.apache.commons + commons-lang3 + 3.3.2 + compile + + + commons-lang + commons-lang + 2.6 + compile + + + org.scala-lang + scala-library + 2.10.5 + compile + + + org.apache.commons + commons-compress + 1.7 + compile + + + commons-collections + commons-collections + 3.2.1 + compile + + + commons-beanutils-core + commons-beanutils + + + + + commons-io + commons-io + 2.1 + compile + + + org.apache.hadoop + hadoop-common + 2.6.0-cdh5.7.1 + compile + + + paranamer + com.thoughtworks.paranamer + + + + + org.apache.hadoop + hadoop-hdfs + 2.6.0-cdh5.7.1 + compile + + + netty + io.netty + + + netty-all + io.netty + + + + + org.apache.httpcomponents + httpclient + 4.3.6 + compile + + + com.googlecode.json-simple + json-simple + 1.1 + compile + + + com.google.guava + guava + 14.0.1 + compile + + + org.bitbucket.b_c + jose4j + 0.5.1 + compile + + + org.apache.httpcomponents + httpcore + 4.4 + compile + + + commons-configuration + commons-configuration + 1.6 + compile + + + org.apache.hadoop + hadoop-auth + 2.6.0-cdh5.7.1 + compile + + + org.apache.htrace + htrace-core4 + 4.0.1-incubating + compile + + + javax.servlet + javax.servlet-api + 3.1.0 + compile + + + commons-cli + commons-cli + 1.2 + compile + + + org.scalatest + scalatest_2.10 + 2.1.6 + test + + + io.spray + spray-json_2.10 + 1.2.6 + compile + + + io.spray + spray-testkit + 1.2.3 + test + + + io.spray + spray-httpx + 1.2.3 + compile + + + io.spray + spray-http + 1.2.3 + compile + + + io.spray + spray-can + 1.2.3 + compile + + + io.spray + spray-routing + 1.2.3 + compile + + + io.spray + spray-client + 1.2.3 + compile + + + io.spray + spray-util + 1.2.3 + compile + + + io.spray + spray-io + 1.2.3 + compile + + + org.parboiled + parboiled-scala_2.10 + 1.1.6 + compile + + + org.parboiled + parboiled-core + 1.1.6 + compile + + + org.apache.commons + commons-math3 + 3.0 + compile + + + com.intel.chimera + chimera + 0.9.2 + compile + + + org.apache.maven + maven-artifact + 2.2.1 + compile + + + + + + true + + central1 + http://central.maven.org/maven2 + + + + true + + + false + + tap + https://tap.jfrog.io/tap/public/ + + + + false + + + true + daily + + tap-snapshots + https://tap.jfrog.io/tap/public-snapshots/ + + + + true + + + true + never + + cloudera cdh + https://repository.cloudera.com/cloudera/cloudera-repos/ + + + + true + + + true + never + + apache + https://repository.apache.org/content/groups/public/ + + + + true + + + true + never + + sonatype + https://oss.sonatype.org/content/groups/public/ + + + + true + + + false + + central + http://repo1.maven.org/maven2 + + + + true + + + true + + cloudera-cdh + https://repository.cloudera.com/cloudera/cloudera-repos/ + + + SparkPackagesRepo + http://dl.bintray.com/spark-packages/maven + + + + + + never + + + false + + central + Central Repository + https://repo.maven.apache.org/maven2 + + + + /home/rodorad/Documents/forks/rodorad-scoring-engine/model-scoring-core/src/main/java + /home/rodorad/Documents/forks/rodorad-scoring-engine/model-scoring-core/src/main/scripts + /home/rodorad/Documents/forks/rodorad-scoring-engine/model-scoring-core/src/test/java + /home/rodorad/Documents/forks/rodorad-scoring-engine/model-scoring-core/target/classes + /home/rodorad/Documents/forks/rodorad-scoring-engine/model-scoring-core/target/test-classes + + + /home/rodorad/Documents/forks/rodorad-scoring-engine/model-scoring-core/src/main/resources + + + + + /home/rodorad/Documents/forks/rodorad-scoring-engine/model-scoring-core/src/test/resources + + + /home/rodorad/Documents/forks/rodorad-scoring-engine/model-scoring-core/target + model-scoring-core-1.0-SNAPSHOT + + + + maven-antrun-plugin + 1.3 + + + maven-assembly-plugin + 2.2-beta-5 + + + org.codehaus.mojo + exec-maven-plugin + 1.3.2 + + + maven-compiler-plugin + 3.1 + + + default-compile + none + + + + + net.alchim31.maven + scala-maven-plugin + 3.1.6 + + + compile + + add-source + compile + + + + -Xms256m + -Xmx512m + + + -g:vars + + incremental + true + 2.10.5 + false + + + + test + + add-source + testCompile + + + incremental + true + 2.10.5 + false + + + + true + + incremental + true + 2.10.5 + false + + + + org.scalatest + scalatest-maven-plugin + 1.0 + + + scalaTest + test + + test + + + /home/rodorad/Documents/forks/rodorad-scoring-engine/model-scoring-core/target/surefire-reports + . + WDF TestSuite.txt + false + FTD + -Xmx512m -XX:PermSize=256m + + + + true + + /home/rodorad/Documents/forks/rodorad-scoring-engine/model-scoring-core/target/surefire-reports + . + WDF TestSuite.txt + false + FTD + -Xmx512m -XX:PermSize=256m + + + + org.codehaus.mojo + license-maven-plugin + 1.9 + + + download-licenses + + download-licenses + + + provided,test,system + false + compile + + + + + provided,test,system + false + compile + + + + com.mycila + license-maven-plugin + 2.3 + +
license-header.txt
+ + + + maven-dependency-plugin + 2.9 + + + copy-dependencies + prepare-package + + copy-dependencies + + + true + /home/rodorad/Documents/forks/rodorad-scoring-engine/model-scoring-core/target/lib + true + true + true + provided + + + + + + maven-release-plugin + 2.3.2 + + + + + + org.codehaus.mojo + properties-maven-plugin + 1.0.0 + + + generate-resources + + write-project-properties + + + target/app.properties + + + + + + maven-enforcer-plugin + 1.4.1 + + + enforce-maven + + enforce + + + + + 3.1.1 + + + 1.8 + + + + + + + + maven-compiler-plugin + 3.1 + + + default-compile + none + + compile + + + + default-testCompile + test-compile + + testCompile + + + + + + com.mycila + license-maven-plugin + 2.3 + + + + check + format + + +
license-header.txt
+ + Intel Corporation + 2016 + + + **/README + **/src/test/resources/** + **/src/main/resources/** + **/findbugs-exclude.xml + **/scalastyle-config.xml + **/checkstyle.xml + **/pom.xml + **/*.txt + **/*.csv + **/*.rst + **/*.tpl + **/*.inc + **/*.conf + **/*.sql + **/*.pyc + **/*pom.xml + + + + + +
license-header.txt
+ + Intel Corporation + 2016 + + + **/README + **/src/test/resources/** + **/src/main/resources/** + **/findbugs-exclude.xml + **/scalastyle-config.xml + **/checkstyle.xml + **/pom.xml + **/*.txt + **/*.csv + **/*.rst + **/*.tpl + **/*.inc + **/*.conf + **/*.sql + **/*.pyc + **/*pom.xml + + + + + maven-help-plugin + 2.2 + + epom.xml + + + + net.alchim31.maven + scala-maven-plugin + 3.1.6 + + + compile + + add-source + compile + + + + -Xms256m + -Xmx512m + + + -g:vars + + incremental + true + 2.10.5 + false + + + + test + + add-source + testCompile + + + incremental + true + 2.10.5 + false + + + + true + + incremental + true + 2.10.5 + false + + + + org.scalatest + scalatest-maven-plugin + 1.0 + + + scalaTest + test + + test + + + /home/rodorad/Documents/forks/rodorad-scoring-engine/model-scoring-core/target/surefire-reports + . + WDF TestSuite.txt + false + FTD + -Xmx512m -XX:PermSize=256m + + + + true + + /home/rodorad/Documents/forks/rodorad-scoring-engine/model-scoring-core/target/surefire-reports + . + WDF TestSuite.txt + false + FTD + -Xmx512m -XX:PermSize=256m + + + + maven-dependency-plugin + 2.9 + + + copy-dependencies + prepare-package + + copy-dependencies + + + true + /home/rodorad/Documents/forks/rodorad-scoring-engine/model-scoring-core/target/lib + true + true + true + provided + + + + + + org.codehaus.mojo + exec-maven-plugin + 1.3.2 + + + package-cf + package + + exec + + + bash + /home/rodorad/Documents/forks/rodorad-scoring-engine/model-scoring-core + + package_cf.sh + + + + + + + maven-clean-plugin + 2.5 + + + default-clean + clean + + clean + + + + + + maven-resources-plugin + 2.6 + + + default-testResources + process-test-resources + + testResources + + + + default-resources + process-resources + + resources + + + + + + maven-jar-plugin + 2.4 + + + default-jar + package + + jar + + + + + + maven-surefire-plugin + 2.12.4 + + + default-test + test + + test + + + + + + maven-install-plugin + 2.4 + + + default-install + install + + install + + + + + + maven-deploy-plugin + 2.7 + + + default-deploy + deploy + + deploy + + + + + + maven-site-plugin + 3.3 + + + default-site + site + + site + + + /home/rodorad/Documents/forks/rodorad-scoring-engine/model-scoring-core/target/site + + + org.apache.maven.plugins + maven-project-info-reports-plugin + + + + + + default-deploy + site-deploy + + deploy + + + /home/rodorad/Documents/forks/rodorad-scoring-engine/model-scoring-core/target/site + + + org.apache.maven.plugins + maven-project-info-reports-plugin + + + + + + + /home/rodorad/Documents/forks/rodorad-scoring-engine/model-scoring-core/target/site + + + org.apache.maven.plugins + maven-project-info-reports-plugin + + + + + + + + /home/rodorad/Documents/forks/rodorad-scoring-engine/model-scoring-core/target/site + + + + build-server + + + env.BUILD_NUMBER + + + + + + org.codehaus.mojo + exec-maven-plugin + + + package-cf + package + + exec + + + bash + /home/rodorad/Documents/forks/rodorad-scoring-engine/model-scoring-core + + package_cf.sh + + + + + + + + + + \ No newline at end of file diff --git a/jq b/model-scoring-core/jq similarity index 100% rename from jq rename to model-scoring-core/jq diff --git a/manifest.yml.tpl b/model-scoring-core/manifest.yml.tpl similarity index 100% rename from manifest.yml.tpl rename to model-scoring-core/manifest.yml.tpl diff --git a/package_cf.sh b/model-scoring-core/package_cf.sh similarity index 92% rename from package_cf.sh rename to model-scoring-core/package_cf.sh index e96817e..3e14f69 100755 --- a/package_cf.sh +++ b/model-scoring-core/package_cf.sh @@ -15,6 +15,11 @@ # limitations under the License. # +set -e + +VERSION="${VERSION:-0.7.4}" +POST_TAG="${POST_TAG:-dev}" +BUILD_NUMBER="${BUILD_NUMBER:-1}" MODULE=model-scoring-cf-$VERSION.$POST_TAG$BUILD_NUMBER diff --git a/package_java.sh b/model-scoring-core/package_java.sh similarity index 91% rename from package_java.sh rename to model-scoring-core/package_java.sh index ce42b4b..3e4b45f 100755 --- a/package_java.sh +++ b/model-scoring-core/package_java.sh @@ -15,6 +15,11 @@ # limitations under the License. # +set -e + +VERSION="${VERSION:-0.7.4}" +POST_TAG="${POST_TAG:-dev}" +BUILD_NUMBER="${BUILD_NUMBER:-1}" MODULE=model-scoring-java-$VERSION.$POST_TAG$BUILD_NUMBER diff --git a/model-scoring-core/pom.xml b/model-scoring-core/pom.xml new file mode 100644 index 0000000..63c0163 --- /dev/null +++ b/model-scoring-core/pom.xml @@ -0,0 +1,591 @@ + + + 4.0.0 + + org.trustedanalytics + model-scoring + 1.0-SNAPSHOT + + + model-scoring-core + 1.0-SNAPSHOT + jar + + + + build-server + + + env.BUILD_NUMBER + + + + + + + org.codehaus.mojo + exec-maven-plugin + + + package-cf + package + + exec + + + bash + + package_cf.sh + + + + + + + + + + + + + + org.codehaus.mojo + exec-maven-plugin + + + package-java + package + + exec + + + bash + + package_java.sh + + + + + + + + net.alchim31.maven + scala-maven-plugin + + + org.scalatest + scalatest-maven-plugin + + + org.apache.maven.plugins + maven-dependency-plugin + + + + + + + org.trustedanalytics + model-archive-format + 0.1.1 + + + org.trustedanalytics + model-archive-interfaces + 0.1.1 + + + com.typesafe + config + ${tap.typesafe-config.version} + + + + log4j + log4j + 1.2.17 + + + org.slf4j + jul-to-slf4j + 1.7.10 + + + org.slf4j + slf4j-api + 1.7.10 + + + org.slf4j + slf4j-log4j12 + 1.7.10 + + + org.slf4j + jcl-over-slf4j + 1.7.5 + + + joda-time + joda-time + 2.1 + + + org.trustedanalytics + hadoop-utils + 0.6.2 + + + io.netty + netty + + + + + org.jvnet.mimepull + mimepull + 1.9.4 + + + org.apache.spark + spark-core_${tap.scala.short.version} + ${tap.spark.version} + + + org.apache.spark + spark-network-shuffle_${tap.scala.short.version} + ${tap.spark.version} + + + org.apache.spark + spark-network-common_${tap.scala.short.version} + ${tap.spark.version} + + + io.netty + netty-all + 4.0.29.Final + + + io.netty + netty + 3.6.6.Final + + + org.apache.spark + spark-unsafe_${tap.scala.short.version} + ${tap.spark.long.version} + + + org.apache.spark + spark-launcher_${tap.scala.short.version} + ${tap.spark.long.version} + + + org.apache.spark + spark-graphx_${tap.scala.short.version} + ${tap.spark.version} + + + org.apache.spark + spark-sql_${tap.scala.short.version} + ${tap.spark.version} + + + org.apache.spark + spark-catalyst_${tap.scala.short.version} + ${tap.spark.version} + + + org.apache.spark + spark-mllib_${tap.scala.short.version} + ${tap.spark.version} + + + com.codahale.metrics + metrics-core + 3.0.1 + + + com.codahale.metrics + metrics-json + 3.0.1 + + + org.json4s + json4s-core_${tap.scala.short.version} + 3.2.10 + + + org.json4s + json4s-ast_${tap.scala.short.version} + 3.2.10 + + + org.json4s + json4s-jackson_${tap.scala.short.version} + 3.2.10 + + + com.fasterxml.jackson.core + jackson-databind + ${fasterxml} + + + com.fasterxml.jackson.core + jackson-annotations + ${fasterxml} + + + com.fasterxml.jackson.core + jackson-core + ${fasterxml} + + + com.fasterxml.jackson.module + jackson-module-scala_${tap.scala.short.version} + ${fasterxml} + + + com.thoughtworks.paranamer + paranamer + 2.6 + + + org.apache.hadoop + hadoop-core + 2.6.0-mr1-cdh5.7.1 + + + org.xerial.snappy + snappy-java + 1.1.0.1 + + + org.apache.xbean + xbean-asm5-shaded + 3.17 + + + com.esotericsoftware.kryo + kryo + 2.16 + + + org.scala-lang.virtualized + scalap + 2.10.1-RC1 + + + org.scala-lang + scala-compiler + 2.9.2 + + + com.twitter + parquet-hadoop + 1.5.0-cdh5.7.1 + + + com.twitter + parquet-common + 1.5.0-cdh5.7.1 + + + com.twitter + parquet-format + 2.2.0 + + + com.twitter + parquet-column + 1.5.0-cdh5.7.1 + + + com.twitter + parquet-encoding + 1.3.0 + + + org.codehaus.jackson + jackson-core-asl + 1.9.13 + + + org.codehaus.jackson + jackson-mapper-asl + 1.8.8 + + + org.codehaus.janino + janino + 2.7.8 + + + org.codehaus.janino + commons-compiler + 2.7.8 + + + org.scalanlp + breeze_${tap.scala.short.version} + 0.11.2 + + + com.google.protobuf + protobuf-java + 2.5.0 + + + com.github.fommil.netlib + core + 1.1.2 + + + net.sourceforge.f2j + arpack_combined_all + 0.1 + + + org.scala-lang + scala-reflect + ${tap.scala.long.version} + + + com.chuusai + shapeless_${tap.scala.short.version} + 1.2.4 + + + org.mockito + mockito-all + 1.9.5 + test + + + org.spark-project.protobuf + protobuf-java + 2.4.1-shaded + + + ${akka.group} + akka-remote_${tap.scala.short.version} + ${akka.version} + + + com.google.protobuf + protobuf-java + + + + + ${akka.group} + akka-actor_${tap.scala.short.version} + ${akka.version} + + + ${akka.group} + akka-slf4j_${tap.scala.short.version} + ${akka.version} + + + ${akka.group} + akka-testkit_${tap.scala.short.version} + ${akka.version} + test + + + org.apache.commons + commons-lang3 + ${tap.commons-lang3.version} + + + commons-lang + commons-lang + 2.6 + + + org.scala-lang + scala-library + ${tap.scala.long.version} + + + org.apache.commons + commons-compress + 1.7 + + + commons-collections + commons-collections + 3.2.1 + + + commons-beanutils + commons-beanutils-core + + + + + commons-io + commons-io + 2.1 + + + org.apache.hadoop + hadoop-common + ${tap.hadoop2.version} + + + com.thoughtworks.paranamer + paranamer + + + + + org.apache.hadoop + hadoop-hdfs + ${tap.hadoop2.version} + + + io.netty + netty + + + io.netty + netty-all + + + + + org.apache.httpcomponents + httpclient + 4.3.6 + + + com.googlecode.json-simple + json-simple + 1.1 + + + com.google.guava + guava + 14.0.1 + + + org.bitbucket.b_c + jose4j + 0.5.1 + + + org.apache.httpcomponents + httpcore + 4.4 + + + commons-configuration + commons-configuration + 1.6 + + + org.apache.hadoop + hadoop-auth + ${tap.hadoop2.version} + + + org.apache.htrace + htrace-core4 + 4.0.1-incubating + + + javax.servlet + javax.servlet-api + 3.1.0 + + + commons-cli + commons-cli + 1.2 + + + org.scalatest + scalatest_${tap.scala.short.version} + ${tap.scalatest.version} + test + + + io.spray + spray-json_${tap.scala.short.version} + 1.2.6 + + + io.spray + spray-testkit + ${spray.version} + test + + + io.spray + spray-httpx + ${spray.version} + + + io.spray + spray-http + ${spray.version} + + + io.spray + spray-can + ${spray.version} + + + io.spray + spray-routing + ${spray.version} + + + io.spray + spray-client + ${spray.version} + + + io.spray + spray-util + ${spray.version} + + + io.spray + spray-io + ${spray.version} + + + + org.parboiled + parboiled-scala_${tap.scala.short.version} + 1.1.6 + + + org.parboiled + parboiled-core + 1.1.6 + + + org.apache.commons + commons-math3 + 3.0 + + + com.intel.chimera + chimera + 0.9.2 + + + + org.apache.maven + maven-artifact + 2.2.1 + + + \ No newline at end of file diff --git a/src/main/resources/atk-module.conf b/model-scoring-core/src/main/resources/atk-module.conf similarity index 100% rename from src/main/resources/atk-module.conf rename to model-scoring-core/src/main/resources/atk-module.conf diff --git a/src/main/resources/logback.xml b/model-scoring-core/src/main/resources/logback.xml similarity index 100% rename from src/main/resources/logback.xml rename to model-scoring-core/src/main/resources/logback.xml diff --git a/src/main/resources/reference.conf b/model-scoring-core/src/main/resources/reference.conf similarity index 100% rename from src/main/resources/reference.conf rename to model-scoring-core/src/main/resources/reference.conf diff --git a/src/main/scala/org/trustedanalytics/scoring/MyMainFunction.scala b/model-scoring-core/src/main/scala/org/trustedanalytics/scoring/MyMainFunction.scala similarity index 100% rename from src/main/scala/org/trustedanalytics/scoring/MyMainFunction.scala rename to model-scoring-core/src/main/scala/org/trustedanalytics/scoring/MyMainFunction.scala diff --git a/src/main/scala/org/trustedanalytics/scoring/ScoringService.scala b/model-scoring-core/src/main/scala/org/trustedanalytics/scoring/ScoringService.scala similarity index 100% rename from src/main/scala/org/trustedanalytics/scoring/ScoringService.scala rename to model-scoring-core/src/main/scala/org/trustedanalytics/scoring/ScoringService.scala diff --git a/src/main/scala/org/trustedanalytics/scoring/ScoringServiceApplication.scala b/model-scoring-core/src/main/scala/org/trustedanalytics/scoring/ScoringServiceApplication.scala similarity index 100% rename from src/main/scala/org/trustedanalytics/scoring/ScoringServiceApplication.scala rename to model-scoring-core/src/main/scala/org/trustedanalytics/scoring/ScoringServiceApplication.scala diff --git a/src/main/scala/org/trustedanalytics/scoring/ScoringServiceJsonProtocol.scala b/model-scoring-core/src/main/scala/org/trustedanalytics/scoring/ScoringServiceJsonProtocol.scala similarity index 100% rename from src/main/scala/org/trustedanalytics/scoring/ScoringServiceJsonProtocol.scala rename to model-scoring-core/src/main/scala/org/trustedanalytics/scoring/ScoringServiceJsonProtocol.scala diff --git a/src/test/resources/logback.xml b/model-scoring-core/src/test/resources/logback.xml similarity index 100% rename from src/test/resources/logback.xml rename to model-scoring-core/src/test/resources/logback.xml diff --git a/src/test/scala/org/trustedanalytics/ScoringServiceJsonProtocolTest.scala b/model-scoring-core/src/test/scala/org/trustedanalytics/ScoringServiceJsonProtocolTest.scala similarity index 100% rename from src/test/scala/org/trustedanalytics/ScoringServiceJsonProtocolTest.scala rename to model-scoring-core/src/test/scala/org/trustedanalytics/ScoringServiceJsonProtocolTest.scala diff --git a/pom.xml b/pom.xml index 93dc76e..c5ce24a 100644 --- a/pom.xml +++ b/pom.xml @@ -6,12 +6,13 @@ org.trustedanalytics tap-root - 0.1.2 + 0.1.3 model-scoring 1.0-SNAPSHOT - jar + pom + 2.2.3-shaded-protobuf @@ -20,6 +21,7 @@ 2.4.4 + tap-snapshots @@ -31,6 +33,7 @@ + central1 @@ -96,9 +99,48 @@ + + + model-scoring-core + + + + + + dev + + + env.BUILD_NUMBER + + + + docker + + + + + - src/main/scala - + + + + + org.codehaus.mojo + exec-maven-plugin + 1.3.2 + + + org.apache.maven + maven-compiler-plugin + 3.6.0 + + + default-compile + none + + + + true @@ -137,25 +179,6 @@ false - - org.codehaus.mojo - license-maven-plugin - 1.9 - - provided,test,system - false - compile - - - - download-licenses - - download-licenses - - - - - true org.scalatest @@ -165,7 +188,7 @@ ${project.build.directory}/surefire-reports . WDF TestSuite.txt - false + true FTD -Xmx512m -XX:PermSize=256m @@ -180,6 +203,7 @@ + org.codehaus.mojo license-maven-plugin @@ -206,6 +230,7 @@
license-header.txt
 + org.apache.maven.plugins maven-dependency-plugin @@ -231,573 +256,30 @@ + + + - org.codehaus.mojo - exec-maven-plugin - 1.3.2 - - - package-cf - package - - exec - - - bash - ${basedir} - - package_cf.sh - - - - - package-java - package - - exec - - - bash - ${basedir} - - package_java.sh - - - - + org.apache.maven + maven-compiler-plugin + + + com.mycila + license-maven-plugin + + + org.apache.maven.plugins + maven-help-plugin + 2.2 + + epom.xml + - - - org.trustedanalytics - model-archive-format - 0.1.0 - - - org.trustedanalytics - model-archive-interfaces - 0.1.0 - - - com.typesafe - config - ${tap.typesafe-config.version} - - - - - log4j - log4j - 1.2.17 - - - org.slf4j - jul-to-slf4j - 1.7.10 - - - org.slf4j - slf4j-api - 1.7.10 - - - org.slf4j - slf4j-log4j12 - 1.7.10 - - - org.slf4j - jcl-over-slf4j - 1.7.5 - - - - org.trustedanalytics - model-archive-format - 0.1.1 - - - org.trustedanalytics - model-archive-interfaces - 0.1.1 - - - joda-time - joda-time - 2.1 - - - org.trustedanalytics - hadoop-utils - 0.6.2 - - - io.netty - netty - - - - - org.jvnet.mimepull - mimepull - 1.9.4 - - - org.apache.spark - spark-core_${tap.scala.short.version} - ${tap.spark.version} - - - org.apache.spark - spark-network-shuffle_${tap.scala.short.version} - ${tap.spark.version} - - - org.apache.spark - spark-network-common_${tap.scala.short.version} - ${tap.spark.version} - - - io.netty - netty-all - 4.0.29.Final - - - io.netty - netty - 3.6.6.Final - - - - org.apache.spark - spark-unsafe_${tap.scala.short.version} - ${tap.spark.long.version} - - - org.apache.spark - spark-launcher_${tap.scala.short.version} - ${tap.spark.long.version} - - - org.apache.spark - spark-graphx_${tap.scala.short.version} - ${tap.spark.version} - - - org.apache.spark - spark-sql_${tap.scala.short.version} - ${tap.spark.version} - - - org.apache.spark - spark-catalyst_${tap.scala.short.version} - ${tap.spark.version} - - - org.apache.spark - spark-mllib_${tap.scala.short.version} - ${tap.spark.version} - - - - com.codahale.metrics - metrics-core - 3.0.1 - - - com.codahale.metrics - metrics-json - 3.0.1 - - - org.json4s - json4s-core_${tap.scala.short.version} - 3.2.10 - - - org.json4s - json4s-ast_${tap.scala.short.version} - 3.2.10 - - - org.json4s - json4s-jackson_${tap.scala.short.version} - 3.2.10 - - - - - com.fasterxml.jackson.core - jackson-databind - ${fasterxml} - - - com.fasterxml.jackson.core - jackson-annotations - ${fasterxml} - - - com.fasterxml.jackson.core - jackson-core - ${fasterxml} - - - com.fasterxml.jackson.module - jackson-module-scala_${tap.scala.short.version} - ${fasterxml} - - - - com.thoughtworks.paranamer - paranamer - 2.6 - - - org.apache.hadoop - hadoop-core - 2.6.0-mr1-cdh5.7.1 - - - org.xerial.snappy - snappy-java - 1.1.0.1 - - - org.apache.xbean - xbean-asm5-shaded - 3.17 - - - com.esotericsoftware.kryo - kryo - 2.16 - - - org.scala-lang.virtualized - scalap - 2.10.1-RC1 - - - org.scala-lang - scala-compiler - 2.9.2 - - - - com.twitter - parquet-hadoop - 1.5.0-cdh5.7.1 - - - com.twitter - parquet-common - 1.5.0-cdh5.7.1 - - - com.twitter - parquet-format - 2.2.0 - - - com.twitter - parquet-column - 1.5.0-cdh5.7.1 - - - com.twitter - parquet-encoding - 1.3.0 - - - org.codehaus.jackson - jackson-core-asl - 1.9.13 - - - org.codehaus.jackson - jackson-mapper-asl - 1.8.8 - - - - org.codehaus.janino - janino - 2.7.8 - - - org.codehaus.janino - commons-compiler - 2.7.8 - - - org.scalanlp - breeze_${tap.scala.short.version} - 0.11.2 - - - com.google.protobuf - protobuf-java - 2.5.0 - - - com.github.fommil.netlib - core - 1.1.2 - - - - net.sourceforge.f2j - arpack_combined_all - 0.1 - - - - org.scala-lang - scala-reflect - ${tap.scala.long.version} - - - com.chuusai - shapeless_${tap.scala.short.version} - 1.2.4 - - - org.mockito - mockito-all - 1.9.5 - test - - - org.spark-project.protobuf - protobuf-java - 2.4.1-shaded - - - ${akka.group} - akka-remote_${tap.scala.short.version} - ${akka.version} - - - com.google.protobuf - protobuf-java - - - - - ${akka.group} - akka-actor_${tap.scala.short.version} - ${akka.version} - - - ${akka.group} - akka-slf4j_${tap.scala.short.version} - ${akka.version} - - - ${akka.group} - akka-testkit_${tap.scala.short.version} - ${akka.version} - test - - - - org.apache.commons - commons-lang3 - ${tap.commons-lang3.version} - - - commons-lang - commons-lang - 2.6 - - - org.scala-lang - scala-library - ${tap.scala.long.version} - - - org.apache.commons - commons-compress - 1.7 - - - commons-collections - commons-collections - 3.2.1 - - - commons-beanutils - commons-beanutils-core - - - - - commons-io - commons-io - 2.1 - - - org.apache.hadoop - hadoop-common - ${tap.hadoop2.version} - - - com.thoughtworks.paranamer - paranamer - - - - - org.apache.hadoop - hadoop-hdfs - ${tap.hadoop2.version} - - - io.netty - netty - - - io.netty - netty-all - - - - - org.apache.httpcomponents - httpclient - 4.3.6 - - - com.googlecode.json-simple - json-simple - 1.1 - - - com.google.guava - guava - 14.0.1 - - - - org.bitbucket.b_c - jose4j - 0.5.1 - - - org.apache.httpcomponents - httpcore - 4.4 - - - - commons-configuration - commons-configuration - 1.6 - - - org.apache.hadoop - hadoop-auth - ${tap.hadoop2.version} - - - org.apache.htrace - htrace-core4 - 4.0.1-incubating - - - javax.servlet - javax.servlet-api - 3.1.0 - - - commons-cli - commons-cli - 1.2 - - - org.scalatest - scalatest_${tap.scala.short.version} - ${tap.scalatest.version} - test - - - io.spray - spray-json_${tap.scala.short.version} - 1.2.6 - - - io.spray - spray-testkit - ${spray.version} - test - - - io.spray - spray-httpx - ${spray.version} - - - io.spray - spray-http - ${spray.version} - - - io.spray - spray-can - ${spray.version} - - - io.spray - spray-routing - ${spray.version} - - - io.spray - spray-client - ${spray.version} - - - io.spray - spray-util - ${spray.version} - - - io.spray - spray-io - ${spray.version} - - - - org.parboiled - parboiled-scala_${tap.scala.short.version} - 1.1.6 - - - org.parboiled - parboiled-core - 1.1.6 - - - org.apache.commons - commons-math3 - 3.0 - - - com.intel.chimera - chimera - 0.9.2 - - - - org.apache.maven - maven-artifact - 2.2.1 - - \ No newline at end of file