diff options
| -rw-r--r-- | dependencies-clm/pom.xml | 199 | ||||
| -rw-r--r-- | 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. --> <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.onap.oparent</groupId> - <artifactId>oparent</artifactId> - <version>3.3.3-SNAPSHOT</version> - <relativePath>../oparent</relativePath> - </parent> - <artifactId>dependencies-clm</artifactId> - <name>oparent/dependencies-clm</name> - <packaging>pom</packaging> - <dependencies> - <dependency> - <groupId>com.google.guava</groupId> - <artifactId>guava</artifactId> - </dependency> - <dependency> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-http</artifactId> - </dependency> - <dependency> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-servlet</artifactId> - </dependency> - <dependency> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-servlets</artifactId> - </dependency> - <dependency> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-server</artifactId> - </dependency> - <dependency> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-security</artifactId> - </dependency> - <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-core</artifactId> - </dependency> - <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-expression</artifactId> - </dependency> - <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-web</artifactId> - </dependency> - <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-webmvc</artifactId> - </dependency> - <dependency> - <groupId>commons-beanutils</groupId> - <artifactId>commons-beanutils</artifactId> - </dependency> - <dependency> - <groupId>org.apache.tomcat.embed</groupId> - <artifactId>tomcat-embed-core</artifactId> - </dependency> - <dependency> - <groupId>org.webjars</groupId> - <artifactId>bootstrap</artifactId> - </dependency> - <dependency> - <groupId>com.fasterxml.jackson.core</groupId> - <artifactId>jackson-core</artifactId> - </dependency> - <dependency> - <groupId>org.webjars</groupId> - <artifactId>jquery</artifactId> - </dependency> - <dependency> - <groupId>ch.qos.logback</groupId> - <artifactId>logback-classic</artifactId> - </dependency> - <dependency> - <groupId>org.apache.httpcomponents</groupId> - <artifactId>httpclient</artifactId> - </dependency> - <dependency> - <groupId>xerces</groupId> - <artifactId>xercesImpl</artifactId> - </dependency> - </dependencies> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.onap.oparent</groupId> + <artifactId>oparent</artifactId> + <version>3.3.3-SNAPSHOT</version> + <relativePath>../oparent</relativePath> + </parent> + <artifactId>dependencies-clm</artifactId> + <name>oparent/dependencies-clm</name> + <packaging>pom</packaging> + <properties> + <version.beanutils>1.9.4</version.beanutils> + <version.bootstrap>5.2.3</version.bootstrap> + <version.guava>31.1-jre</version.guava> + <version.httpclient>4.5.14</version.httpclient> + <version.jackson>2.14.1</version.jackson> + <version.jetty>11.0.12</version.jetty> + <version.jquery>3.6.1</version.jquery> + <version.logback>1.4.5</version.logback> + <version.spring>6.0.2</version.spring> + <version.tomcat>10.1.2</version.tomcat> + <version.xerces>2.9.1</version.xerces> + </properties> + <dependencies> + <dependency> + <groupId>com.google.guava</groupId> + <artifactId>guava</artifactId> + <version>${version.guava}</version> + </dependency> + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-http</artifactId> + <version>${version.jetty}</version> + </dependency> + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-servlet</artifactId> + <version>${version.jetty}</version> + </dependency> + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-servlets</artifactId> + <version>${version.jetty}</version> + </dependency> + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-server</artifactId> + <version>${version.jetty}</version> + </dependency> + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-security</artifactId> + <version>${version.jetty}</version> + </dependency> + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-core</artifactId> + <version>${version.spring}</version> + </dependency> + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-expression</artifactId> + <version>${version.spring}</version> + </dependency> + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-web</artifactId> + <version>${version.spring}</version> + </dependency> + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-webmvc</artifactId> + <version>${version.spring}</version> + </dependency> + <dependency> + <groupId>commons-beanutils</groupId> + <artifactId>commons-beanutils</artifactId> + <version>${version.beanutils}</version> + </dependency> + <dependency> + <groupId>org.apache.tomcat.embed</groupId> + <artifactId>tomcat-embed-core</artifactId> + <version>${version.tomcat}</version> + </dependency> + <dependency> + <groupId>org.webjars</groupId> + <artifactId>bootstrap</artifactId> + <version>${version.bootstrap}</version> + </dependency> + <dependency> + <groupId>com.fasterxml.jackson.core</groupId> + <artifactId>jackson-core</artifactId> + <version>${version.jackson}</version> + </dependency> + <dependency> + <groupId>org.webjars</groupId> + <artifactId>jquery</artifactId> + <version>${version.jquery}</version> + </dependency> + <dependency> + <groupId>ch.qos.logback</groupId> + <artifactId>logback-classic</artifactId> + <version>${version.logback}</version> + </dependency> + <dependency> + <groupId>org.apache.httpcomponents</groupId> + <artifactId>httpclient</artifactId> + <version>${version.httpclient}</version> + </dependency> + <dependency> + <groupId>xerces</groupId> + <artifactId>xercesImpl</artifactId> + <version>${version.xerces}</version> + </dependency> + </dependencies> </project> 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 @@ <parent> <groupId>org.onap.oparent</groupId> <artifactId>version</artifactId> - <!-- When changing, also change the oparent.version property --> + <!-- When changing, also change the property reference in the file below --> <version>3.3.3-SNAPSHOT</version> <relativePath>..</relativePath> </parent> @@ -36,7 +36,6 @@ <url>https://wiki.onap.org/display/DW/Integration+Project</url> </scm> <properties> - <oparent.version>3.3.3</oparent.version> <jacoco.version>0.8.5</jacoco.version> <sonar-jacoco-listeners.version>3.2</sonar-jacoco-listeners.version> <sonar.core.codeCoveragePlugin>jacoco</sonar.core.codeCoveragePlugin> @@ -297,17 +296,6 @@ </dependencies> </profile> </profiles> - <dependencyManagement> - <dependencies> - <dependency> - <groupId>org.onap.oparent</groupId> - <artifactId>dependencies</artifactId> - <version>${project.version}</version> - <type>pom</type> - <scope>import</scope> - </dependency> - </dependencies> - </dependencyManagement> <build> <pluginManagement> <plugins> @@ -459,7 +447,7 @@ <dependency> <groupId>org.onap.oparent</groupId> <artifactId>checkstyle</artifactId> - <version>${project.version}</version> + <version>[3.3.2,)</version> </dependency> </dependencies> <executions> |