Split URL properties into prefix/suffix

[portal/ric-dashboard.git] / e2-mgr-client / pom.xml

diff --git a/e2-mgr-client/pom.xml b/e2-mgr-client/pom.xml
index e558cc8..021fe68 100644 (file)
--- a/e2-mgr-client/pom.xml
+++ b/e2-mgr-client/pom.xml
@@ -25,20 +25,28 @@ limitations under the License.
        <parent>
                <groupId>org.o-ran-sc.portal.ric-dashboard</groupId>
                <artifactId>ric-dash-parent</artifactId>
-               <version>1.0.1-SNAPSHOT</version>
+               <version>1.2.0-SNAPSHOT</version>
        </parent>
        <!-- This groupId will NOT allow deployment in LF -->
-       <groupId>org.o-ran-sc.ric.e2mgr.client</groupId>
+       <groupId>org.o-ran-sc.ric.plt.e2mgr.client</groupId>
        <artifactId>e2-mgr-client</artifactId>
        <name>RIC E2 Manager client</name>
-       <version>02052019-SNAPSHOT</version>
+       <version>20190703-SNAPSHOT</version>
        <properties>
                <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
                <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+               <!-- Jenkins invokes maven with -Dbuild.number=.. -->
+               <build.number>0</build.number>
+               <!-- same as groupId BUT without hyphens -->
                <client.base.package.name>org.oransc.ric.e2mgr.client</client.base.package.name>
        </properties>
        <!-- Successful compilation requires generated code dependencies -->
        <dependencies>
+               <!-- Required for Java 9 and later -->
+               <dependency>
+                       <groupId>javax.annotation</groupId>
+                       <artifactId>javax.annotation-api</artifactId>
+               </dependency>
                <dependency>
                        <groupId>io.swagger.core.v3</groupId>
                        <artifactId>swagger-annotations</artifactId>
@@ -101,7 +109,7 @@ limitations under the License.
                                                        <goal>generate</goal>
                                                </goals>
                                                <configuration>
-                                                       <inputSpec>${project.basedir}/src/main/resources/e2_manager_02052019_2.yaml</inputSpec>
+                                                       <inputSpec>${project.basedir}/src/main/resources/E2M_API_2019-07-03.yaml</inputSpec>
                                                        <language>java</language>
                                                        <packageName>${client.base.package.name}</packageName>
                                                        <modelPackage>${client.base.package.name}.model</modelPackage>
@@ -121,51 +129,21 @@ limitations under the License.
                                        </execution>
                                </executions>
                        </plugin>
-                       <!-- Require Java 1.8 -->
-                       <plugin>
-                               <groupId>org.apache.maven.plugins</groupId>
-                               <artifactId>maven-compiler-plugin</artifactId>
-                               <!-- Spring sets the <version></version> -->
-                               <configuration>
-                                       <source>1.8</source>
-                                       <target>1.8</target>
-                               </configuration>
-                       </plugin>
-                       <!-- Generate javadoc jar; see profile for Java 8 -->
-                       <plugin>
-                               <groupId>org.apache.maven.plugins</groupId>
-                               <artifactId>maven-javadoc-plugin</artifactId>
-                               <!-- <version>2.10.3</version> -->
-                               <executions>
-                                       <execution>
-                                               <id>attach-javadocs</id>
-                                               <goals>
-                                                       <goal>jar</goal>
-                                               </goals>
-                                       </execution>
-                               </executions>
-                       </plugin>
-                       <!-- Generate source jar -->
-                       <plugin>
-                               <groupId>org.apache.maven.plugins</groupId>
-                               <artifactId>maven-source-plugin</artifactId>
-                               <!-- <version>3.0.0</version> -->
-                               <executions>
-                                       <execution>
-                                               <id>attach-sources</id>
-                                               <goals>
-                                                       <goal>jar</goal>
-                                               </goals>
-                                       </execution>
-                               </executions>
-                       </plugin>
-                       <!-- Skip the deploy-jar-to-nexus step -->
+                       <!-- add build information to manifest. Java provides access to the implementation 
+                               version for a package, so cram the build number into there. -->
                        <plugin>
                                <groupId>org.apache.maven.plugins</groupId>
-                               <artifactId>maven-deploy-plugin</artifactId>
-                               <!-- Spring sets the <version>2.8</version> -->
+                               <artifactId>maven-jar-plugin</artifactId>
+                               <!-- version>2.5</version> -->
                                <configuration>
-                                       <skip>true</skip>
+                                       <archive>
+                                               <manifest>
+                                                       <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+                                               </manifest>
+                                               <manifestEntries>
+                                                       <Implementation-Version>${project.version}-b${build.number}</Implementation-Version>
+                                               </manifestEntries>
+                                       </archive>
                                </configuration>
                        </plugin>
                </plugins>