From: John  Keeney <john.keeney@est.tech>
Date: Mon, 15 May 2023 09:17:59 +0000 (+0000)
Subject: Merge "Small changes"
X-Git-Tag: 2.6.0~1
X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=commitdiff_plain;h=8800406c66372e08bc1705c21bce2f03758f5708;hp=-c;p=nonrtric%2Fplt%2Fa1policymanagementservice.git

Merge "Small changes"
---

8800406c66372e08bc1705c21bce2f03758f5708
diff --combined pom.xml
index e4dbc87,61eb38e..00dee51
--- a/pom.xml
+++ b/pom.xml
@@@ -26,7 -26,7 +26,7 @@@
      <parent>
          <groupId>org.springframework.boot</groupId>
          <artifactId>spring-boot-starter-parent</artifactId>
-         <version>3.0.4</version>
+         <version>3.0.6</version>
          <relativePath />
      </parent>
      <groupId>org.o-ran-sc.nonrtric.plt</groupId>
@@@ -52,7 -52,6 +52,6 @@@
          <formatter-maven-plugin.version>2.13.0</formatter-maven-plugin.version>
          <spotless-maven-plugin.version>2.30.0</spotless-maven-plugin.version>
          <docker-maven-plugin>0.30.0</docker-maven-plugin>
-         <javax.ws.rs-api.version>2.1.1</javax.ws.rs-api.version>
          <sonar-maven-plugin.version>3.7.0.1746</sonar-maven-plugin.version>
          <jacoco-maven-plugin.version>0.8.8</jacoco-maven-plugin.version>
          <exec-maven-plugin.version>3.1.0</exec-maven-plugin.version>
@@@ -60,7 -59,7 +59,7 @@@
          <springdoc.version>2.0.2</springdoc.version>
          <springdoc.openapi-ui.version>1.6.14</springdoc.openapi-ui.version>
      </properties>
-     <dependencies>
+     <dependencies>    
          <dependency>
              <groupId>commons-io</groupId>
              <artifactId>commons-io</artifactId>
@@@ -120,11 -119,6 +119,6 @@@
              <artifactId>lombok</artifactId>
              <scope>provided</scope>
          </dependency>
-         <dependency>
-             <groupId>javax.ws.rs</groupId>
-             <artifactId>javax.ws.rs-api</artifactId>
-             <version>${javax.ws.rs-api.version}</version>
-         </dependency>
          <dependency>
              <groupId>org.glassfish.jersey.inject</groupId>
              <artifactId>jersey-hk2</artifactId>
@@@ -274,7 -268,6 +268,7 @@@
                                          <cleanup>try</cleanup>
                                          <contextDir>${basedir}</contextDir>
                                          <dockerFile>Dockerfile</dockerFile>
 +                                        <filter>false</filter>
                                          <args>
                                              <JAR>${project.build.finalName}.jar</JAR>
                                          </args>
@@@ -302,7 -295,6 +296,7 @@@
                                      <build>
                                          <contextDir>${basedir}</contextDir>
                                          <dockerFile>Dockerfile</dockerFile>
 +                                        <filter>false</filter>
                                          <args>
                                              <JAR>${project.build.finalName}.jar</JAR>
                                          </args>
@@@ -367,4 -359,4 +361,4 @@@
          <system>JIRA</system>
          <url>https://jira.o-ran-sc.org/</url>
      </issueManagement>
- </project>
+ </project>