From 2b4495aa0a51f3a84b50273fbf391b419cd534e5 Mon Sep 17 00:00:00 2001 From: "Schmalzried, Terry (ts862m)" Date: Mon, 27 Jul 2020 12:31:52 -0400 Subject: Upgrade dependencies Delete unused files Dockerfile and startSCH.sh Issue-ID: DCAEGEN2-2330 Change-Id: Id2f699b0530545628c77728ffe00740975aad014 Signed-off-by: Schmalzried, Terry (ts862m) --- Dockerfile | 13 ------------- project.clj | 20 ++++++++++---------- startSCH.sh | 8 -------- 3 files changed, 10 insertions(+), 31 deletions(-) delete mode 100644 Dockerfile delete mode 100644 startSCH.sh diff --git a/Dockerfile b/Dockerfile deleted file mode 100644 index 7b4d2bc..0000000 --- a/Dockerfile +++ /dev/null @@ -1,13 +0,0 @@ -FROM maven:3-jdk-8 -RUN apt-get update && apt-get install -y sendmail - -WORKDIR /opt/sch -ADD . /opt/sch -RUN mvn clean package - -# TODO: This is bogus. This is simply to be used for Registrator registration. -EXPOSE 65000 - -COPY startSCH.sh /opt/sch -RUN chmod +x /opt/sch/startSCH.sh -CMD ["/opt/sch/startSCH.sh"] diff --git a/project.clj b/project.clj index 2432aec..67b841a 100644 --- a/project.clj +++ b/project.clj @@ -1,7 +1,7 @@ ; ============LICENSE_START======================================================= ; org.onap.dcae ; ================================================================================ -; Copyright (c) 2017 AT&T Intellectual Property. All rights reserved. +; Copyright (c) 2017-2020 AT&T Intellectual Property. All rights reserved. ; ================================================================================ ; Licensed under the Apache License, Version 2.0 (the "License"); ; you may not use this file except in compliance with the License. @@ -21,24 +21,24 @@ ; Using lein for REPL and testing because couldn't get Maven clojure plugin to work ; for these functional areas. -(defproject service-change-handler "1.3.2" +(defproject service-change-handler "1.4.0" :description "Service change handler" - :dependencies [[org.clojure/clojure "1.8.0"] - [cheshire/cheshire "5.8.0"] - [org.clojure/tools.logging "0.4.0"] - [clj-http/clj-http "3.3.0"] - [org.bovinegenius/exploding-fish "0.3.4"] + :dependencies [[org.clojure/clojure "1.10.1"] + [cheshire/cheshire "5.10.0"] + [org.clojure/tools.logging "1.1.0"] + [clj-http/clj-http "3.10.1"] + [org.bovinegenius/exploding-fish "0.3.6"] [clj-yaml/clj-yaml "0.4.0"] [org.onap.sdc.sdc-distribution-client/sdc-distribution-client "1.3.0"] - [ch.qos.logback/logback-classic "1.2.1"] + [ch.qos.logback/logback-classic "1.2.3"] ] ; TODO: Fill in the onap maven repository info :repositories [["onap nexus" "https://nexus.onap.org/content/repositories/snapshots/"]] :plugins [[lein-cloverage "1.0.9"]] - :profiles { :test { :dependencies [[clj-fakes "0.9.0"]] } + :profiles { :test { :dependencies [[clj-fakes "0.12.0"]] } ; Added this for cloverage - :dev { :dependencies [[clj-fakes "0.9.0"]] } } + :dev { :dependencies [[clj-fakes "0.12.0"]] } } ) diff --git a/startSCH.sh b/startSCH.sh deleted file mode 100644 index 951b1eb..0000000 --- a/startSCH.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/bash - -grep "^nameserver" /opt/sch/etc/resolv.conf >> /etc/resolv.conf - -service sendmail start - -java -Dlogback.configurationFile=logback.xml -jar /opt/sch/target/dcae-service-change-handler.jar prod http://consul:8500/v1/kv/service-change-handler?raw=true - -- cgit 1.2.3-korg