Code Review
/
portal
/
ric-dashboard.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Use O-RAN-SC
[portal/ric-dashboard.git]
/
webapp-backend
/
pom.xml
diff --git
a/webapp-backend/pom.xml
b/webapp-backend/pom.xml
index
b604eed
..
fb4406f
100644
(file)
--- a/
webapp-backend/pom.xml
+++ b/
webapp-backend/pom.xml
@@
-1,7
+1,7
@@
<?xml version="1.0" encoding="UTF-8"?>
<!--<![CDATA[
========================LICENSE_START=================================
<?xml version="1.0" encoding="UTF-8"?>
<!--<![CDATA[
========================LICENSE_START=================================
-O
RAN-O
SC
+O
-RAN-
SC
%%
Copyright (C) 2019 AT&T Intellectual Property and Nokia
%%
%%
Copyright (C) 2019 AT&T Intellectual Property and Nokia
%%
@@
-23,25
+23,29
@@
limitations under the License.
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.o
ranosc.ric.portal.
dashboard</groupId>
+ <groupId>org.o
-ran-sc.portal.ric-
dashboard</groupId>
<artifactId>ric-dash-parent</artifactId>
<artifactId>ric-dash-parent</artifactId>
- <version>1.0.
0
-SNAPSHOT</version>
+ <version>1.0.
1
-SNAPSHOT</version>
</parent>
<artifactId>ric-dash-be</artifactId>
<name>RIC Dashboard Webapp backend</name>
<properties>
<java.version>1.8</java.version>
<springfox.version>2.9.2</springfox.version>
</parent>
<artifactId>ric-dash-be</artifactId>
<name>RIC Dashboard Webapp backend</name>
<properties>
<java.version>1.8</java.version>
<springfox.version>2.9.2</springfox.version>
- <docker.push.registry>${env.NEXUS3_PUSH_REGISTRY}</docker.push.registry>
</properties>
<dependencies>
<dependency>
</properties>
<dependencies>
<dependency>
- <groupId>org.oranosc.ric.e2mgr.client</groupId>
+ <groupId>org.o-ran-sc.ric.a1med.client</groupId>
+ <artifactId>a1-med-client</artifactId>
+ <version>0.3.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.o-ran-sc.ric.e2mgr.client</groupId>
<artifactId>e2-mgr-client</artifactId>
<artifactId>e2-mgr-client</artifactId>
- <version>0
.0.1
-SNAPSHOT</version>
+ <version>0
2052019
-SNAPSHOT</version>
</dependency>
<dependency>
</dependency>
<dependency>
- <groupId>org.o
rano
sc.ric.xappmgr.client</groupId>
+ <groupId>org.o
-ran-
sc.ric.xappmgr.client</groupId>
<artifactId>xapp-mgr-client</artifactId>
<version>0.0.10-SNAPSHOT</version>
</dependency>
<artifactId>xapp-mgr-client</artifactId>
<version>0.0.10-SNAPSHOT</version>
</dependency>
@@
-49,25
+53,17
@@
limitations under the License.
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
</dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
</dependency>
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-test</artifactId>
- <scope>test</scope>
- </dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
- <!-- Spring-boot sets the version -->
</dependency>
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
</dependency>
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
- <!-- Spring-boot sets the version -->
</dependency>
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-core</artifactId>
</dependency>
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-core</artifactId>
- <!-- Spring-boot sets the version -->
</dependency>
<dependency>
<groupId>io.springfox</groupId>
</dependency>
<dependency>
<groupId>io.springfox</groupId>
@@
-79,10
+75,15
@@
limitations under the License.
<artifactId>springfox-swagger-ui</artifactId>
<version>${springfox.version}</version>
</dependency>
<artifactId>springfox-swagger-ui</artifactId>
<version>${springfox.version}</version>
</dependency>
+ <!-- Mockito supports development, not just testing -->
+ <dependency>
+ <groupId>org.mockito</groupId>
+ <artifactId>mockito-core</artifactId>
+ </dependency>
+ <!-- Test dependencies -->
<dependency>
<dependency>
- <groupId>org.junit.jupiter</groupId>
- <artifactId>junit-jupiter-api</artifactId>
- <!-- spring sets the <version>5.4.2</version> -->
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-test</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
<scope>test</scope>
</dependency>
</dependencies>
@@
-150,9
+151,9
@@
limitations under the License.
<version>0.28.0</version>
<configuration>
<verbose>true</verbose>
<version>0.28.0</version>
<configuration>
<verbose>true</verbose>
- <!--
Not supplied to all jobs; e.g., Javadoc
-->
- <
docker.pull.registry>nexus3.oran-osc.org:10001</docker.pull.r
egistry>
- <pushRegistry>${
docker.push.registry
}</pushRegistry>
+ <!--
environment variables supplied by Jenkins
-->
+ <
pullRegistry>${env.CONTAINER_PULL_REGISTRY}</pullR
egistry>
+ <pushRegistry>${
env.CONTAINER_PUSH_REGISTRY
}</pushRegistry>
<images>
<image>
<!-- Specify a tag to avoid default tag "latest" -->
<images>
<image>
<!-- Specify a tag to avoid default tag "latest" -->