update pom

Change-Id: I6d58a155b463b996d617a2200c4743b02b29a7c9
Signed-off-by: Steve Smokowski <ss835w@att.com>

diff --git a/aai-schema/pom.xml b/aai-schema/pom.xml
index 8c6a5f4..be2cd29 100644 (file)
--- a/aai-schema/pom.xml
+++ b/aai-schema/pom.xml
@@ -21,7 +21,7 @@
     </dependency>
   </dependencies>
   <build>
-    <finalName>${project.artifactId}-${openecomp.release}</finalName>
+    
           <plugins>
          <plugin>
                <groupId>org.jsonschema2pojo</groupId>

diff --git a/ajsc-aai/pom.xml b/ajsc-aai/pom.xml
index cb76bb3..3ed7067 100644 (file)
--- a/ajsc-aai/pom.xml
+++ b/ajsc-aai/pom.xml
@@ -331,7 +331,7 @@
        </dependency>
   </dependencies>
   <build>
-               <finalName>aai</finalName>      
+               
                <plugins>
                 <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
@@ -441,7 +441,7 @@
                                                <plugin>
                                                        <groupId>org.openecomp.aai.aai-service</groupId>
                                                        <artifactId>annotations</artifactId>
-                                                       <version>${openecomp.release}</version>
+                                                       <version>${project.release}</version>
                                                </plugin>
                                        </plugins>
                                </configuration>
@@ -533,14 +533,14 @@
                                <artifactItem>
                                  <groupId>org.openecomp.aai.aai-service</groupId>
                                  <artifactId>aai-schema</artifactId>
-                                 <version>${openecomp.release}</version>
+                                 <version>1.0.0-SNAPSHOT</version>
                                  <outputDirectory>bundleconfig-local/etc</outputDirectory>
                                  <includes>oxm/*.xml</includes>
                                </artifactItem>
                                <artifactItem>
                                  <groupId>org.openecomp.aai.aai-service</groupId>
                                  <artifactId>aai-schema</artifactId>
-                                 <version>${openecomp.release}</version>
+                                 <version>1.0.0-SNAPSHOT</version>
                                  <outputDirectory>src/main</outputDirectory>
                                  <includes>aai_schema/*.xsd</includes>
                                </artifactItem>

diff --git a/pom.xml b/pom.xml
index 9bfc3a1..fe33262 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -22,9 +22,7 @@
                <maven.compiler.source>1.8</maven.compiler.source>
                <module.ajsc.namespace.name>ActiveAndAvailableInventory-CloudNetwork</module.ajsc.namespace.name>
                <module.ajsc.namespace.version>v1</module.ajsc.namespace.version>
-        <openecomp.release>1.0.0</openecomp.release>
-        <docker.nexusurl>${docker_nexusurl}</docker.nexusurl>
-               <ajscRuntimeVersion>2.0.0</ajscRuntimeVersion>
+        <ajscRuntimeVersion>2.0.0</ajscRuntimeVersion>
 
                <!-- This will be the Absolute Root of the Project and should contain NO 
                        Versioning -->
@@ -34,7 +32,7 @@
                        For NO Versioning, leave as is -->
                <!-- example: /appl/${project.artifactId}/${openecomp.release}. Also, add 
                        ${openecomp.release} to ${runAjscHome} for running locally. -->
-               <distFilesRoot>/opt/app/ajsc-aai/${openecomp.release}</distFilesRoot>
+               <distFilesRoot>/opt/app/ajsc-aai/${project.version}</distFilesRoot>
                <aaiAppHome>${basedir}/ajsc-aai</aaiAppHome>
                <runAjscHome>${aaiAppHome}/target/swm/package/nix/dist_files${distFilesRoot}</runAjscHome>
 
@@ -374,10 +372,5 @@
       </plugins>
     </reporting>
 
-<distributionManagement>
-    <site>
-      <id>aai-javadoc</id>
-      <url>dav:https://${docker.nexusurl}/repository/aai-javadoc/${openecomp.release}/</url>
-    </site>
-</distributionManagement>
+
 </project>