diff options
| -rwxr-xr-x | cps-application/pom.xml | 42 | ||||
| -rwxr-xr-x | cps-dependencies/pom.xml | 234 | ||||
| -rw-r--r-- | cps-ncmp-rest/pom.xml | 17 | ||||
| -rwxr-xr-x | cps-rest/pom.xml | 18 | ||||
| -rw-r--r-- | cps-service/pom.xml | 51 | ||||
| -rw-r--r-- | dmi-plugin-demo-and-csit-stub/dmi-plugin-demo-and-csit-stub-app/pom.xml | 2 |
6 files changed, 183 insertions, 181 deletions
diff --git a/cps-application/pom.xml b/cps-application/pom.xml index 11611d158e..f4e3e916f9 100755 --- a/cps-application/pom.xml +++ b/cps-application/pom.xml @@ -66,6 +66,18 @@ <artifactId>spring-boot-starter-actuator</artifactId> </dependency> <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-server</artifactId> + </dependency> + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-http</artifactId> + </dependency> + <dependency> + <groupId>jakarta.servlet</groupId> + <artifactId>jakarta.servlet-api</artifactId> + </dependency> + <dependency> <groupId>io.micrometer</groupId> <artifactId>micrometer-registry-prometheus</artifactId> </dependency> @@ -73,6 +85,11 @@ <groupId>io.micrometer</groupId> <artifactId>micrometer-tracing-bridge-brave</artifactId> </dependency> + <dependency> + <groupId>com.fasterxml.jackson.dataformat</groupId> + <artifactId>jackson-dataformat-xml</artifactId> + </dependency> + <!-- T E S T D E P E N D E N C I E S --> <dependency> <groupId>org.springframework.security</groupId> @@ -100,6 +117,10 @@ <scope>test</scope> </dependency> <dependency> + <groupId>com.tngtech.archunit</groupId> + <artifactId>archunit-junit5</artifactId> + </dependency> + <dependency> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-starter-test</artifactId> <scope>test</scope> @@ -110,26 +131,7 @@ </exclusion> </exclusions> </dependency> - <dependency> - <groupId>com.tngtech.archunit</groupId> - <artifactId>archunit-junit5</artifactId> - </dependency> - <dependency> - <groupId>com.fasterxml.jackson.dataformat</groupId> - <artifactId>jackson-dataformat-xml</artifactId> - </dependency> - <dependency> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-server</artifactId> - </dependency> - <dependency> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-http</artifactId> - </dependency> - <dependency> - <groupId>jakarta.servlet</groupId> - <artifactId>jakarta.servlet-api</artifactId> - </dependency> + </dependencies> <build> diff --git a/cps-dependencies/pom.xml b/cps-dependencies/pom.xml index 203a93aeaa..cff596f05e 100755 --- a/cps-dependencies/pom.xml +++ b/cps-dependencies/pom.xml @@ -41,6 +41,7 @@ <sonar.skip>true</sonar.skip> <testcontainers.version>1.18.3</testcontainers.version> <mapstruct.version>1.4.2.Final</mapstruct.version> + <jetty-version>11.0.16</jetty-version> </properties> <build> @@ -70,6 +71,7 @@ <dependencyManagement> <dependencies> + <!-- S P R I N G D E P E N D E N C I E S --> <dependency> <groupId>org.springdoc</groupId> <artifactId>springdoc-openapi-ui</artifactId> @@ -90,16 +92,9 @@ <scope>import</scope> </dependency> <dependency> - <groupId>org.opendaylight.yangtools</groupId> - <artifactId>yangtools-artifacts</artifactId> - <version>8.0.6</version> - <type>pom</type> - <scope>import</scope> - </dependency> - <dependency> - <groupId>io.swagger.core.v3</groupId> - <artifactId>swagger-annotations</artifactId> - <version>2.2.10</version> + <groupId>org.springframework</groupId> + <artifactId>spring-test</artifactId> + <version>6.0.11</version> </dependency> <dependency> <groupId>io.springfox</groupId> @@ -107,94 +102,88 @@ <version>3.1.2</version> </dependency> <dependency> - <groupId>com.google.code.gson</groupId> - <artifactId>gson</artifactId> - <version>2.8.9</version> - </dependency> - <dependency> - <groupId>io.hypersistence</groupId> - <artifactId>hypersistence-utils-hibernate-60</artifactId> - <version>3.5.0</version> + <groupId>org.springframework.boot</groupId> + <artifactId>spring-boot-starter-cache</artifactId> + <version>3.1.2</version> </dependency> + <!-- A L P H A B E T I C A L D E P E N D E N C I E S --> <dependency> - <groupId>org.antlr</groupId> - <artifactId>antlr4-runtime</artifactId> - <version>4.9.2</version> + <groupId>cglib</groupId> + <artifactId>cglib-nodep</artifactId> + <version>3.1</version> </dependency> <dependency> - <groupId>org.codehaus.groovy</groupId> - <artifactId>groovy</artifactId> - <version>${groovy.version}</version> + <groupId>com.fasterxml.jackson.core</groupId> + <artifactId>jackson-databind</artifactId> + <version>2.15.2</version> </dependency> <dependency> - <groupId>org.codehaus.groovy</groupId> - <artifactId>groovy-json</artifactId> - <version>${groovy.version}</version> + <groupId>com.fasterxml.jackson.dataformat</groupId> + <artifactId>jackson-dataformat-xml</artifactId> + <version>2.13.1</version> </dependency> <dependency> - <groupId>org.spockframework</groupId> - <artifactId>spock-core</artifactId> - <version>2.4-M1-groovy-3.0</version> + <groupId>com.github.spotbugs</groupId> + <artifactId>spotbugs</artifactId> + <version>4.2.0</version> </dependency> <dependency> - <groupId>org.spockframework</groupId> - <artifactId>spock-spring</artifactId> - <version>2.4-M1-groovy-3.0</version> + <groupId>com.google.code.gson</groupId> + <artifactId>gson</artifactId> + <version>2.8.9</version> </dependency> <dependency> - <groupId>cglib</groupId> - <artifactId>cglib-nodep</artifactId> - <version>3.1</version> + <groupId>com.google.guava</groupId> + <artifactId>guava</artifactId> + <version>31.1-jre</version> </dependency> <dependency> - <groupId>io.cloudevents</groupId> - <artifactId>cloudevents-bom</artifactId> - <version>2.5.0</version> - <type>pom</type> - <scope>import</scope> + <groupId>com.hazelcast</groupId> + <artifactId>hazelcast-spring</artifactId> + <version>5.3.1</version> </dependency> <dependency> - <groupId>org.apache.commons</groupId> - <artifactId>commons-lang3</artifactId> - <version>3.11</version> + <groupId>com.tngtech.archunit</groupId> + <artifactId>archunit-junit5</artifactId> + <version>0.18.0</version> + <scope>test</scope> </dependency> <dependency> - <groupId>org.jetbrains</groupId> - <artifactId>annotations</artifactId> - <version>22.0.0</version> + <groupId>jakarta.validation</groupId> + <artifactId>jakarta.validation-api</artifactId> + <version>3.0.2</version> </dependency> <dependency> - <groupId>org.testcontainers</groupId> - <artifactId>testcontainers-bom</artifactId> - <version>1.18.3</version> + <groupId>io.cloudevents</groupId> + <artifactId>cloudevents-bom</artifactId> + <version>2.5.0</version> <type>pom</type> <scope>import</scope> </dependency> <dependency> - <groupId>com.github.spotbugs</groupId> - <artifactId>spotbugs</artifactId> - <version>4.2.0</version> + <groupId>io.gsonfire</groupId> + <artifactId>gson-fire</artifactId> + <version>1.8.5</version> </dependency> <dependency> - <groupId>org.liquibase</groupId> - <artifactId>liquibase-core</artifactId> - <version>4.16.0</version> + <groupId>io.hypersistence</groupId> + <artifactId>hypersistence-utils-hibernate-60</artifactId> + <version>3.5.0</version> </dependency> <dependency> - <groupId>com.tngtech.archunit</groupId> - <artifactId>archunit-junit5</artifactId> - <version>0.18.0</version> - <scope>test</scope> + <groupId>io.micrometer</groupId> + <artifactId>micrometer-tracing-bridge-brave</artifactId> + <version>1.0.0</version> </dependency> <dependency> - <groupId>org.mapstruct</groupId> - <artifactId>mapstruct</artifactId> - <version>${mapstruct.version}</version> + <groupId>io.swagger.core.v3</groupId> + <artifactId>swagger-annotations</artifactId> + <version>2.2.10</version> </dependency> <dependency> - <groupId>org.mapstruct</groupId> - <artifactId>mapstruct-processor</artifactId> - <version>${mapstruct.version}</version> + <groupId>io.swagger.core.v3</groupId> + <artifactId>swagger-models</artifactId> + <version>2.2.15</version> </dependency> <dependency> <groupId>net.logstash.logback</groupId> @@ -202,24 +191,14 @@ <version>7.0.1</version> </dependency> <dependency> - <groupId>org.codehaus.janino</groupId> - <artifactId>janino</artifactId> - <version>3.1.7</version> - </dependency> - <dependency> - <groupId>com.hazelcast</groupId> - <artifactId>hazelcast-spring</artifactId> - <version>5.3.1</version> - </dependency> - <dependency> - <groupId>com.google.guava</groupId> - <artifactId>guava</artifactId> - <version>31.1-jre</version> + <groupId>org.antlr</groupId> + <artifactId>antlr4-runtime</artifactId> + <version>4.9.2</version> </dependency> <dependency> - <groupId>javax.validation</groupId> - <artifactId>validation-api</artifactId> - <version>2.0.1.Final</version> + <groupId>org.apache.commons</groupId> + <artifactId>commons-lang3</artifactId> + <version>3.11</version> </dependency> <dependency> <groupId>org.apache.maven.plugins</groupId> @@ -227,54 +206,54 @@ <version>3.3.1</version> </dependency> <dependency> - <groupId>jakarta.validation</groupId> - <artifactId>jakarta.validation-api</artifactId> - <version>3.0.2</version> + <groupId>org.codehaus.groovy</groupId> + <artifactId>groovy</artifactId> + <version>${groovy.version}</version> </dependency> <dependency> - <groupId>io.micrometer</groupId> - <artifactId>micrometer-tracing-bridge-brave</artifactId> - <version>1.0.0</version> + <groupId>org.codehaus.janino</groupId> + <artifactId>janino</artifactId> + <version>3.1.7</version> </dependency> <dependency> - <groupId>com.fasterxml.jackson.dataformat</groupId> - <artifactId>jackson-dataformat-xml</artifactId> - <version>2.13.1</version> + <groupId>org.codehaus.groovy</groupId> + <artifactId>groovy-json</artifactId> + <version>${groovy.version}</version> </dependency> <dependency> - <groupId>io.swagger.core.v3</groupId> - <artifactId>swagger-models</artifactId> - <version>2.2.15</version> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-server</artifactId> + <version>${jetty-version}</version> </dependency> <dependency> - <groupId>org.projectlombok</groupId> - <artifactId>lombok</artifactId> - <version>1.18.24</version> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-http</artifactId> + <version>${jetty-version}</version> </dependency> <dependency> - <groupId>io.gsonfire</groupId> - <artifactId>gson-fire</artifactId> - <version>1.8.5</version> + <groupId>org.jetbrains</groupId> + <artifactId>annotations</artifactId> + <version>22.0.0</version> </dependency> <dependency> - <groupId>com.fasterxml.jackson.core</groupId> - <artifactId>jackson-databind</artifactId> - <version>2.15.2</version> + <groupId>org.junit.jupiter</groupId> + <artifactId>junit-jupiter-api</artifactId> + <version>5.10.0</version> </dependency> <dependency> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-server</artifactId> - <version>11.0.14</version> + <groupId>org.liquibase</groupId> + <artifactId>liquibase-core</artifactId> + <version>4.16.0</version> </dependency> <dependency> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-http</artifactId> - <version>11.0.14</version> + <groupId>org.mapstruct</groupId> + <artifactId>mapstruct</artifactId> + <version>${mapstruct.version}</version> </dependency> <dependency> - <groupId>jakarta.servlet</groupId> - <artifactId>jakarta.servlet-api</artifactId> - <version>6.0.0</version> + <groupId>org.mapstruct</groupId> + <artifactId>mapstruct-processor</artifactId> + <version>${mapstruct.version}</version> </dependency> <dependency> <groupId>org.openapitools</groupId> @@ -282,14 +261,33 @@ <version>0.2.4</version> </dependency> <dependency> - <groupId>org.junit.jupiter</groupId> - <artifactId>junit-jupiter-api</artifactId> - <version>5.10.0</version> + <groupId>org.opendaylight.yangtools</groupId> + <artifactId>yangtools-artifacts</artifactId> + <version>8.0.6</version> + <type>pom</type> + <scope>import</scope> </dependency> <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-test</artifactId> - <version>6.0.11</version> + <groupId>org.projectlombok</groupId> + <artifactId>lombok</artifactId> + <version>1.18.24</version> + </dependency> + <dependency> + <groupId>org.testcontainers</groupId> + <artifactId>testcontainers-bom</artifactId> + <version>1.18.3</version> + <type>pom</type> + <scope>import</scope> + </dependency> + <dependency> + <groupId>org.spockframework</groupId> + <artifactId>spock-core</artifactId> + <version>2.4-M1-groovy-3.0</version> + </dependency> + <dependency> + <groupId>org.spockframework</groupId> + <artifactId>spock-spring</artifactId> + <version>2.4-M1-groovy-3.0</version> </dependency> </dependencies> </dependencyManagement> diff --git a/cps-ncmp-rest/pom.xml b/cps-ncmp-rest/pom.xml index 851790257a..6a52d9f1af 100644 --- a/cps-ncmp-rest/pom.xml +++ b/cps-ncmp-rest/pom.xml @@ -62,6 +62,10 @@ <artifactId>spring-boot-starter-jetty</artifactId> </dependency> <dependency> + <groupId>com.google.code.gson</groupId> + <artifactId>gson</artifactId> + </dependency> + <dependency> <groupId>io.swagger.core.v3</groupId> <artifactId>swagger-annotations</artifactId> </dependency> @@ -77,6 +81,10 @@ <groupId>org.mapstruct</groupId> <artifactId>mapstruct-processor</artifactId> </dependency> + <dependency> + <groupId>org.openapitools</groupId> + <artifactId>jackson-databind-nullable</artifactId> + </dependency> <!-- T E S T D E P E N D E N C I E S --> <dependency> <groupId>org.codehaus.groovy</groupId> @@ -115,16 +123,9 @@ </exclusions> </dependency> <dependency> - <groupId>com.google.code.gson</groupId> - <artifactId>gson</artifactId> - </dependency> - <dependency> - <groupId>org.openapitools</groupId> - <artifactId>jackson-databind-nullable</artifactId> - </dependency> - <dependency> <groupId>org.junit.jupiter</groupId> <artifactId>junit-jupiter</artifactId> + <scope>test</scope> </dependency> </dependencies> diff --git a/cps-rest/pom.xml b/cps-rest/pom.xml index 4a5fbe48bd..f99e48f11a 100755 --- a/cps-rest/pom.xml +++ b/cps-rest/pom.xml @@ -39,6 +39,7 @@ <groupId>${project.groupId}</groupId> <artifactId>cps-service</artifactId> </dependency> + <!-- S P R I N G D E P E N D E N C I E S --> <dependency> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-starter-web</artifactId> @@ -65,6 +66,15 @@ <groupId>org.springframework</groupId> <artifactId>spring-aspects</artifactId> </dependency> + <!-- A L P H A B E T I C A L D E P E N D E N C I E S --> + <dependency> + <groupId>jakarta.validation</groupId> + <artifactId>jakarta.validation-api</artifactId> + </dependency> + <dependency> + <groupId>io.gsonfire</groupId> + <artifactId>gson-fire</artifactId> + </dependency> <dependency> <groupId>io.swagger.core.v3</groupId> <artifactId>swagger-annotations</artifactId> @@ -122,14 +132,6 @@ </exclusion> </exclusions> </dependency> - <dependency> - <groupId>jakarta.validation</groupId> - <artifactId>jakarta.validation-api</artifactId> - </dependency> - <dependency> - <groupId>io.gsonfire</groupId> - <artifactId>gson-fire</artifactId> - </dependency> </dependencies> <build> diff --git a/cps-service/pom.xml b/cps-service/pom.xml index eaa9fdcbf3..0787409ca2 100644 --- a/cps-service/pom.xml +++ b/cps-service/pom.xml @@ -37,6 +37,26 @@ <dependencies> <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-messaging</artifactId> + </dependency> + <dependency> + <groupId>org.springframework.boot</groupId> + <artifactId>spring-boot-starter-cache</artifactId> + </dependency> + <dependency> + <groupId>org.springframework.boot</groupId> + <artifactId>spring-boot-starter-aop</artifactId> + </dependency> + <dependency> + <groupId>org.springframework.boot</groupId> + <artifactId>spring-boot-starter-validation</artifactId> + </dependency> + <dependency> + <groupId>org.springframework.kafka</groupId> + <artifactId>spring-kafka</artifactId> + </dependency> + <dependency> <groupId>com.github.ben-manes.caffeine</groupId> <artifactId>caffeine</artifactId> </dependency> @@ -55,6 +75,10 @@ <artifactId>micrometer-core</artifactId> </dependency> <dependency> + <groupId>jakarta.validation</groupId> + <artifactId>jakarta.validation-api</artifactId> + </dependency> + <dependency> <groupId>net.logstash.logback</groupId> <artifactId>logstash-logback-encoder</artifactId> </dependency> @@ -104,33 +128,12 @@ <groupId>org.slf4j</groupId> <artifactId>slf4j-api</artifactId> </dependency> - <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-messaging</artifactId> - </dependency> - <dependency> - <groupId>org.springframework.boot</groupId> - <artifactId>spring-boot-starter-cache</artifactId> - <version>3.0.0</version> - </dependency> - <dependency> - <groupId>org.springframework.boot</groupId> - <artifactId>spring-boot-starter-aop</artifactId> - </dependency> - <dependency> - <groupId>org.springframework.boot</groupId> - <artifactId>spring-boot-starter-validation</artifactId> - </dependency> - <dependency> - <groupId>org.springframework.kafka</groupId> - <artifactId>spring-kafka</artifactId> - </dependency> + <!-- T E S T D E P E N D E N C I E S --> <dependency> <groupId>org.springframework</groupId> <artifactId>spring-test</artifactId> <scope>test</scope> </dependency> - <!-- T E S T D E P E N D E N C I E S --> <dependency> <groupId>org.codehaus.groovy</groupId> <artifactId>groovy</artifactId> @@ -176,9 +179,5 @@ <artifactId>aspectjrt</artifactId> <scope>test</scope> </dependency> - <dependency> - <groupId>jakarta.validation</groupId> - <artifactId>jakarta.validation-api</artifactId> - </dependency> </dependencies> </project> diff --git a/dmi-plugin-demo-and-csit-stub/dmi-plugin-demo-and-csit-stub-app/pom.xml b/dmi-plugin-demo-and-csit-stub/dmi-plugin-demo-and-csit-stub-app/pom.xml index d18788d86f..97f1bdc03b 100644 --- a/dmi-plugin-demo-and-csit-stub/dmi-plugin-demo-and-csit-stub-app/pom.xml +++ b/dmi-plugin-demo-and-csit-stub/dmi-plugin-demo-and-csit-stub-app/pom.xml @@ -106,7 +106,7 @@ <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-server</artifactId> - <version>11.0.14</version> + <version>11.0.16</version> </dependency> <dependency> <groupId>jakarta.servlet</groupId> |