X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=xapp-mgr-client%2Fpom.xml;h=6e27cbec1bc054c25e99c5833f6c0855f545b058;hb=refs%2Fchanges%2F13%2F113%2F1;hp=cc549400f7cc762ec35f7488bf5da4699bdab9a9;hpb=e2cbc4d0304646febf7e2cbe0dccdf9840189222;p=portal%2Fric-dashboard.git

diff --git a/xapp-mgr-client/pom.xml b/xapp-mgr-client/pom.xml
index cc549400..6e27cbec 100644
--- a/xapp-mgr-client/pom.xml
+++ b/xapp-mgr-client/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--<![CDATA[
 ========================LICENSE_START=================================
-ORAN-OSC
+O-RAN-SC
 %%
 Copyright (C) 2019 AT&T Intellectual Property and Nokia
 %%
@@ -23,25 +23,26 @@ limitations under the License.
 	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.oranosc.ric.portal.dashboard</groupId>
+		<groupId>org.o-ran-sc.portal.ric-dashboard</groupId>
 		<artifactId>ric-dash-parent</artifactId>
-		<version>1.0.0-SNAPSHOT</version>
+		<version>1.0.1-SNAPSHOT</version>
 	</parent>
+	<!-- This groupId will NOT allow deployment in LF -->
+	<groupId>org.o-ran-sc.ric.xappmgr.client</groupId>
 	<artifactId>xapp-mgr-client</artifactId>
 	<name>RIC xApp Manager client</name>
 	<version>0.0.10-SNAPSHOT</version>
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<swagger-annotations-version>1.5.15</swagger-annotations-version>
-		<client.base.package.name>${project.groupId}.xmc</client.base.package.name>
+		<client.base.package.name>org.oransc.ric.xappmgr.client</client.base.package.name>
 	</properties>
 	<!-- Successful compilation requires generated code dependencies -->
 	<dependencies>
 		<dependency>
 			<groupId>io.swagger</groupId>
 			<artifactId>swagger-annotations</artifactId>
-			<version>${swagger-annotations-version}</version>
+			<version>1.5.15</version>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework</groupId>
@@ -81,44 +82,38 @@ limitations under the License.
 		</dependency>
 		<!-- test dependencies -->
 		<dependency>
-			<groupId>junit</groupId>
-			<artifactId>junit</artifactId>
-			<!-- <version>${junit-version}</version> -->
+			<groupId>org.junit.jupiter</groupId>
+			<artifactId>junit-jupiter-api</artifactId>
+			<!-- spring sets the <version>5.4.2</version> -->
 			<scope>test</scope>
 		</dependency>
 	</dependencies>
 	<build>
 		<plugins>
 			<plugin>
+				<!-- This version works fine on Swagger 2.0 -->
 				<groupId>io.swagger</groupId>
 				<artifactId>swagger-codegen-maven-plugin</artifactId>
-				<version>2.2.3</version>
+				<version>2.4.5</version>
 				<executions>
 					<execution>
 						<goals>
 							<goal>generate</goal>
 						</goals>
 						<configuration>
-							<inputSpec>${project.basedir}/xapp_manager_rest_api_v0_0_10.json</inputSpec>
+							<inputSpec>${project.basedir}/src/main/resources/xapp_manager_rest_api_v0_0_10.json</inputSpec>
 							<language>java</language>
 							<configOptions>
 								<groupId>${project.groupId}</groupId>
 								<artifactId>${project.artifactId}</artifactId>
 								<artifactVersion>${project.version}</artifactVersion>
-								<artifactUrl>www.oran-osc.org</artifactUrl>
+								<artifactUrl>www.O-RAN-SC.org</artifactUrl>
 								<artifactDescription>xApp manager client library</artifactDescription>
 								<library>resttemplate</library>
 								<java8>true</java8>
 								<dateLibrary>java8</dateLibrary>
 								<licenseName>Apache 2.0</licenseName>
 								<licenseUrl>https://www.apache.org/licenses/LICENSE-2.0</licenseUrl>
-								<scmConnection></scmConnection>
-								<scmDeveloperConnection></scmDeveloperConnection>
-								<scmUrl>http://gerrit.oran-osc.org</scmUrl>
-								<developerName>RIC Team</developerName>
-								<developerEmail></developerEmail>
-								<developerOrganization>AT&amp;T and Nokia</developerOrganization>
-								<developerOrganizationUrl></developerOrganizationUrl>
 							</configOptions>
 							<packageName>${client.base.package.name}</packageName>
 							<modelPackage>${client.base.package.name}.model</modelPackage>
@@ -166,6 +161,45 @@ limitations under the License.
 					</execution>
 				</executions>
 			</plugin>
+			<!-- Skip the deploy-jar-to-nexus step -->
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-deploy-plugin</artifactId>
+				<!-- Spring sets the <version>2.8</version> -->
+				<configuration>
+					<skip>true</skip>
+				</configuration>
+			</plugin>
 		</plugins>
+		<pluginManagement>
+			<plugins>
+				<!--This plugin's configuration is used to store Eclipse m2e settings 
+					only. It has no influence on the Maven build itself. -->
+				<plugin>
+					<groupId>org.eclipse.m2e</groupId>
+					<artifactId>lifecycle-mapping</artifactId>
+					<version>1.0.0</version>
+					<configuration>
+						<lifecycleMappingMetadata>
+							<pluginExecutions>
+								<pluginExecution>
+									<pluginExecutionFilter>
+										<groupId>io.swagger</groupId>
+										<artifactId>swagger-codegen-maven-plugin</artifactId>
+										<versionRange>[1.0,)</versionRange>
+										<goals>
+											<goal>generate</goal>
+										</goals>
+									</pluginExecutionFilter>
+									<action>
+										<ignore/>
+									</action>
+								</pluginExecution>
+							</pluginExecutions>
+						</lifecycleMappingMetadata>
+					</configuration>
+				</plugin>
+			</plugins>
+		</pluginManagement>
 	</build>
 </project>