From 2cb76b3efe8ca385da3bc5f5afc5b26a52c6fd43 Mon Sep 17 00:00:00 2001 From: Pamela Dragosh Date: Thu, 30 Aug 2018 07:51:13 -0400 Subject: [PATCH] Upgrade to policy/parent Change from oparent to policy/parent which inherit from the latest oparent. The latest oparent has dependencyManagement recommendations from the ONAP Security sub committee that the policy team is adhering as part of the effort to consolidate security work across projects. Change-Id: I1a43fc5a04dbc8c4cb2b7bedbca67ad3e9dd120b Issue-ID: INT-619 Signed-off-by: Pamela Dragosh --- BRMSGateway/pom.xml | 4 - LogParser/pom.xml | 276 ++++----- ONAP-PAP-REST/pom.xml | 561 +++++++++-------- ONAP-PDP-REST/pom.xml | 344 ++++++----- .../policy/pdp/rest/jmx/ServerContextImpl.java | 674 +++++++++++---------- ONAP-PDP/pom.xml | 213 ++++--- ONAP-REST/pom.xml | 307 +++++----- ONAP-SDK-APP/pom.xml | 610 +++++++++---------- ONAP-XACML/pom.xml | 85 ++- POLICY-SDK-APP/pom.xml | 523 ++++++++-------- PolicyEngineAPI/pom.xml | 214 ++++--- PolicyEngineClient/pom.xml | 77 ++- PolicyEngineUtils/pom.xml | 207 ++++--- pom.xml | 615 ++++++++++--------- 14 files changed, 2361 insertions(+), 2349 deletions(-) diff --git a/BRMSGateway/pom.xml b/BRMSGateway/pom.xml index 7ae644930..2a3ad50a5 100644 --- a/BRMSGateway/pom.xml +++ b/BRMSGateway/pom.xml @@ -63,12 +63,10 @@ com.thoughtworks.xstream xstream - 1.4.10 com.att.nsa cambriaClient - 0.0.1 org.slf4j @@ -94,7 +92,6 @@ org.apache.httpcomponents httpclient - ${httpclient.version} @@ -137,7 +134,6 @@ org.apache.maven.plugins maven-assembly-plugin - 2.2 diff --git a/LogParser/pom.xml b/LogParser/pom.xml index 0f38c5721..77cd2c90b 100644 --- a/LogParser/pom.xml +++ b/LogParser/pom.xml @@ -19,148 +19,148 @@ ============LICENSE_END========================================================= --> - - 4.0.0 - - org.onap.policy.engine - PolicyEngineSuite - 1.3.0-SNAPSHOT - - LogParser - - + + 4.0.0 + + org.onap.policy.engine + PolicyEngineSuite + 1.3.0-SNAPSHOT + + LogParser + + com.h2database h2 - + org.mariadb.jdbc mariadb-java-client 2.1.1 - - - org.onap.policy.common - ONAP-Logging - ${project.version} - - - org.onap.policy.common - integrity-monitor - ${project.version} - - - org.apache.logging.log4j - log4j-api - 2.8.2 - - - org.apache.logging.log4j - log4j-core - 2.8.2 - - - org.eclipse.persistence - javax.persistence - 2.1.0 - - - org.eclipse.persistence - eclipselink - 2.6.0 - - - org.onap.policy.engine - PolicyEngineUtils - ${project.version} - - - com.att.aft - dme2 - - - org.json - json - - - org.onap.dmaap.messagerouter.dmaapclient - dmaapClient - - - com.att.nsa - cambriaClient - - - org.onap.aaf.cadi - cadi-aaf - - - - - - - - - org.apache.maven.plugins - maven-assembly-plugin - 2.2 - - - - true - lib/ - org.onap.xacml.parser.ParseLog - - - - jar-with-dependencies - - - - - make-assembly - package - - single - - - - - - maven-checkstyle-plugin - - - onap-java-style - - check - - process-sources - - - onap-checkstyle/onap-java-style.xml - - ${project.build.sourceDirectory} - true - true - true - - - true - true - warning - - - - - - org.onap.oparent - checkstyle - 0.1.1 - compile - - - - - + + + org.onap.policy.common + ONAP-Logging + ${project.version} + + + org.onap.policy.common + integrity-monitor + ${project.version} + + + org.apache.logging.log4j + log4j-api + 2.8.2 + + + org.apache.logging.log4j + log4j-core + 2.8.2 + + + org.eclipse.persistence + javax.persistence + 2.1.0 + + + org.eclipse.persistence + eclipselink + 2.6.0 + + + org.onap.policy.engine + PolicyEngineUtils + ${project.version} + + + com.att.aft + dme2 + + + org.json + json + + + org.onap.dmaap.messagerouter.dmaapclient + dmaapClient + + + com.att.nsa + cambriaClient + + + org.onap.aaf.cadi + cadi-aaf + + + + + + + + + org.apache.maven.plugins + maven-assembly-plugin + + + + true + lib/ + org.onap.xacml.parser.ParseLog + + + + jar-with-dependencies + + + + + make-assembly + package + + single + + + + + + maven-checkstyle-plugin + + + onap-java-style + + check + + process-sources + + + onap-checkstyle/onap-java-style.xml + + ${project.build.sourceDirectory} + true + true + true + + + true + true + warning + + + + + + org.onap.oparent + checkstyle + ${oparent.version} + compile + + + + + diff --git a/ONAP-PAP-REST/pom.xml b/ONAP-PAP-REST/pom.xml index 54b99b5ca..94e0aff13 100644 --- a/ONAP-PAP-REST/pom.xml +++ b/ONAP-PAP-REST/pom.xml @@ -19,290 +19,287 @@ ============LICENSE_END========================================================= --> - - 4.0.0 - ONAP-PAP-REST - ONAP-PAP-REST - war - - org.onap.policy.engine - PolicyEngineSuite - 1.3.0-SNAPSHOT - - - - - maven-war-plugin - 2.1 - - true - - - src/main/java/ - WEB-INF/classes/ - - hibernate.cfg.xml - - - - - - - org.apache.maven.plugins - maven-compiler-plugin - 3.2 - - 1.8 - 1.8 - - - - - - - - org.onap.policy.engine - PolicyEngineUtils - ${project.version} - - - com.att.aft - dme2 - - - org.json - json - - - org.onap.dmaap.messagerouter.dmaapclient - dmaapClient - - - com.att.nsa - cambriaClient - - - org.onap.aaf.cadi - cadi-aaf - - - - - org.apache.commons - commons-lang3 - 3.4 - - - org.onap.policy.engine - ONAP-PDP - ${project.version} - - - org.json - json - - - - - org.onap.policy.common - ONAP-Logging - ${project.version} - - - javax.servlet - javax.servlet-api - 3.1.0 - - - commons-logging - commons-logging - 1.1.3 - - - javax.servlet - servlet-api - - - - - org.apache.commons - commons-compress - 1.8 - - - commons-fileupload - commons-fileupload - ${commons.fileupload.version} - - - org.apache.logging.log4j - log4j-core - 2.8.2 - - - log4j - apache-log4j-extras - 1.2.17 - - - commons-io - commons-io - 2.4 - - - io.netty - netty - 3.9.7.Final - - - com.google.guava - guava - 14.0.1 - - - org.eclipse.jgit - org.eclipse.jgit - 3.2.0.201312181205-r - - - org.apache.tomcat - tomcat-jdbc - 8.0.24 - - - com.h2database - h2 - - - com.github.fge - json-patch - 1.9 - - - org.eclipse.persistence - javax.persistence - 2.1.0 - - - org.eclipse.persistence - eclipselink - 2.6.0 - - + + 4.0.0 + ONAP-PAP-REST + ONAP-PAP-REST + war + + org.onap.policy.engine + PolicyEngineSuite + 1.3.0-SNAPSHOT + + + + + maven-war-plugin + + true + + + src/main/java/ + WEB-INF/classes/ + + hibernate.cfg.xml + + + + + + + org.apache.maven.plugins + maven-compiler-plugin + + 1.8 + 1.8 + + + + + + + + org.onap.policy.engine + PolicyEngineUtils + ${project.version} + + + com.att.aft + dme2 + + + org.json + json + + + org.onap.dmaap.messagerouter.dmaapclient + dmaapClient + + + com.att.nsa + cambriaClient + + + org.onap.aaf.cadi + cadi-aaf + + + + + org.apache.commons + commons-lang3 + 3.4 + + + org.onap.policy.engine + ONAP-PDP + ${project.version} + + + org.json + json + + + + + org.onap.policy.common + ONAP-Logging + ${project.version} + + + javax.servlet + javax.servlet-api + + + commons-logging + commons-logging + 1.1.3 + + + javax.servlet + servlet-api + + + + + org.apache.commons + commons-compress + 1.8 + + + commons-fileupload + commons-fileupload + ${commons.fileupload.version} + + + org.apache.logging.log4j + log4j-core + 2.8.2 + + + log4j + apache-log4j-extras + 1.2.17 + + + commons-io + commons-io + 2.4 + + + io.netty + netty + 3.9.7.Final + + + com.google.guava + guava + + + org.eclipse.jgit + org.eclipse.jgit + 3.2.0.201312181205-r + + + org.apache.tomcat + tomcat-jdbc + 8.0.24 + + + com.h2database + h2 + + + com.github.fge + json-patch + 1.9 + + + org.eclipse.persistence + javax.persistence + 2.1.0 + + + org.eclipse.persistence + eclipselink + 2.6.0 + + org.mariadb.jdbc mariadb-java-client 2.1.1 - - org.onap.policy.drools-applications.controlloop.common - policy-yaml - ${project.version} - - - - org.springframework - spring-core - ${springframework.version} - - - org.springframework - spring-web - ${springframework.version} - - - org.springframework - spring-webmvc - ${springframework.version} - - - org.springframework - spring-tx - ${springframework.version} - - - org.springframework - spring-context-support - ${springframework.version} - - - org.springframework - spring-orm - ${springframework.version} - - - - org.hibernate - hibernate-core - ${hibernate.version} - - - org.hibernate - hibernate-validator - 5.4.2.Final - - - - org.json - json - 20160810 - - - com.fasterxml.jackson.core - jackson-annotations - ${jackson.version} - - - com.fasterxml.jackson.core - jackson-core - ${jackson.version} - - - com.fasterxml.jackson.module - jackson-module-jaxb-annotations - ${jackson.version} - - - com.fasterxml.jackson.module - jackson-module-jsonSchema - ${jackson.version} - - - com.fasterxml.jackson.dataformat - jackson-dataformat-xml - ${jackson.version} - - - org.elasticsearch - elasticsearch - 6.2.2 - - - io.searchbox - jest - 2.0.4 - - - commons-logging - commons-logging - - - - - args4j - args4j - 2.32 - - - - org.apache.tomcat - tomcat-dbcp - 8.5.9 - - - - 4.3.15.RELEASE - 4.3.10.Final - 2.0.2 - + + org.onap.policy.drools-applications.controlloop.common + policy-yaml + ${project.version} + + + + org.springframework + spring-core + ${springframework.version} + + + org.springframework + spring-web + ${springframework.version} + + + org.springframework + spring-webmvc + ${springframework.version} + + + org.springframework + spring-tx + ${springframework.version} + + + org.springframework + spring-context-support + ${springframework.version} + + + org.springframework + spring-orm + ${springframework.version} + + + + org.hibernate + hibernate-core + ${hibernate.version} + + + org.hibernate + hibernate-validator + 5.4.2.Final + + + + org.json + json + 20160810 + + + com.fasterxml.jackson.core + jackson-annotations + ${jackson.version} + + + com.fasterxml.jackson.core + jackson-core + ${jackson.version} + + + com.fasterxml.jackson.module + jackson-module-jaxb-annotations + ${jackson.version} + + + com.fasterxml.jackson.module + jackson-module-jsonSchema + ${jackson.version} + + + com.fasterxml.jackson.dataformat + jackson-dataformat-xml + ${jackson.version} + + + org.elasticsearch + elasticsearch + 6.2.2 + + + io.searchbox + jest + 2.0.4 + + + commons-logging + commons-logging + + + + + args4j + args4j + 2.32 + + + + org.apache.tomcat + tomcat-dbcp + 8.5.9 + + + + 4.3.15.RELEASE + 4.3.10.Final + 2.0.2 + diff --git a/ONAP-PDP-REST/pom.xml b/ONAP-PDP-REST/pom.xml index a301c1952..aa54f1b4b 100644 --- a/ONAP-PDP-REST/pom.xml +++ b/ONAP-PDP-REST/pom.xml @@ -18,181 +18,179 @@ limitations under the License. ============LICENSE_END========================================================= --> - - 4.0.0 - - org.onap.policy.engine - PolicyEngineSuite - 1.3.0-SNAPSHOT - - ONAP-PDP-REST - ONAP PDP REST - - 4.3.15.RELEASE - - war - - - - maven-war-plugin - 2.1 - - true - - - - - - - com.h2database - h2 - test - - - org.onap.policy.engine - ONAP-PDP - ${project.version} - - - commons-logging - commons-logging - 1.1.3 - - - javax.servlet - servlet-api - - - - - log4j - apache-log4j-extras - 1.2.17 - - - commons-io - commons-io - 2.4 - - - com.google.guava - guava - 19.0 - - + + 4.0.0 + + org.onap.policy.engine + PolicyEngineSuite + 1.3.0-SNAPSHOT + + ONAP-PDP-REST + ONAP PDP REST + + 4.3.15.RELEASE + + war + + + + maven-war-plugin + + true + + + + + + + com.h2database + h2 + test + + + org.onap.policy.engine + ONAP-PDP + ${project.version} + + + commons-logging + commons-logging + 1.1.3 + + + javax.servlet + servlet-api + + + + + log4j + apache-log4j-extras + 1.2.17 + + + commons-io + commons-io + 2.4 + + + com.google.guava + guava + + org.mariadb.jdbc mariadb-java-client 2.1.1 - - postgresql - postgresql - 9.1-901.jdbc4 - - - org.springframework - spring-test - ${springframework.version} - test - - - org.awaitility - awaitility - 3.0.0 - test - - - org.hsqldb - hsqldb - 2.3.2 - - - com.sun.jersey - jersey-client - 1.18 - - - com.sun.jersey - jersey-core - 1.18 - - - javax.websocket - javax.websocket-api - 1.1 - provided - - - com.att.nsa - cambriaClient - 0.0.1 - - - slf4j-log4j12 - org.slf4j - - - - - com.att.aft - dme2 - 3.1.200-oss - test - - - org.springframework - spring-core - ${springframework.version} - - - org.springframework - spring-web - ${springframework.version} - - - org.springframework - spring-webmvc - ${springframework.version} - - - io.springfox - springfox-swagger2 - 2.5.0 - - - com.fasterxml.jackson.core - jackson-annotations - - - - - io.springfox - springfox-swagger-ui - 2.7.0 - - - org.onap.policy.engine - PolicyEngineAPI - ${project.version} - - - org.glassfish.tyrus - tyrus-client - - - org.glassfish.tyrus - tyrus-container-grizzly-client - - - javax.persistence - persistence-api - - - com.att.aft - dme2 - - - - + + postgresql + postgresql + 9.1-901.jdbc4 + + + org.springframework + spring-test + ${springframework.version} + test + + + org.awaitility + awaitility + 3.0.0 + test + + + org.hsqldb + hsqldb + 2.3.2 + + + com.sun.jersey + jersey-client + 1.18 + + + com.sun.jersey + jersey-core + 1.18 + + + javax.websocket + javax.websocket-api + 1.1 + provided + + + com.att.nsa + cambriaClient + + + slf4j-log4j12 + org.slf4j + + + + + com.att.aft + dme2 + 3.1.200-oss + test + + + org.springframework + spring-core + ${springframework.version} + + + org.springframework + spring-web + ${springframework.version} + + + org.springframework + spring-webmvc + ${springframework.version} + + + io.springfox + springfox-swagger2 + 2.5.0 + + + com.fasterxml.jackson.core + jackson-annotations + + + + + io.springfox + springfox-swagger-ui + 2.7.0 + + + org.onap.policy.engine + PolicyEngineAPI + ${project.version} + + + org.glassfish.tyrus + tyrus-client + + + org.glassfish.tyrus + tyrus-container-grizzly-client + + + javax.persistence + persistence-api + + + com.att.aft + dme2 + + + + diff --git a/ONAP-PDP-REST/src/test/java/org/onap/policy/pdp/rest/jmx/ServerContextImpl.java b/ONAP-PDP-REST/src/test/java/org/onap/policy/pdp/rest/jmx/ServerContextImpl.java index d936fbe85..2f8683c5c 100644 --- a/ONAP-PDP-REST/src/test/java/org/onap/policy/pdp/rest/jmx/ServerContextImpl.java +++ b/ONAP-PDP-REST/src/test/java/org/onap/policy/pdp/rest/jmx/ServerContextImpl.java @@ -7,9 +7,9 @@ * 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. @@ -40,318 +40,360 @@ import javax.servlet.SessionCookieConfig; import javax.servlet.SessionTrackingMode; import javax.servlet.descriptor.JspConfigDescriptor; -public class ServerContextImpl implements ServletContext{ - - @Override - public String getContextPath() { - // TODO Auto-generated method stub - return null; - } - - @Override - public ServletContext getContext(String uripath) { - // TODO Auto-generated method stub - return null; - } - - @Override - public int getMajorVersion() { - // TODO Auto-generated method stub - return 0; - } - - @Override - public int getMinorVersion() { - // TODO Auto-generated method stub - return 0; - } - - @Override - public int getEffectiveMajorVersion() { - // TODO Auto-generated method stub - return 0; - } - - @Override - public int getEffectiveMinorVersion() { - // TODO Auto-generated method stub - return 0; - } - - @Override - public String getMimeType(String file) { - // TODO Auto-generated method stub - return null; - } - - @Override - public Set getResourcePaths(String path) { - // TODO Auto-generated method stub - return null; - } - - @Override - public URL getResource(String path) throws MalformedURLException { - // TODO Auto-generated method stub - return null; - } - - @Override - public InputStream getResourceAsStream(String path) { - // TODO Auto-generated method stub - return null; - } - - @Override - public RequestDispatcher getRequestDispatcher(String path) { - // TODO Auto-generated method stub - return null; - } - - @Override - public RequestDispatcher getNamedDispatcher(String name) { - // TODO Auto-generated method stub - return null; - } - - @Override - public Servlet getServlet(String name) throws ServletException { - // TODO Auto-generated method stub - return null; - } - - @Override - public Enumeration getServlets() { - // TODO Auto-generated method stub - return null; - } - - @Override - public Enumeration getServletNames() { - // TODO Auto-generated method stub - return null; - } - - @Override - public void log(String msg) { - // TODO Auto-generated method stub - - } - - @Override - public void log(Exception exception, String msg) { - // TODO Auto-generated method stub - - } - - @Override - public void log(String message, Throwable throwable) { - // TODO Auto-generated method stub - - } - - @Override - public String getRealPath(String path) { - // TODO Auto-generated method stub - return null; - } - - @Override - public String getServerInfo() { - // TODO Auto-generated method stub - return null; - } - - @Override - public String getInitParameter(String name) { - // TODO Auto-generated method stub - return null; - } - - @Override - public Enumeration getInitParameterNames() { - // TODO Auto-generated method stub - return null; - } - - @Override - public boolean setInitParameter(String name, String value) { - // TODO Auto-generated method stub - return false; - } - - @Override - public Object getAttribute(String name) { - // TODO Auto-generated method stub - return null; - } - - @Override - public Enumeration getAttributeNames() { - // TODO Auto-generated method stub - return null; - } - - @Override - public void setAttribute(String name, Object object) { - // TODO Auto-generated method stub - - } - - @Override - public void removeAttribute(String name) { - // TODO Auto-generated method stub - - } - - @Override - public String getServletContextName() { - // TODO Auto-generated method stub - return null; - } - - @Override - public Dynamic addServlet(String servletName, String className) { - // TODO Auto-generated method stub - return null; - } - - @Override - public Dynamic addServlet(String servletName, Servlet servlet) { - // TODO Auto-generated method stub - return null; - } - - @Override - public Dynamic addServlet(String servletName, Class servletClass) { - // TODO Auto-generated method stub - return null; - } - - @Override - public T createServlet(Class clazz) throws ServletException { - // TODO Auto-generated method stub - return null; - } - - @Override - public ServletRegistration getServletRegistration(String servletName) { - // TODO Auto-generated method stub - return null; - } - - @Override - public Map getServletRegistrations() { - // TODO Auto-generated method stub - return null; - } - - @Override - public javax.servlet.FilterRegistration.Dynamic addFilter(String filterName, String className) { - // TODO Auto-generated method stub - return null; - } - - @Override - public javax.servlet.FilterRegistration.Dynamic addFilter(String filterName, Filter filter) { - // TODO Auto-generated method stub - return null; - } - - @Override - public javax.servlet.FilterRegistration.Dynamic addFilter(String filterName, Class filterClass) { - // TODO Auto-generated method stub - return null; - } - - @Override - public T createFilter(Class clazz) throws ServletException { - // TODO Auto-generated method stub - return null; - } - - @Override - public FilterRegistration getFilterRegistration(String filterName) { - // TODO Auto-generated method stub - return null; - } - - @Override - public Map getFilterRegistrations() { - // TODO Auto-generated method stub - return null; - } - - @Override - public SessionCookieConfig getSessionCookieConfig() { - // TODO Auto-generated method stub - return null; - } - - @Override - public void setSessionTrackingModes(Set sessionTrackingModes) { - // TODO Auto-generated method stub - - } - - @Override - public Set getDefaultSessionTrackingModes() { - // TODO Auto-generated method stub - return null; - } - - @Override - public Set getEffectiveSessionTrackingModes() { - // TODO Auto-generated method stub - return null; - } - - @Override - public void addListener(String className) { - // TODO Auto-generated method stub - - } - - @Override - public void addListener(T t) { - // TODO Auto-generated method stub - - } - - @Override - public void addListener(Class listenerClass) { - // TODO Auto-generated method stub - - } - - @Override - public T createListener(Class clazz) throws ServletException { - // TODO Auto-generated method stub - return null; - } - - @Override - public JspConfigDescriptor getJspConfigDescriptor() { - // TODO Auto-generated method stub - return null; - } - - @Override - public ClassLoader getClassLoader() { - // TODO Auto-generated method stub - return null; - } - - @Override - public void declareRoles(String... roleNames) { - // TODO Auto-generated method stub - - } - - @Override - public String getVirtualServerName() { - // TODO Auto-generated method stub - return null; - } - +public class ServerContextImpl implements ServletContext { + + @Override + public String getContextPath() { + // TODO Auto-generated method stub + return null; + } + + @Override + public ServletContext getContext(String uripath) { + // TODO Auto-generated method stub + return null; + } + + @Override + public int getMajorVersion() { + // TODO Auto-generated method stub + return 0; + } + + @Override + public int getMinorVersion() { + // TODO Auto-generated method stub + return 0; + } + + @Override + public int getEffectiveMajorVersion() { + // TODO Auto-generated method stub + return 0; + } + + @Override + public int getEffectiveMinorVersion() { + // TODO Auto-generated method stub + return 0; + } + + @Override + public String getMimeType(String file) { + // TODO Auto-generated method stub + return null; + } + + @Override + public Set getResourcePaths(String path) { + // TODO Auto-generated method stub + return null; + } + + @Override + public URL getResource(String path) throws MalformedURLException { + // TODO Auto-generated method stub + return null; + } + + @Override + public InputStream getResourceAsStream(String path) { + // TODO Auto-generated method stub + return null; + } + + @Override + public RequestDispatcher getRequestDispatcher(String path) { + // TODO Auto-generated method stub + return null; + } + + @Override + public RequestDispatcher getNamedDispatcher(String name) { + // TODO Auto-generated method stub + return null; + } + + @Override + public Servlet getServlet(String name) throws ServletException { + // TODO Auto-generated method stub + return null; + } + + @Override + public Enumeration getServlets() { + // TODO Auto-generated method stub + return null; + } + + @Override + public Enumeration getServletNames() { + // TODO Auto-generated method stub + return null; + } + + @Override + public void log(String msg) { + // TODO Auto-generated method stub + + } + + @Override + public void log(Exception exception, String msg) { + // TODO Auto-generated method stub + + } + + @Override + public void log(String message, Throwable throwable) { + // TODO Auto-generated method stub + + } + + @Override + public String getRealPath(String path) { + // TODO Auto-generated method stub + return null; + } + + @Override + public String getServerInfo() { + // TODO Auto-generated method stub + return null; + } + + @Override + public String getInitParameter(String name) { + // TODO Auto-generated method stub + return null; + } + + @Override + public Enumeration getInitParameterNames() { + // TODO Auto-generated method stub + return null; + } + + @Override + public boolean setInitParameter(String name, String value) { + // TODO Auto-generated method stub + return false; + } + + @Override + public Object getAttribute(String name) { + // TODO Auto-generated method stub + return null; + } + + @Override + public Enumeration getAttributeNames() { + // TODO Auto-generated method stub + return null; + } + + @Override + public void setAttribute(String name, Object object) { + // TODO Auto-generated method stub + + } + + @Override + public void removeAttribute(String name) { + // TODO Auto-generated method stub + + } + + @Override + public String getServletContextName() { + // TODO Auto-generated method stub + return null; + } + + @Override + public Dynamic addServlet(String servletName, String className) { + // TODO Auto-generated method stub + return null; + } + + @Override + public Dynamic addServlet(String servletName, Servlet servlet) { + // TODO Auto-generated method stub + return null; + } + + @Override + public Dynamic addServlet(String servletName, Class servletClass) { + // TODO Auto-generated method stub + return null; + } + + @Override + public T createServlet(Class clazz) throws ServletException { + // TODO Auto-generated method stub + return null; + } + + @Override + public ServletRegistration getServletRegistration(String servletName) { + // TODO Auto-generated method stub + return null; + } + + @Override + public Map getServletRegistrations() { + // TODO Auto-generated method stub + return null; + } + + @Override + public javax.servlet.FilterRegistration.Dynamic addFilter(String filterName, String className) { + // TODO Auto-generated method stub + return null; + } + + @Override + public javax.servlet.FilterRegistration.Dynamic addFilter(String filterName, Filter filter) { + // TODO Auto-generated method stub + return null; + } + + @Override + public javax.servlet.FilterRegistration.Dynamic addFilter( + String filterName, Class filterClass) { + // TODO Auto-generated method stub + return null; + } + + @Override + public T createFilter(Class clazz) throws ServletException { + // TODO Auto-generated method stub + return null; + } + + @Override + public FilterRegistration getFilterRegistration(String filterName) { + // TODO Auto-generated method stub + return null; + } + + @Override + public Map getFilterRegistrations() { + // TODO Auto-generated method stub + return null; + } + + @Override + public SessionCookieConfig getSessionCookieConfig() { + // TODO Auto-generated method stub + return null; + } + + @Override + public void setSessionTrackingModes(Set sessionTrackingModes) { + // TODO Auto-generated method stub + + } + + @Override + public Set getDefaultSessionTrackingModes() { + // TODO Auto-generated method stub + return null; + } + + @Override + public Set getEffectiveSessionTrackingModes() { + // TODO Auto-generated method stub + return null; + } + + @Override + public void addListener(String className) { + // TODO Auto-generated method stub + + } + + @Override + public void addListener(T t) { + // TODO Auto-generated method stub + + } + + @Override + public void addListener(Class listenerClass) { + // TODO Auto-generated method stub + + } + + @Override + public T createListener(Class clazz) throws ServletException { + // TODO Auto-generated method stub + return null; + } + + @Override + public JspConfigDescriptor getJspConfigDescriptor() { + // TODO Auto-generated method stub + return null; + } + + @Override + public ClassLoader getClassLoader() { + // TODO Auto-generated method stub + return null; + } + + @Override + public void declareRoles(String... roleNames) { + // TODO Auto-generated method stub + + } + + @Override + public String getVirtualServerName() { + // TODO Auto-generated method stub + return null; + } + + @Override + public Dynamic addJspFile(String arg0, String arg1) { + // TODO Auto-generated method stub + return null; + } + + @Override + public String getRequestCharacterEncoding() { + // TODO Auto-generated method stub + return null; + } + + @Override + public String getResponseCharacterEncoding() { + // TODO Auto-generated method stub + return null; + } + + @Override + public int getSessionTimeout() { + // TODO Auto-generated method stub + return 0; + } + + @Override + public void setRequestCharacterEncoding(String arg0) { + // TODO Auto-generated method stub + + } + + @Override + public void setResponseCharacterEncoding(String arg0) { + // TODO Auto-generated method stub + + } + + @Override + public void setSessionTimeout(int arg0) { + // TODO Auto-generated method stub + + } } diff --git a/ONAP-PDP/pom.xml b/ONAP-PDP/pom.xml index a616edd96..ef42d1d3b 100644 --- a/ONAP-PDP/pom.xml +++ b/ONAP-PDP/pom.xml @@ -19,112 +19,109 @@ ============LICENSE_END========================================================= --> - - 4.0.0 - ONAP-PDP - ONAP-PDP - jar - - org.onap.policy.engine - PolicyEngineSuite - 1.3.0-SNAPSHOT - - - - org.onap.policy.engine - ${project.version} - ONAP-REST - - - org.apache.httpcomponents - httpclient - ${httpclient.version} - - - org.apache.httpcomponents - httpcore - 4.4.4 - - - commons-codec - commons-codec - 1.10 - - - commons-logging - commons-logging - 1.2 - - - javax.servlet - servlet-api - - - - - com.google.guava - guava - 19.0 - - - com.att.research.xacml - xacml-pdp - 1.0.1 - - - - commons-collections - commons-collections - - - - - org.onap.policy.common - policy-endpoints - ${project.version} - test - - - - - - maven-checkstyle-plugin - - - onap-java-style - - check - - process-sources - - - onap-checkstyle/onap-java-style.xml - - ${project.build.sourceDirectory} - true - true - true - - - true - true - warning - - - - - - org.onap.oparent - checkstyle - 0.1.1 - compile - - - - - + + 4.0.0 + ONAP-PDP + ONAP-PDP + jar + + org.onap.policy.engine + PolicyEngineSuite + 1.3.0-SNAPSHOT + + + + org.onap.policy.engine + ${project.version} + ONAP-REST + + + org.apache.httpcomponents + httpclient + + + org.apache.httpcomponents + httpcore + + + commons-codec + commons-codec + + + commons-logging + commons-logging + 1.2 + + + javax.servlet + servlet-api + + + + + com.google.guava + guava + + + com.att.research.xacml + xacml-pdp + 1.0.1 + + + + commons-collections + commons-collections + + + + + org.onap.policy.common + policy-endpoints + ${project.version} + test + + + + + + maven-checkstyle-plugin + + + onap-java-style + + check + + process-sources + + + onap-checkstyle/onap-java-style.xml + + ${project.build.sourceDirectory} + true + true + true + + + true + true + warning + + + + + + org.onap.oparent + checkstyle + ${oparent.version} + compile + + + + + diff --git a/ONAP-REST/pom.xml b/ONAP-REST/pom.xml index 656d1ab17..be5fe6e5f 100644 --- a/ONAP-REST/pom.xml +++ b/ONAP-REST/pom.xml @@ -20,158 +20,157 @@ --> - - 4.0.0 - - org.onap.policy.engine - PolicyEngineSuite - 1.3.0-SNAPSHOT - - ONAP-REST - ONAP REST - jar - - - - org.yaml - snakeyaml - 1.16 - - - com.h2database - h2 - test - - - org.onap.policy.engine - ${project.version} - ONAP-XACML - - - org.onap.policy.engine - PolicyEngineAPI - ${project.version} - - - org.glassfish.tyrus - tyrus-client - - - org.glassfish.tyrus - tyrus-container-grizzly-client - - - javax.persistence - persistence-api - - - com.att.aft - dme2 - - - - - javax.servlet - javax.servlet-api - 3.1.0 - - - commons-logging - commons-logging - 1.1.3 - - - javax.servlet - servlet-api - - - - - com.google.guava - guava - 14.0.1 - - - com.google.code.gson - gson - 2.8.0 - - - org.eclipse.emf - org.eclipse.emf.ecore.xmi - 2.11.0-v20150123-0347 - - - org.eclipse.emf - org.eclipse.emf.ecore - 2.11.0-v20150123-0347 - - - org.eclipse.emf - org.eclipse.emf.common - 2.11.0-v20150123-0347 - - - org.json - json - [20090211,) - - - - org.springframework - spring-test - ${springframework.version} - - - org.springframework - spring-core - ${springframework.version} - - - org.springframework - spring-web - ${springframework.version} - - - org.springframework - spring-webmvc - ${springframework.version} - - - org.springframework - spring-tx - ${springframework.version} - - - org.springframework - spring-context-support - ${springframework.version} - - - org.springframework - spring-orm - ${springframework.version} - - - - org.hibernate - hibernate-core - ${hibernate.version} - - - org.hibernate - hibernate-validator - 5.4.2.Final - - - org.apache.tomcat - tomcat-dbcp - 8.5.9 - - - - 4.3.15.RELEASE - 4.3.10.Final - + + 4.0.0 + + org.onap.policy.engine + PolicyEngineSuite + 1.3.0-SNAPSHOT + + ONAP-REST + ONAP REST + jar + + + 4.3.15.RELEASE + 4.3.10.Final + + + + + org.yaml + snakeyaml + 1.16 + + + com.h2database + h2 + test + + + org.onap.policy.engine + ${project.version} + ONAP-XACML + + + org.onap.policy.engine + PolicyEngineAPI + ${project.version} + + + org.glassfish.tyrus + tyrus-client + + + org.glassfish.tyrus + tyrus-container-grizzly-client + + + javax.persistence + persistence-api + + + com.att.aft + dme2 + + + + + javax.servlet + javax.servlet-api + + + commons-logging + commons-logging + 1.1.3 + + + javax.servlet + servlet-api + + + + + com.google.guava + guava + + + com.google.code.gson + gson + + + org.eclipse.emf + org.eclipse.emf.ecore.xmi + 2.11.0-v20150123-0347 + + + org.eclipse.emf + org.eclipse.emf.ecore + 2.11.0-v20150123-0347 + + + org.eclipse.emf + org.eclipse.emf.common + 2.11.0-v20150123-0347 + + + org.json + json + [20090211,) + + + + org.springframework + spring-test + ${springframework.version} + + + org.springframework + spring-core + ${springframework.version} + + + org.springframework + spring-web + ${springframework.version} + + + org.springframework + spring-webmvc + ${springframework.version} + + + org.springframework + spring-tx + ${springframework.version} + + + org.springframework + spring-context-support + ${springframework.version} + + + org.springframework + spring-orm + ${springframework.version} + + + + org.hibernate + hibernate-core + ${hibernate.version} + + + org.hibernate + hibernate-validator + 5.4.2.Final + + + org.apache.tomcat + tomcat-dbcp + 8.5.9 + + diff --git a/ONAP-SDK-APP/pom.xml b/ONAP-SDK-APP/pom.xml index ec9bfc22d..f08b76d76 100644 --- a/ONAP-SDK-APP/pom.xml +++ b/ONAP-SDK-APP/pom.xml @@ -17,310 +17,310 @@ limitations under the License. ============LICENSE_END========================================================= --> - - 4.0.0 - - org.onap.policy.engine - PolicyEngineSuite - 1.3.0-SNAPSHOT - - ONAP-SDK-APP - war - - UTF-8 - 2.3.1 - 4.2.0.RELEASE - 4.3.11.Final - - true - - **/gen/**,**/generated-sources/**,**/yang-gen**,**/pax/**,src/main/webapp/**/* - - http://archive.apache.org/dist/tomcat/tomcat-8/v8.0.37/bin - apache-tomcat-8.0.37 - - - - - doclint-java8-disable - - [1.8,) - - - - - org.apache.maven.plugins - maven-javadoc-plugin - 2.10.4 - - -Xdoclint:none - - - - - - - - - - org.apache.maven.plugins - maven-compiler-plugin - 3.2 - - 1.8 - 1.8 - - - - org.apache.maven.plugins - maven-surefire-plugin - - ${skiptests} - - **/Test*.java - **/*Test.java - **/*TestCase.java - - - ${basedir}/war - - - classpath: - - - - - - org.apache.maven.plugins - maven-war-plugin - 2.1 - - true - - - true - - - ${project.version} - ${maven.build.timestamp} - - - - - org.onap.portal.sdk - epsdk-app-overlay - - static/fusion/raptor/uigrid/vfs_fonts.js - - - - org.onap.policy.engine - POLICY-SDK-APP - - - - - - org.apache.maven.plugins - maven-assembly-plugin - 3.0.0 - - ${skipassembly} - - ${basedir}/distribution.xml - - - - - make-assembly - package - - single - - - - - - org.apache.maven.plugins - maven-deploy-plugin - - - true - - - - io.fabric8 - docker-maven-plugin - 0.22.0 - - true - - - onap/portal-sdk:${project.version} - - frolvlad/alpine-oraclejdk8:slim - - artifact - - - - - tar -xzf ${tomcat.download.name}.tar.gz - rm -f ${tomcat.download.name}.tar.gz - rm -fr ${tomcat.download.name}/webapps/[a-z]* - mkdir -p /opt - mv ${tomcat.download.name} /opt - - - - /opt/${tomcat.download.name}/bin/catalina.sh run - - - - - - + + 4.0.0 + + org.onap.policy.engine + PolicyEngineSuite + 1.3.0-SNAPSHOT + + ONAP-SDK-APP + war + + UTF-8 + 2.3.1 + 4.2.0.RELEASE + 4.3.11.Final + + true + + **/gen/**,**/generated-sources/**,**/yang-gen**,**/pax/**,src/main/webapp/**/* + + http://archive.apache.org/dist/tomcat/tomcat-8/v8.0.37/bin + apache-tomcat-8.0.37 + + + + + doclint-java8-disable + + [1.8,) + + + + + org.apache.maven.plugins + maven-javadoc-plugin + + -Xdoclint:none + + + + + + + + + + org.apache.maven.plugins + maven-compiler-plugin + + 1.8 + 1.8 + + + + org.apache.maven.plugins + maven-surefire-plugin + + ${skiptests} + + **/Test*.java + **/*Test.java + **/*TestCase.java + + + ${basedir}/war + + + classpath: + + + + + + org.apache.maven.plugins + maven-war-plugin + + true + + + true + + + ${project.version} + ${maven.build.timestamp} + + + + + org.onap.portal.sdk + epsdk-app-overlay + + static/fusion/raptor/uigrid/vfs_fonts.js + + + + org.onap.policy.engine + POLICY-SDK-APP + + + + + + org.apache.maven.plugins + maven-assembly-plugin + + ${skipassembly} + + ${basedir}/distribution.xml + + + + + make-assembly + package + + single + + + + + + org.apache.maven.plugins + maven-deploy-plugin + + + true + + + + io.fabric8 + docker-maven-plugin + 0.22.0 + + true + + + onap/portal-sdk:${project.version} + + frolvlad/alpine-oraclejdk8:slim + + artifact + + + + + tar -xzf + ${tomcat.download.name}.tar.gz + rm -f + ${tomcat.download.name}.tar.gz + rm -fr + ${tomcat.download.name}/webapps/[a-z]* + mkdir -p /opt + mv ${tomcat.download.name} /opt + + + + /opt/${tomcat.download.name}/bin/catalina.sh + run + + + + + + - - - - - - org.onap.policy.engine - POLICY-SDK-APP - ${project.version} - war - - - org.onap.portal.sdk - epsdk-core - - - - - org.onap.policy.engine - POLICY-SDK-APP - ${project.version} - jar - classes - - - org.onap.portal.sdk - epsdk-core - - - - - org.onap.policy.engine - PolicyEngineUtils - ${project.version} - - - com.att.aft - dme2 - - - - - - org.onap.portal.sdk - epsdk-app-overlay - ${epsdk.version} - war - - - org.onap.portal.sdk - epsdk-app-common - ${epsdk.version} - jar - - - - - commons-collections - commons-collections - 3.2.2 - - - org.onap.portal.sdk - epsdk-core - ${epsdk.version} - - - mysql - mysql-connector-java - - - commons-collections - commons-collections - - - com.thoughtworks.xstream - xstream - - - - - org.onap.portal.sdk - epsdk-analytics - ${epsdk.version} - - - com.oracle - ojdbc6 - - - - - org.onap.portal.sdk - epsdk-workflow - ${epsdk.version} - - - - org.slf4j - jcl-over-slf4j - 1.7.12 - - - com.mchange - c3p0 - 0.9.5.2 - - - - org.mariadb.jdbc - mariadb-java-client - 1.2.3 - - - commons-dbcp - commons-dbcp - 1.4 - - - - org.quartz-scheduler - quartz - 2.2.1 - - - - c3p0 - c3p0 - - - - - javax.servlet - javax.servlet-api - 3.1.0 - - + + + + + + org.onap.policy.engine + POLICY-SDK-APP + ${project.version} + war + + + org.onap.portal.sdk + epsdk-core + + + + + org.onap.policy.engine + POLICY-SDK-APP + ${project.version} + jar + classes + + + org.onap.portal.sdk + epsdk-core + + + + + org.onap.policy.engine + PolicyEngineUtils + ${project.version} + + + com.att.aft + dme2 + + + + + + org.onap.portal.sdk + epsdk-app-overlay + ${epsdk.version} + war + + + org.onap.portal.sdk + epsdk-app-common + ${epsdk.version} + jar + + + + + commons-collections + commons-collections + 3.2.2 + + + org.onap.portal.sdk + epsdk-core + ${epsdk.version} + + + mysql + mysql-connector-java + + + commons-collections + commons-collections + + + com.thoughtworks.xstream + xstream + + + + + org.onap.portal.sdk + epsdk-analytics + ${epsdk.version} + + + com.oracle + ojdbc6 + + + + + org.onap.portal.sdk + epsdk-workflow + ${epsdk.version} + + + + org.slf4j + jcl-over-slf4j + 1.7.12 + + + com.mchange + c3p0 + 0.9.5.2 + + + + org.mariadb.jdbc + mariadb-java-client + 1.2.3 + + + commons-dbcp + commons-dbcp + 1.4 + + + + org.quartz-scheduler + quartz + 2.2.1 + + + + c3p0 + c3p0 + + + + + javax.servlet + javax.servlet-api + + diff --git a/ONAP-XACML/pom.xml b/ONAP-XACML/pom.xml index bc3281f4d..ecaaab990 100644 --- a/ONAP-XACML/pom.xml +++ b/ONAP-XACML/pom.xml @@ -19,50 +19,49 @@ ============LICENSE_END========================================================= --> - - 4.0.0 - - org.onap.policy.engine - PolicyEngineSuite - 1.3.0-SNAPSHOT - - ONAP-XACML - jar - - - org.onap.policy.engine - ${project.version} - PolicyEngineUtils - - - commons-cli - commons-cli - 1.2 - - - commons-io - commons-io - 2.4 - - - org.apache.httpcomponents - httpcore - 4.4.4 - - - com.att.research.xacml - xacml - 1.0.1 + + 4.0.0 + + org.onap.policy.engine + PolicyEngineSuite + 1.3.0-SNAPSHOT + + ONAP-XACML + jar + + + org.onap.policy.engine + ${project.version} + PolicyEngineUtils + + + commons-cli + commons-cli + + + commons-io + commons-io + 2.4 + + + org.apache.httpcomponents + httpcore + + + com.att.research.xacml + xacml + 1.0.1 - - commons-collections - commons-collections - + are not using that PIP and can safely exclude this jar to resolve CLM issue. + --> + + commons-collections + commons-collections + - - + + diff --git a/POLICY-SDK-APP/pom.xml b/POLICY-SDK-APP/pom.xml index 1160a8f25..925211472 100644 --- a/POLICY-SDK-APP/pom.xml +++ b/POLICY-SDK-APP/pom.xml @@ -17,267 +17,264 @@ limitations under the License. ============LICENSE_END========================================================= --> - - 4.0.0 - - org.onap.policy.engine - PolicyEngineSuite - 1.3.0-SNAPSHOT - - POLICY-SDK-APP - war - - - - maven-war-plugin - 2.1 - - true - - false - - - - maven-compiler-plugin - 3.2 - - 1.8 - 1.8 - - - - org.apache.maven.plugins - maven-surefire-plugin - - ${skiptests} - - **/Test*.java - **/*Test.java - **/*TestCase.java - - - ${basedir}/war - - - classpath: - - - - - - - UTF-8 - 2.3.1 - 4.2.0.RELEASE - 4.3.11.Final - 1.2.3 - true - false - **/gen/**,**/generated-sources/**,**/yang-gen**,**/pax/**,src/main/webapp/app/policyApp/CSS/**/*,src/main/webapp/app/policyApp/libs/**/* - - - - ch.qos.logback - logback-classic - ${logback.version} - - - com.h2database - h2 - test - - - org.onap.portal.sdk - epsdk-core - ${epsdk.version} - - - mysql - mysql-connector-java - - - com.thoughtworks.xstream - xstream - - - - - - org.springframework - spring-core - ${springframework.version} - - - commons-logging - commons-logging - - - - - org.springframework - spring-test - ${springframework.version} - - - org.springframework - spring-web - ${springframework.version} - - - org.springframework - spring-webmvc - ${springframework.version} - - - org.springframework - spring-tx - ${springframework.version} - - - org.springframework - spring-context-support - ${springframework.version} - - - - org.hibernate - hibernate-core - ${hibernate.version} - - - org.hibernate - hibernate-validator - 5.4.2.Final - - - - javax.mail - mail - 1.4.7 - - - - com.fasterxml.jackson.core - jackson-annotations - ${jackson.version} - - - com.fasterxml.jackson.core - jackson-core - ${jackson.version} - - - com.fasterxml.jackson.module - jackson-module-jaxb-annotations - ${jackson.version} - - - com.fasterxml.jackson.module - jackson-module-jsonSchema - ${jackson.version} - - - com.fasterxml.jackson.dataformat - jackson-dataformat-xml - ${jackson.version} - - - com.google.code.gson - gson - 2.8.0 - - - - org.elasticsearch - elasticsearch - 6.2.2 - - - org.json - json - 20160212 - - - io.searchbox - jest - 2.0.0 - - - commons-logging - commons-logging - - - org.apache.httpcomponents - httpclient - - - - - org.onap.policy.engine - ONAP-PDP - ${project.version} - - - commons-logging - commons-logging - - - org.apache.httpcomponents - httpcore - - - com.att.aft - dme2 - - - - - commons-fileupload - commons-fileupload - ${commons.fileupload.version} - - - org.apache.commons - commons-compress - 1.8 - - - args4j - args4j - 2.32 - - - org.apache.poi - poi - 3.17 - - - org.apache.poi - poi-ooxml - 3.17 - - - - com.esotericsoftware.yamlbeans - yamlbeans - 1.08 - - - - org.yaml - snakeyaml - 1.16 - - - org.apache.tomcat - tomcat-jdbc - 8.0.24 - - - org.apache.tomcat - tomcat-dbcp - 8.5.9 - - + + 4.0.0 + + org.onap.policy.engine + PolicyEngineSuite + 1.3.0-SNAPSHOT + + POLICY-SDK-APP + war + + + + maven-war-plugin + + true + + false + + + + maven-compiler-plugin + + 1.8 + 1.8 + + + + org.apache.maven.plugins + maven-surefire-plugin + + ${skiptests} + + **/Test*.java + **/*Test.java + **/*TestCase.java + + + ${basedir}/war + + + classpath: + + + + + + + UTF-8 + 2.3.1 + 4.2.0.RELEASE + 4.3.11.Final + 1.2.3 + true + false + **/gen/**,**/generated-sources/**,**/yang-gen**,**/pax/**,src/main/webapp/app/policyApp/CSS/**/*,src/main/webapp/app/policyApp/libs/**/* + + + + ch.qos.logback + logback-classic + + + com.h2database + h2 + test + + + org.onap.portal.sdk + epsdk-core + ${epsdk.version} + + + mysql + mysql-connector-java + + + com.thoughtworks.xstream + xstream + + + + + + org.springframework + spring-core + ${springframework.version} + + + commons-logging + commons-logging + + + + + org.springframework + spring-test + ${springframework.version} + + + org.springframework + spring-web + ${springframework.version} + + + org.springframework + spring-webmvc + ${springframework.version} + + + org.springframework + spring-tx + ${springframework.version} + + + org.springframework + spring-context-support + ${springframework.version} + + + + org.hibernate + hibernate-core + ${hibernate.version} + + + org.hibernate + hibernate-validator + 5.4.2.Final + + + + javax.mail + mail + 1.4.7 + + + + com.fasterxml.jackson.core + jackson-annotations + ${jackson.version} + + + com.fasterxml.jackson.core + jackson-core + ${jackson.version} + + + com.fasterxml.jackson.module + jackson-module-jaxb-annotations + ${jackson.version} + + + com.fasterxml.jackson.module + jackson-module-jsonSchema + ${jackson.version} + + + com.fasterxml.jackson.dataformat + jackson-dataformat-xml + ${jackson.version} + + + com.google.code.gson + gson + + + + org.elasticsearch + elasticsearch + 6.2.2 + + + org.json + json + 20160212 + + + io.searchbox + jest + 2.0.0 + + + commons-logging + commons-logging + + + org.apache.httpcomponents + httpclient + + + + + org.onap.policy.engine + ONAP-PDP + ${project.version} + + + commons-logging + commons-logging + + + org.apache.httpcomponents + httpcore + + + com.att.aft + dme2 + + + + + commons-fileupload + commons-fileupload + ${commons.fileupload.version} + + + org.apache.commons + commons-compress + 1.8 + + + args4j + args4j + 2.32 + + + org.apache.poi + poi + 3.17 + + + org.apache.poi + poi-ooxml + 3.17 + + + + com.esotericsoftware.yamlbeans + yamlbeans + 1.08 + + + + org.yaml + snakeyaml + 1.16 + + + org.apache.tomcat + tomcat-jdbc + 8.0.24 + + + org.apache.tomcat + tomcat-dbcp + 8.5.9 + + diff --git a/PolicyEngineAPI/pom.xml b/PolicyEngineAPI/pom.xml index c27a4be62..0a7c8fc13 100644 --- a/PolicyEngineAPI/pom.xml +++ b/PolicyEngineAPI/pom.xml @@ -19,114 +19,108 @@ ============LICENSE_END========================================================= --> - - 4.0.0 - - org.onap.policy.engine - PolicyEngineSuite - 1.3.0-SNAPSHOT - - PolicyEngineAPI - - - org.glassfish - javax.json - 1.0.4 - - - org.apache.httpcomponents - httpclient - ${httpclient.version} - - - commons-io - commons-io - 2.4 - - - com.google.guava - guava - 14.0.1 - - - commons-fileupload - commons-fileupload - ${commons.fileupload.version} - - - javax.websocket - javax.websocket-api - 1.1 - - - org.java-websocket - Java-WebSocket - 1.3.8 - - - org.springframework - spring-webmvc - 4.3.15.RELEASE - - - com.google.code.gson - gson - 2.8.0 - - - log4j - log4j - 1.2.17 - - - com.att.nsa - cambriaClient - 0.0.1 - - - org.slf4j - slf4j-log4j12 - - - - - org.onap.policy.engine - ONAP-XACML - ${project.version} - - - - - - org.apache.maven.plugins - maven-compiler-plugin - 3.2 - - 1.8 - 1.8 - - - - - org.apache.maven.plugins - maven-assembly-plugin - 2.2 - - - jar-with-dependencies - - - - - make-assembly - package - - single - - - - - - + + 4.0.0 + + org.onap.policy.engine + PolicyEngineSuite + 1.3.0-SNAPSHOT + + PolicyEngineAPI + + + org.glassfish + javax.json + 1.0.4 + + + org.apache.httpcomponents + httpclient + + + commons-io + commons-io + 2.4 + + + com.google.guava + guava + + + commons-fileupload + commons-fileupload + ${commons.fileupload.version} + + + javax.websocket + javax.websocket-api + 1.1 + + + org.java-websocket + Java-WebSocket + 1.3.8 + + + org.springframework + spring-webmvc + 4.3.15.RELEASE + + + com.google.code.gson + gson + + + log4j + log4j + + + com.att.nsa + cambriaClient + + + org.slf4j + slf4j-log4j12 + + + + + org.onap.policy.engine + ONAP-XACML + ${project.version} + + + + + + org.apache.maven.plugins + maven-compiler-plugin + + 1.8 + 1.8 + + + + + org.apache.maven.plugins + maven-assembly-plugin + + + jar-with-dependencies + + + + + make-assembly + package + + single + + + + + + diff --git a/PolicyEngineClient/pom.xml b/PolicyEngineClient/pom.xml index f13923fd9..102723629 100644 --- a/PolicyEngineClient/pom.xml +++ b/PolicyEngineClient/pom.xml @@ -19,43 +19,42 @@ ============LICENSE_END========================================================= --> - - 4.0.0 - - org.onap.policy.engine - PolicyEngineSuite - 1.3.0-SNAPSHOT - - PolicyEngineClient - - - org.onap.policy.engine - PolicyEngineAPI - ${project.version} - - - com.googlecode.json-simple - json-simple - 1.1 - - - org.apache.httpcomponents - httpclient - ${httpclient.version} - - - - - - org.apache.maven.plugins - maven-compiler-plugin - 3.2 - - 1.8 - 1.8 - - - - + + 4.0.0 + + org.onap.policy.engine + PolicyEngineSuite + 1.3.0-SNAPSHOT + + PolicyEngineClient + + + org.onap.policy.engine + PolicyEngineAPI + ${project.version} + + + com.googlecode.json-simple + json-simple + 1.1 + + + org.apache.httpcomponents + httpclient + + + + + + org.apache.maven.plugins + maven-compiler-plugin + + 1.8 + 1.8 + + + + diff --git a/PolicyEngineUtils/pom.xml b/PolicyEngineUtils/pom.xml index c62c5e7ac..f263bf98b 100644 --- a/PolicyEngineUtils/pom.xml +++ b/PolicyEngineUtils/pom.xml @@ -17,110 +17,109 @@ limitations under the License. ============LICENSE_END========================================================= --> - - 4.0.0 - - org.onap.policy.engine - PolicyEngineSuite - 1.3.0-SNAPSHOT - - PolicyEngineUtils - - - org.onap.policy.common - integrity-monitor - ${project.version} - - - org.onap.policy.common - integrity-audit - ${project.version} - - - org.onap.policy.common - ONAP-Logging - ${project.version} - - - org.eclipse.persistence - javax.persistence - 2.1.0 - - - org.eclipse.persistence - eclipselink - 2.6.0 - - - org.mariadb.jdbc - mariadb-java-client - 2.1.1 - - - com.github.fge - json-patch - 1.9 - - - org.apache.maven - maven-model - 3.5.3 - - - - com.thoughtworks.xstream - xstream - 1.4.10 - - - org.drools - drools-verifier - 6.5.0.Final - - - com.google.guava - guava - - - com.lowagie - itext - - - com.thoughtworks.xstream - xstream - - - - - org.onap.aaf.authz - aaf-cadi-aaf - 2.1.0 - - - com.google.code.gson + + 4.0.0 + + org.onap.policy.engine + PolicyEngineSuite + 1.3.0-SNAPSHOT + + PolicyEngineUtils + + + org.onap.policy.common + integrity-monitor + ${project.version} + + + org.onap.policy.common + integrity-audit + ${project.version} + + + org.onap.policy.common + ONAP-Logging + ${project.version} + + + org.eclipse.persistence + javax.persistence + 2.1.0 + + + org.eclipse.persistence + eclipselink + 2.6.0 + + + org.mariadb.jdbc + mariadb-java-client + 2.1.1 + + + com.github.fge + json-patch + 1.9 + + + org.apache.maven + maven-model + 3.5.3 + + + + com.thoughtworks.xstream + xstream + + + org.drools + drools-verifier + 6.5.0.Final + + + com.google.guava + guava + + + com.lowagie + itext + + + com.thoughtworks.xstream + xstream + + + + + org.onap.aaf.authz + aaf-cadi-aaf + 2.1.0 + + + com.google.code.gson gson - 2.8.1 - - com.att.aft - dme2 - 3.1.200 - - - org.onap.dmaap.messagerouter.dmaapclient - dmaapClient - ${dmaap.version} - - - org.slf4j - slf4j-log4j12 - - - - + + com.att.aft + dme2 + 3.1.200 + + + org.onap.dmaap.messagerouter.dmaapclient + dmaapClient + ${dmaap.version} + + + org.slf4j + slf4j-log4j12 + + + + diff --git a/pom.xml b/pom.xml index b31f72584..e8016a3e5 100644 --- a/pom.xml +++ b/pom.xml @@ -17,326 +17,321 @@ limitations under the License. ============LICENSE_END========================================================= --> - - 4.0.0 - - org.onap.oparent - oparent - 1.1.0 - - - org.onap.policy.engine - PolicyEngineSuite - 1.3.0-SNAPSHOT - pom - policy-engine - The ONAP Policy Engine main pom - - - 1.8 - 1.8 - UTF-8 - UTF-8 - - https://nexus.onap.org - /content/sites/site/${project.groupId}/${project.artifactId}/${project.version} - content/repositories/releases/ - content/repositories/snapshots/ - content/repositories/staging/ + + 4.0.0 + + org.onap.policy.parent + integration + 2.0.0-SNAPSHOT + + + org.onap.policy.engine + PolicyEngineSuite + 1.3.0-SNAPSHOT + pom + policy-engine + The ONAP Policy Engine main pom + + + 1.8 + 1.8 + UTF-8 + UTF-8 + + https://nexus.onap.org + /content/sites/site/${project.groupId}/${project.artifactId}/${project.version} + content/repositories/releases/ + content/repositories/snapshots/ + content/repositories/staging/ - - - ${project.basedir}/../target/code-coverage/jacoco-ut.exec - ${project.basedir}/../target/code-coverage/jacoco-it.exec - reuseReports + + + ${project.basedir}/../target/code-coverage/jacoco-ut.exec + ${project.basedir}/../target/code-coverage/jacoco-it.exec + reuseReports - - 1.4.186 + + 1.4.186 - + - - 9.2.3.v20140905 - 1.1.3 - 4.5.5 - 2.9.4 - 1.3.3 - - - PolicyEngineUtils - ONAP-XACML - ONAP-REST - PolicyEngineAPI - ONAP-PDP - ONAP-PDP-REST - ONAP-PAP-REST - LogParser - PolicyEngineClient - BRMSGateway - POLICY-SDK-APP - ONAP-SDK-APP - packages - - - - ecomp-releases - ONAP Release Repository - ${nexusproxy}/${releases.path} - - - ecomp-snapshots - ONAP Snapshot Repository - ${nexusproxy}/${snapshots.path} - - - ecomp-site - dav:${nexusproxy}${sitePath} - - - - - - org.apache.maven.plugins - maven-javadoc-plugin - 2.10.4 - - false - org.umlgraph.doclet.UmlGraphDoc - - org.umlgraph - umlgraph - 5.6 - - -views - true - - - - - - - - com.h2database - h2 - ${h2.version} - test - - - - - - javax.servlet - javax.servlet-api - 3.1.0 - - - - xml-apis - xml-apis - 1.3.03 - - - - com.fasterxml.jackson.core - jackson-databind - ${jackson.version} - - - junit - junit - 4.12 - test - - - org.springframework - spring-mock - 2.0.8 - test - - - com.mockrunner - mockrunner - 0.3.1 - test - - - - org.powermock - powermock-api-mockito - 1.7.3 - test - - + + 9.2.3.v20140905 + 1.1.3 + 4.5.5 + 2.9.4 + 1.3.3 + + + PolicyEngineUtils + ONAP-XACML + ONAP-REST + PolicyEngineAPI + ONAP-PDP + ONAP-PDP-REST + ONAP-PAP-REST + LogParser + PolicyEngineClient + BRMSGateway + POLICY-SDK-APP + ONAP-SDK-APP + packages + + + + ecomp-releases + ONAP Release Repository + ${nexusproxy}/${releases.path} + + + ecomp-snapshots + ONAP Snapshot Repository + ${nexusproxy}/${snapshots.path} + + + ecomp-site + dav:${nexusproxy}${sitePath} + + + + + + org.apache.maven.plugins + maven-javadoc-plugin + 2.10.4 + + false + org.umlgraph.doclet.UmlGraphDoc + + org.umlgraph + umlgraph + 5.6 + + -views + true + + + + + + + + com.h2database + h2 + ${h2.version} + test + + + + + + javax.servlet + javax.servlet-api + + + + xml-apis + xml-apis + 1.3.03 + + + + com.fasterxml.jackson.core + jackson-databind + ${jackson.version} + + + junit + junit + test + + + org.springframework + spring-mock + 2.0.8 + test + + + com.mockrunner + mockrunner + 0.3.1 + test + + + + org.powermock + powermock-api-mockito + 1.7.3 + test + + org.powermock powermock-module-junit4 1.7.3 test - - - org.mockito - mockito-all - 1.10.19 - test - - - org.easymock - easymock - 3.1 - test - - - - - - org.jacoco - jacoco-maven-plugin - - - pre-unit-test - - prepare-agent - - - ${sonar.jacoco.reportPath} - true - - - - post-unit-test - test - - report - - - ${sonar.jacoco.reportPath} - - - - - - org.sonatype.plugins - nexus-staging-maven-plugin - true - - ${nexusproxy} - 176c31dfe190a - ecomp-staging - - - - org.apache.maven.plugins - maven-deploy-plugin - - - - - - org.apache.maven.plugins - maven-surefire-plugin - - - org.apache.maven.plugins - maven-clean-plugin - 2.4.1 - - - org.apache.maven.plugins - maven-compiler-plugin - 3.0 - - ${project.encoding} - ${project.source.version} - ${project.target.version} - - - - org.apache.maven.plugins - maven-resources-plugin - 2.6 - - ${project.encoding} - - - - org.apache.maven.plugins - maven-war-plugin - 2.3 - - false - - - - - org.eclipse.jetty - jetty-maven-plugin - ${jetty.plugin.version} - - 2 - - - - com.fortify.ps.maven.plugin - sca-maven-plugin - 4.20 - - - org.apache.maven.plugins - maven-site-plugin - - - org.apache.maven.wagon - wagon-webdav-jackrabbit - 2.10 - - - - + + + org.mockito + mockito-all + test + + + org.easymock + easymock + 3.1 + test + + + + + + org.jacoco + jacoco-maven-plugin + + + pre-unit-test + + prepare-agent + + + ${sonar.jacoco.reportPath} + true + + + + post-unit-test + test + + report + + + ${sonar.jacoco.reportPath} + + + + + + org.sonatype.plugins + nexus-staging-maven-plugin + true + + ${nexusproxy} + 176c31dfe190a + ecomp-staging + + + + org.apache.maven.plugins + maven-deploy-plugin + + + + + + org.apache.maven.plugins + maven-surefire-plugin + + + org.apache.maven.plugins + maven-clean-plugin + 2.4.1 + + + org.apache.maven.plugins + maven-compiler-plugin + + ${project.encoding} + ${project.source.version} + ${project.target.version} + + + + org.apache.maven.plugins + maven-resources-plugin + + ${project.encoding} + + + + org.apache.maven.plugins + maven-war-plugin + + false + + + + + org.eclipse.jetty + jetty-maven-plugin + ${jetty.plugin.version} + + 2 + + + + com.fortify.ps.maven.plugin + sca-maven-plugin + 4.20 + + + org.apache.maven.plugins + maven-site-plugin + + + org.apache.maven.wagon + wagon-webdav-jackrabbit + 2.10 + + + + - - org.jacoco - jacoco-maven-plugin - ${jacoco.version} - - - - **/gen/** - **/generated-sources/** - **/yang-gen/** - **/pax/** - - - - - - pre-unit-test - - prepare-agent - - - ${sonar.jacoco.reportPath} - - - - - post-unit-test - test - - report - - - ${sonar.jacoco.reportPath} - - - - + + org.jacoco + jacoco-maven-plugin + ${jacoco.version} + + + + **/gen/** + **/generated-sources/** + **/yang-gen/** + **/pax/** + + + + + + pre-unit-test + + prepare-agent + + + ${sonar.jacoco.reportPath} + + + + + post-unit-test + test + + report + + + ${sonar.jacoco.reportPath} + + + + org.eclipse.m2e lifecycle-mapping @@ -363,5 +358,5 @@ - + -- 2.16.6