From a7d1da3308031c3cce5e2e09b1f2727f1fceef02 Mon Sep 17 00:00:00 2001 From: "Timoney, Dan (dt5972)" Date: Fri, 15 Jun 2018 16:13:55 -0400 Subject: Update sli/core to ODL Oxygen Update sli/core artifacts to compile cleanly against ODL Oxygen version of CCSDK parent poms. Change-Id: I9f3b4c40b1ae62cdda1c35836466f8faf7da3b39 Issue-ID: CCSDK-280 Signed-off-by: Timoney, Dan (dt5972) --- dblib/features/ccsdk-dblib/pom.xml | 33 +-- .../ccsdk-dblib/src/main/feature/feature.xml | 9 +- dblib/provider/pom.xml | 162 ++++++----- filters/features/ccsdk-filters/pom.xml | 25 +- filters/provider/pom.xml | 14 +- .../filters/RequestResponseDbLoggingFilter.java | 299 --------------------- .../core/filters/RequestResponseLoggingFilter.java | 28 ++ .../filters/TestRequestResponseLoggingFilter.java | 36 +++ sli/common/pom.xml | 29 +- sli/features/odl-sli/pom.xml | 31 +-- sli/provider/pom.xml | 176 ++++++------ sli/recording/pom.xml | 93 +++---- .../features/ccsdk-sliPluginUtils/pom.xml | 17 +- sliPluginUtils/provider/pom.xml | 5 +- sliapi/features/ccsdk-sliapi/pom.xml | 21 +- sliapi/provider/pom.xml | 18 +- utils/provider/pom.xml | 11 +- 17 files changed, 320 insertions(+), 687 deletions(-) delete mode 100644 filters/provider/src/main/java/org/onap/ccsdk/sli/core/filters/RequestResponseDbLoggingFilter.java diff --git a/dblib/features/ccsdk-dblib/pom.xml b/dblib/features/ccsdk-dblib/pom.xml index 3a2f7a1b..5d05f84b 100644 --- a/dblib/features/ccsdk-dblib/pom.xml +++ b/dblib/features/ccsdk-dblib/pom.xml @@ -17,31 +17,8 @@ ccsdk-sli-core :: dblib :: ${project.artifactId} - - - - org.opendaylight.mdsal.model - mdsal-model-artifacts - 0.11.1 - pom - import - - - org.opendaylight.controller - mdsal-artifacts - 1.6.1 - pom - import - - - + - - org.opendaylight.controller - odl-mdsal-broker - xml - features - ${project.groupId} @@ -64,16 +41,10 @@ utils-provider ${project.version} - - equinoxSDK381 - org.eclipse.osgi - ${equinox.osgi.version} - provided - + org.apache.derby derby - 10.11.1.1 diff --git a/dblib/features/ccsdk-dblib/src/main/feature/feature.xml b/dblib/features/ccsdk-dblib/src/main/feature/feature.xml index 514ce8de..771c3745 100644 --- a/dblib/features/ccsdk-dblib/src/main/feature/feature.xml +++ b/dblib/features/ccsdk-dblib/src/main/feature/feature.xml @@ -1,14 +1,13 @@ - mvn:org.opendaylight.controller/odl-mdsal-broker/1.6.1/xml/features +
Root POM to be used in place of odlparent for CCSDK based projects
- odl-mdsal-broker wrap mvn:org.onap.ccsdk.sli.core/dblib-provider/${project.version} - mvn:org.mariadb.jdbc/mariadb-java-client/2.1.1 - wrap:mvn:org.apache.tomcat/tomcat-jdbc/8.5.14/$DynamicImport-Package=org.mariadb.*,org.apache.derby.*&overwrite=merge - wrap:mvn:org.apache.tomcat/tomcat-juli/8.5.14/$DynamicImport-Package=org.mariadb.*,org.apache.derby.*&overwrite=merge + mvn:org.mariadb.jdbc/mariadb-java-client/${mariadb.connector.version} + wrap:mvn:org.apache.tomcat/tomcat-jdbc/${tomcat-jdbc.version}/$DynamicImport-Package=org.mariadb.*,org.apache.derby.*&overwrite=merge + wrap:mvn:org.apache.tomcat/tomcat-juli/${tomcat-jdbc.version}/$DynamicImport-Package=org.mariadb.*,org.apache.derby.*&overwrite=merge mvn:org.onap.ccsdk.sli.core/utils-provider/${project.version} diff --git a/dblib/provider/pom.xml b/dblib/provider/pom.xml index e263374a..78e70165 100755 --- a/dblib/provider/pom.xml +++ b/dblib/provider/pom.xml @@ -1,91 +1,87 @@ - - 4.0.0 + + 4.0.0 - - org.onap.ccsdk.parent - binding-parent - 1.1.0-SNAPSHOT - - + + org.onap.ccsdk.parent + binding-parent + 1.1.0-SNAPSHOT + + - org.onap.ccsdk.sli.core - dblib-provider - 0.3.0-SNAPSHOT - bundle + org.onap.ccsdk.sli.core + dblib-provider + 0.3.0-SNAPSHOT + bundle - ccsdk-sli-core :: dblib :: ${project.artifactId} - http://maven.apache.org + ccsdk-sli-core :: dblib :: ${project.artifactId} + http://maven.apache.org - - UTF-8 - + + UTF-8 + - - - junit - junit - ${junit.version} - test - - - ch.vorburger.mariaDB4j - mariaDB4j - 2.2.3 - test - - - equinoxSDK381 - org.eclipse.osgi - ${equinox.osgi.version} - - - org.slf4j - slf4j-api - ${slf4j.version} - - - org.slf4j - jcl-over-slf4j - ${slf4j.version} - - - org.slf4j - slf4j-simple - ${slf4j.version} - test - - - org.mariadb.jdbc - mariadb-java-client - ${mariadb.connector.version} - - - org.apache.tomcat - tomcat-jdbc - ${tomcat-jdbc.version} - - - com.google.guava - guava - - - org.onap.ccsdk.sli.core - utils-provider - ${project.version} - + + + junit + junit + test + + + ch.vorburger.mariaDB4j + mariaDB4j + 2.2.3 + test + + + org.osgi + org.osgi.core + provided + + + org.slf4j + slf4j-api + + + org.slf4j + jcl-over-slf4j + + + org.slf4j + slf4j-simple + test + + + org.mariadb.jdbc + mariadb-java-client + ${mariadb.connector.version} + + + org.apache.tomcat + tomcat-jdbc + ${tomcat-jdbc.version} + + + com.google.guava + guava + + + org.onap.ccsdk.sli.core + utils-provider + ${project.version} + - - - org.mockito - mockito-core - test - - - org.apache.karaf.shell - org.apache.karaf.shell.console - ${karaf.plugin.version} - - + + + org.mockito + mockito-core + test + + + org.apache.karaf.shell + org.apache.karaf.shell.console + + diff --git a/filters/features/ccsdk-filters/pom.xml b/filters/features/ccsdk-filters/pom.xml index b35f5ec9..a995790d 100644 --- a/filters/features/ccsdk-filters/pom.xml +++ b/filters/features/ccsdk-filters/pom.xml @@ -17,31 +17,8 @@ ccsdk-sli-core :: filters :: ${project.artifactId} - - - - org.opendaylight.mdsal.model - mdsal-model-artifacts - 0.11.1 - pom - import - - - org.opendaylight.controller - mdsal-artifacts - 1.6.1 - pom - import - - - + - - org.opendaylight.controller - odl-mdsal-broker - xml - features - ${project.groupId} diff --git a/filters/provider/pom.xml b/filters/provider/pom.xml index dd78b2a6..c7d356ba 100755 --- a/filters/provider/pom.xml +++ b/filters/provider/pom.xml @@ -42,27 +42,23 @@ - - equinoxSDK381 - org.eclipse.osgi - ${equinox.osgi.version} - provided - + + org.osgi + org.osgi.core + provided + org.slf4j slf4j-api - ${slf4j.version} org.slf4j jcl-over-slf4j - ${slf4j.version} commons-codec commons-codec - ${commons.codec.version} org.onap.ccsdk.sli.core diff --git a/filters/provider/src/main/java/org/onap/ccsdk/sli/core/filters/RequestResponseDbLoggingFilter.java b/filters/provider/src/main/java/org/onap/ccsdk/sli/core/filters/RequestResponseDbLoggingFilter.java deleted file mode 100644 index 35913656..00000000 --- a/filters/provider/src/main/java/org/onap/ccsdk/sli/core/filters/RequestResponseDbLoggingFilter.java +++ /dev/null @@ -1,299 +0,0 @@ -/*- - * ============LICENSE_START======================================================= - * ONAP : CCSDK - * ================================================================================ - * Copyright (C) 2017 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. - * 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. - * ============LICENSE_END========================================================= - */ - -package org.onap.ccsdk.sli.core.filters; - -import java.io.BufferedReader; -import java.io.ByteArrayInputStream; -import java.io.ByteArrayOutputStream; -import java.io.IOException; -import java.io.InputStream; -import java.io.InputStreamReader; -import java.io.PrintWriter; -import java.util.zip.GZIPInputStream; - -import javax.servlet.Filter; -import javax.servlet.FilterChain; -import javax.servlet.FilterConfig; -import javax.servlet.ServletException; -import javax.servlet.ServletInputStream; -import javax.servlet.ServletOutputStream; -import javax.servlet.ServletRequest; -import javax.servlet.ServletResponse; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletRequestWrapper; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpServletResponseWrapper; - -import org.onap.ccsdk.sli.core.sli.MessageWriter; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -@Deprecated -public class RequestResponseDbLoggingFilter implements Filter { - - private static Logger log = LoggerFactory.getLogger(RequestResponseDbLoggingFilter.class); - - public static final String REQUEST_ID = "X-ECOMP-RequestID"; - - private static class ByteArrayServletStream extends ServletOutputStream { - - ByteArrayOutputStream baos; - - ByteArrayServletStream(ByteArrayOutputStream baos) { - this.baos = baos; - } - - @Override - public void write(int param) throws IOException { - baos.write(param); - } - } - - private static class ByteArrayPrintWriter { - - private ByteArrayOutputStream baos = new ByteArrayOutputStream(); - - private PrintWriter pw = new PrintWriter(baos); - - private ServletOutputStream sos = new ByteArrayServletStream(baos); - - public PrintWriter getWriter() { - return pw; - } - - public ServletOutputStream getStream() { - return sos; - } - - byte[] toByteArray() { - return baos.toByteArray(); - } - } - - private class BufferedServletInputStream extends ServletInputStream { - - ByteArrayInputStream bais; - - public BufferedServletInputStream(ByteArrayInputStream bais) { - this.bais = bais; - } - - @Override - public int available() { - return bais.available(); - } - - @Override - public int read() { - return bais.read(); - } - - @Override - public int read(byte[] buf, int off, int len) { - return bais.read(buf, off, len); - } - - } - - private class BufferedRequestWrapper extends HttpServletRequestWrapper { - - ByteArrayInputStream bais; - - ByteArrayOutputStream baos; - - BufferedServletInputStream bsis; - - byte[] buffer; - - public BufferedRequestWrapper(HttpServletRequest req) throws IOException { - super(req); - - InputStream is = req.getInputStream(); - baos = new ByteArrayOutputStream(); - byte buf[] = new byte[1024]; - int letti; - while ((letti = is.read(buf)) > 0) { - baos.write(buf, 0, letti); - } - buffer = baos.toByteArray(); - - } - - @Override - public ServletInputStream getInputStream() { - try { - bais = new ByteArrayInputStream(buffer); - bsis = new BufferedServletInputStream(bais); - } catch (Exception ex) { - ex.printStackTrace(); - } - - return bsis; - } - - public byte[] getBuffer() { - return buffer; - } - - } - - @Override - public void init(FilterConfig filterConfig) throws ServletException { - } - - @Override - public void doFilter(final ServletRequest request, final ServletResponse response, final FilterChain filterChain) - throws IOException, ServletException { - - if (request == null || !(request instanceof HttpServletRequest)) { - filterChain.doFilter(request, response); - return; - } - - long t1 = System.currentTimeMillis(); - - final HttpServletRequest httpRequest = (HttpServletRequest) request; - BufferedRequestWrapper bufferedRequest = new BufferedRequestWrapper(httpRequest); - - String requestId = httpRequest.getHeader(REQUEST_ID); - if (requestId == null || requestId.trim().length() == 0) { - log.warn("Could not write request in DB: " + REQUEST_ID + " is missing in the HTTP headers."); - return; - } - - String requestHost = request.getRemoteHost(); - if (requestHost == null) - requestHost = request.getRemoteAddr(); - - String requestStr = new String(bufferedRequest.getBuffer()); - - MessageWriter.saveIncomingRequest(requestId, null, requestHost, requestStr); - - long t2 = System.currentTimeMillis(); - - log.info("Request saved in DB for request-id: " + requestId + ". TIme: " + (t2 - t1)); - - final HttpServletResponse httpResponse = (HttpServletResponse) response; - - final ByteArrayPrintWriter pw = new ByteArrayPrintWriter(); - HttpServletResponse wrappedResp = new HttpServletResponseWrapper(httpResponse) { - - @Override - public PrintWriter getWriter() { - return pw.getWriter(); - } - - @Override - public ServletOutputStream getOutputStream() { - return pw.getStream(); - } - }; - - try { - - filterChain.doFilter(bufferedRequest, wrappedResp); - - } finally { - - if (request != null && request instanceof HttpServletRequest) { - - t1 = System.currentTimeMillis(); - - byte[] bytes = pw.toByteArray(); - response.getOutputStream().write(bytes); - response.getOutputStream().flush(); - - String responseStr = null; - if ("gzip".equals(httpResponse.getHeader("Content-Encoding"))) { - responseStr = decompressGZIPByteArray(bytes); - } else { - responseStr = new String(bytes); - } - - MessageWriter.saveIncomingResponse(requestId, httpResponse.getStatus(), responseStr); - - t2 = System.currentTimeMillis(); - - log.info("Response saved in DB for request-id: " + requestId + ". TIme: " + (t2 - t1)); - } - } - - } - - @Override - public void destroy() { - } - - private String decompressGZIPByteArray(byte[] bytes) { - - BufferedReader in = null; - InputStreamReader inR = null; - ByteArrayInputStream byteS = null; - GZIPInputStream gzS = null; - StringBuilder str = new StringBuilder(); - try { - byteS = new ByteArrayInputStream(bytes); - gzS = new GZIPInputStream(byteS); - inR = new InputStreamReader(gzS); - in = new BufferedReader(inR); - - if (in != null) { - - String content; - - while ((content = in.readLine()) != null) { - str.append(content); - } - } - - } catch (Exception e) { - log.error("Failed get read GZIPInputStream", e); - } finally { - - if (byteS != null) - try { - byteS.close(); - } catch (IOException e1) { - log.error("Failed to close ByteStream", e1); - } - if (gzS != null) - try { - gzS.close(); - } catch (IOException e2) { - log.error("Failed to close GZStream", e2); - } - if (inR != null) - try { - inR.close(); - } catch (IOException e3) { - log.error("Failed to close InputReader", e3); - } - if (in != null) - try { - in.close(); - } catch (IOException e) { - log.error("Failed to close BufferedReader", e); - } - } - return str.toString(); - } -} diff --git a/filters/provider/src/main/java/org/onap/ccsdk/sli/core/filters/RequestResponseLoggingFilter.java b/filters/provider/src/main/java/org/onap/ccsdk/sli/core/filters/RequestResponseLoggingFilter.java index 440aa41b..ffe6d71d 100644 --- a/filters/provider/src/main/java/org/onap/ccsdk/sli/core/filters/RequestResponseLoggingFilter.java +++ b/filters/provider/src/main/java/org/onap/ccsdk/sli/core/filters/RequestResponseLoggingFilter.java @@ -34,11 +34,13 @@ import java.util.zip.GZIPInputStream; import javax.servlet.Filter; import javax.servlet.FilterChain; import javax.servlet.FilterConfig; +import javax.servlet.ReadListener; import javax.servlet.ServletException; import javax.servlet.ServletInputStream; import javax.servlet.ServletOutputStream; import javax.servlet.ServletRequest; import javax.servlet.ServletResponse; +import javax.servlet.WriteListener; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequestWrapper; import javax.servlet.http.HttpServletResponse; @@ -60,6 +62,17 @@ public class RequestResponseLoggingFilter implements Filter { public void write(int param) throws IOException { baos.write(param); } + + @Override + public boolean isReady() { + return true; + } + + @Override + public void setWriteListener(WriteListener arg0) { + + + } } private static class ByteArrayPrintWriter { @@ -106,6 +119,21 @@ public class RequestResponseLoggingFilter implements Filter { return bais.read(buf, off, len); } + @Override + public boolean isFinished() { + return available() < 1; + } + + @Override + public boolean isReady() { + return true; + } + + @Override + public void setReadListener(ReadListener arg0) { + + } + } private class BufferedRequestWrapper extends HttpServletRequestWrapper { diff --git a/filters/provider/src/test/java/org/onap/ccsdk/sli/core/filters/TestRequestResponseLoggingFilter.java b/filters/provider/src/test/java/org/onap/ccsdk/sli/core/filters/TestRequestResponseLoggingFilter.java index 9f36fe11..7ce856e6 100644 --- a/filters/provider/src/test/java/org/onap/ccsdk/sli/core/filters/TestRequestResponseLoggingFilter.java +++ b/filters/provider/src/test/java/org/onap/ccsdk/sli/core/filters/TestRequestResponseLoggingFilter.java @@ -18,9 +18,11 @@ import java.util.LinkedList; import java.util.UUID; import java.util.Vector; import javax.servlet.FilterChain; +import javax.servlet.ReadListener; import javax.servlet.ServletException; import javax.servlet.ServletInputStream; import javax.servlet.ServletOutputStream; +import javax.servlet.WriteListener; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import org.apache.commons.codec.binary.Base64; @@ -58,6 +60,30 @@ public class TestRequestResponseLoggingFilter { } + @Override + public boolean isFinished() { + try { + return stream.available() < 1; + } catch (IOException e) { + return true; + } + } + + + @Override + public boolean isReady() { + // TODO Auto-generated method stub + return true; + } + + + @Override + public void setReadListener(ReadListener arg0) { + // TODO Auto-generated method stub + + } + + } @@ -74,6 +100,16 @@ public class TestRequestResponseLoggingFilter { ostr.write(b); } + @Override + public boolean isReady() { + return true; + } + + @Override + public void setWriteListener(WriteListener arg0) { + + } + } /** diff --git a/sli/common/pom.xml b/sli/common/pom.xml index 7f5ac807..ebb4f095 100755 --- a/sli/common/pom.xml +++ b/sli/common/pom.xml @@ -24,50 +24,36 @@ - - - - org.opendaylight.controller - mdsal-artifacts - 1.6.1 - pom - import - - - + org.apache.derby derby - 10.11.1.1 test org.antlr antlr4-runtime - ${antlr.version} org.slf4j slf4j-api - ${slf4j.version} org.slf4j slf4j-simple - 1.7.5 compile org.apache.commons commons-lang3 - ${commons.lang3.version} - - - equinoxSDK381 - org.eclipse.osgi - ${equinox.osgi.version} + + org.osgi + org.osgi.core + ${osgi.core.version} + provided + org.mariadb.jdbc mariadb-java-client @@ -128,7 +114,6 @@ org.antlr antlr4-maven-plugin - ${antlr.version} diff --git a/sli/features/odl-sli/pom.xml b/sli/features/odl-sli/pom.xml index 4d014366..f108726d 100644 --- a/sli/features/odl-sli/pom.xml +++ b/sli/features/odl-sli/pom.xml @@ -1,5 +1,7 @@ - + 4.0.0 @@ -19,19 +21,20 @@ - org.opendaylight.mdsal.model - mdsal-model-artifacts - 0.11.1 + org.opendaylight.controller + mdsal-artifacts + ${odl.mdsal.version} pom import - org.opendaylight.controller - mdsal-artifacts - 1.6.1 + org.opendaylight.mdsal.model + mdsal-model-artifacts + ${odl.mdsal.model.version} pom import + @@ -73,17 +76,7 @@ xml features - - org.opendaylight.controller - odl-mdsal-broker - xml - features - - - equinoxSDK381 - org.eclipse.osgi - ${equinox.osgi.version} - provided - + + diff --git a/sli/provider/pom.xml b/sli/provider/pom.xml index ebba283d..aed34830 100755 --- a/sli/provider/pom.xml +++ b/sli/provider/pom.xml @@ -1,109 +1,97 @@ - - 4.0.0 + + 4.0.0 - - org.onap.ccsdk.parent - binding-parent - 1.1.0-SNAPSHOT - - + + org.onap.ccsdk.parent + binding-parent + 1.1.0-SNAPSHOT + + - org.onap.ccsdk.sli.core - sli-provider - 0.3.0-SNAPSHOT - bundle + org.onap.ccsdk.sli.core + sli-provider + 0.3.0-SNAPSHOT + bundle - ccsdk-sli-core :: sli :: ${project.artifactId} - SLI Provider is the OSGi bundle that exposes the service logic interpreter as a service. + ccsdk-sli-core :: sli :: ${project.artifactId} + SLI Provider is the OSGi bundle that exposes the service logic interpreter as a service. - - UTF-8 - + + UTF-8 + - - - - org.opendaylight.controller - mdsal-artifacts - 1.6.1 - pom - import - - - - - - org.onap.ccsdk.sli.core - sli-model - ${project.version} - test - - - org.onap.ccsdk.sli.core - sli-common - ${project.version} - compile - - - equinoxSDK381 - org.eclipse.osgi - ${equinox.osgi.version} - - - org.slf4j - slf4j-api - ${slf4j.version} - - - commons-lang - commons-lang - ${commons.lang.version} - compile - + + + org.onap.ccsdk.sli.core + sli-model + ${project.version} + test + + + org.onap.ccsdk.sli.core + sli-common + ${project.version} + compile + - - org.opendaylight.controller - sal-binding-api - + + org.slf4j + slf4j-api + + + commons-lang + commons-lang + compile + - - - junit - junit - test - + + org.osgi + org.osgi.core + provided + + + org.opendaylight.controller + sal-binding-api + - - org.mockito - mockito-core - test - - - org.apache.derby - derby - 10.11.1.1 - test - - + + + junit + junit + test + - - - - org.apache.felix - maven-bundle-plugin - true - - - * - - + + org.mockito + mockito-core + test + + + org.apache.derby + derby + test + + - - + + + + org.apache.felix + maven-bundle-plugin + true + + + * + + - + + + + diff --git a/sli/recording/pom.xml b/sli/recording/pom.xml index a13ed13e..038381d5 100755 --- a/sli/recording/pom.xml +++ b/sli/recording/pom.xml @@ -1,84 +1,73 @@ - - 4.0.0 + + 4.0.0 - - org.onap.ccsdk.parent - binding-parent - 1.1.0-SNAPSHOT - - + + org.onap.ccsdk.parent + binding-parent + 1.1.0-SNAPSHOT + + - org.onap.ccsdk.sli.core - sli-recording - 0.3.0-SNAPSHOT - bundle + org.onap.ccsdk.sli.core + sli-recording + 0.3.0-SNAPSHOT + bundle - ccsdk-sli-core :: sli :: ${project.artifactId} - SLI Recording is an OSGi bundle that implements recording service for the service logic record node. + ccsdk-sli-core :: sli :: ${project.artifactId} + SLI Recording is an OSGi bundle that implements recording service for the service logic record node. - - UTF-8 - + + UTF-8 + - - - - org.opendaylight.controller - mdsal-artifacts - 1.6.1 - pom - import - - - - - + + + org.onap.ccsdk.sli.core sli-common ${project.version} compile - equinoxSDK381 - org.eclipse.osgi - ${equinox.osgi.version} + org.osgi + org.osgi.core + provided org.slf4j slf4j-api - ${slf4j.version} org.slf4j jcl-over-slf4j - ${slf4j.version} commons-lang commons-lang - ${commons.lang.version} compile - - org.opendaylight.controller - sal-binding-api - + + org.opendaylight.controller + sal-binding-api + - - - junit - junit - test - + + + junit + junit + test + - - org.mockito - mockito-core - test - + + org.mockito + mockito-core + test + - + diff --git a/sliPluginUtils/features/ccsdk-sliPluginUtils/pom.xml b/sliPluginUtils/features/ccsdk-sliPluginUtils/pom.xml index 3737f9e7..78f5f1e1 100644 --- a/sliPluginUtils/features/ccsdk-sliPluginUtils/pom.xml +++ b/sliPluginUtils/features/ccsdk-sliPluginUtils/pom.xml @@ -21,26 +21,20 @@ org.opendaylight.mdsal.model mdsal-model-artifacts - 0.11.1 + ${odl.mdsal.model.version} pom import org.opendaylight.controller mdsal-artifacts - 1.6.1 + ${odl.mdsal.version} pom import - - org.opendaylight.controller - odl-mdsal-broker - xml - features - ${project.groupId} @@ -55,11 +49,6 @@ sliPluginUtils-provider ${project.version} - - equinoxSDK381 - org.eclipse.osgi - ${equinox.osgi.version} - provided - + diff --git a/sliPluginUtils/provider/pom.xml b/sliPluginUtils/provider/pom.xml index ae750636..411c1453 100755 --- a/sliPluginUtils/provider/pom.xml +++ b/sliPluginUtils/provider/pom.xml @@ -33,10 +33,7 @@ ${project.version} compile - - equinoxSDK381 - org.eclipse.osgi - + org.slf4j slf4j-api diff --git a/sliapi/features/ccsdk-sliapi/pom.xml b/sliapi/features/ccsdk-sliapi/pom.xml index f868f345..f4f63948 100644 --- a/sliapi/features/ccsdk-sliapi/pom.xml +++ b/sliapi/features/ccsdk-sliapi/pom.xml @@ -16,31 +16,26 @@ ccsdk-sli-core :: sliapi :: ${project.artifactId} - - - + + + org.opendaylight.mdsal.model mdsal-model-artifacts - 0.11.1 + ${odl.mdsal.model.version} pom import org.opendaylight.controller mdsal-artifacts - 1.6.1 + ${odl.mdsal.version} pom import - - + + + - - org.opendaylight.controller - odl-mdsal-broker - xml - features - ${project.groupId} diff --git a/sliapi/provider/pom.xml b/sliapi/provider/pom.xml index 3be16f42..994557a5 100755 --- a/sliapi/provider/pom.xml +++ b/sliapi/provider/pom.xml @@ -17,17 +17,7 @@ ccsdk-sli-core :: sliapi :: ${project.artifactId} - - - - org.opendaylight.controller - mdsal-artifacts - 1.6.1 - pom - import - - - + org.onap.ccsdk.sli.core @@ -39,16 +29,19 @@ org.opendaylight.controller sal-binding-config + ${odl.mdsal.version} org.opendaylight.controller sal-binding-api + ${odl.mdsal.version} org.opendaylight.controller sal-common-util + ${odl.mdsal.version} @@ -65,10 +58,12 @@ org.opendaylight.controller sal-core-api + ${odl.mdsal.version} org.opendaylight.yangtools yang-data-impl + 2.0.3 @@ -87,7 +82,6 @@ org.apache.derby derby - 10.11.1.1 test diff --git a/utils/provider/pom.xml b/utils/provider/pom.xml index 2ecea40e..2698b39c 100644 --- a/utils/provider/pom.xml +++ b/utils/provider/pom.xml @@ -27,12 +27,11 @@ com.google.guava guava - - equinoxSDK381 - org.eclipse.osgi - ${equinox.osgi.version} - provided - + + org.osgi + org.osgi.core + provided + -- cgit 1.2.3-korg