From 5688c492c5e6760a99e1fb9853b891661665bb36 Mon Sep 17 00:00:00 2001 From: liamfallon Date: Wed, 14 Dec 2022 09:59:46 +0000 Subject: Remove self references in oparent This commit removes self references in oparent. These self references mean that the version of an import in oparent is set to the value of project.version, which is the value of project.version in the project importing oparent, not the actual version of oparent. This causes all sorts of side effects. The down side is that users of oparent will now have to explicitly import the oparent dependencies, doing somethling like: org.onap.oparent dependencies pom import Issue-ID: POLICY-4482 Change-Id: I573bffb0656209413fafc3800c3bcbdb616beecd Signed-off-by: liamfallon --- dependencies-clm/pom.xml | 199 +++++++++++++++++++++++++++-------------------- oparent/pom.xml | 16 +--- 2 files changed, 117 insertions(+), 98 deletions(-) diff --git a/dependencies-clm/pom.xml b/dependencies-clm/pom.xml index 9766bc4..561e696 100644 --- a/dependencies-clm/pom.xml +++ b/dependencies-clm/pom.xml @@ -16,88 +16,119 @@ limitations under the License. --> - 4.0.0 - - org.onap.oparent - oparent - 3.3.3-SNAPSHOT - ../oparent - - dependencies-clm - oparent/dependencies-clm - pom - - - com.google.guava - guava - - - org.eclipse.jetty - jetty-http - - - org.eclipse.jetty - jetty-servlet - - - org.eclipse.jetty - jetty-servlets - - - org.eclipse.jetty - jetty-server - - - org.eclipse.jetty - jetty-security - - - org.springframework - spring-core - - - org.springframework - spring-expression - - - org.springframework - spring-web - - - org.springframework - spring-webmvc - - - commons-beanutils - commons-beanutils - - - org.apache.tomcat.embed - tomcat-embed-core - - - org.webjars - bootstrap - - - com.fasterxml.jackson.core - jackson-core - - - org.webjars - jquery - - - ch.qos.logback - logback-classic - - - org.apache.httpcomponents - httpclient - - - xerces - xercesImpl - - + 4.0.0 + + org.onap.oparent + oparent + 3.3.3-SNAPSHOT + ../oparent + + dependencies-clm + oparent/dependencies-clm + pom + + 1.9.4 + 5.2.3 + 31.1-jre + 4.5.14 + 2.14.1 + 11.0.12 + 3.6.1 + 1.4.5 + 6.0.2 + 10.1.2 + 2.9.1 + + + + com.google.guava + guava + ${version.guava} + + + org.eclipse.jetty + jetty-http + ${version.jetty} + + + org.eclipse.jetty + jetty-servlet + ${version.jetty} + + + org.eclipse.jetty + jetty-servlets + ${version.jetty} + + + org.eclipse.jetty + jetty-server + ${version.jetty} + + + org.eclipse.jetty + jetty-security + ${version.jetty} + + + org.springframework + spring-core + ${version.spring} + + + org.springframework + spring-expression + ${version.spring} + + + org.springframework + spring-web + ${version.spring} + + + org.springframework + spring-webmvc + ${version.spring} + + + commons-beanutils + commons-beanutils + ${version.beanutils} + + + org.apache.tomcat.embed + tomcat-embed-core + ${version.tomcat} + + + org.webjars + bootstrap + ${version.bootstrap} + + + com.fasterxml.jackson.core + jackson-core + ${version.jackson} + + + org.webjars + jquery + ${version.jquery} + + + ch.qos.logback + logback-classic + ${version.logback} + + + org.apache.httpcomponents + httpclient + ${version.httpclient} + + + xerces + xercesImpl + ${version.xerces} + + diff --git a/oparent/pom.xml b/oparent/pom.xml index 3caaf5e..b1a8c45 100644 --- a/oparent/pom.xml +++ b/oparent/pom.xml @@ -22,7 +22,7 @@ org.onap.oparent version - + 3.3.3-SNAPSHOT .. @@ -36,7 +36,6 @@ https://wiki.onap.org/display/DW/Integration+Project - 3.3.3 0.8.5 3.2 jacoco @@ -297,17 +296,6 @@ - - - - org.onap.oparent - dependencies - ${project.version} - pom - import - - - @@ -459,7 +447,7 @@ org.onap.oparent checkstyle - ${project.version} + [3.3.2,) -- cgit 1.2.3-korg