Update License & modify properties in aaf/inno

Updated license file & sitepath modified and O-parent latest added to
parent pom of aaf/inno.

Issue-id: AAF-59
Change-Id: I592fbad2d8c5d68c593baeb8b04cbd4e8d9aac72
Signed-off-by: sg481n <sg481n@att.com>

diff --git a/LICENSE b/LICENSE
index cd88bf0..b885083 100644 (file)
--- a/LICENSE
+++ b/LICENSE
@@ -1,23 +1,39 @@
-<!--
- ============LICENSE_START====================================================
-* org.onap.aaf
-* ===========================================================================
+/*
+* ============LICENSE_START==========================================
+* ===================================================================
 * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
-* ===========================================================================
-* Licensed under the Apache License, Version 2.0 (the "License");
-* you may not use this file except in compliance with the License.
+* ===================================================================
+*
+* Unless otherwise specified, all software contained herein is licensed
+* under the Apache License, Version 2.0 (the "License");
+* you may not use this software except in compliance with the License.
+* You may obtain a copy of the License at
+*
+*             http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*
+*
+*
+* Unless otherwise specified, all documentation contained herein is licensed
+* under the Creative Commons License, Attribution 4.0 Intl. (the "License");
+* you may not use this documentation except in compliance with the License.
 * You may obtain a copy of the License at
-* 
- *      http://www.apache.org/licenses/LICENSE-2.0
-* 
- * Unless required by applicable law or agreed to in writing, software
+*
+*             https://creativecommons.org/licenses/by/4.0/
+*
+* Unless required by applicable law or agreed to in writing, documentation
 * distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License.
-* ============LICENSE_END====================================================
+*
+* ============LICENSE_END============================================
 *
 * ECOMP is a trademark and service mark of AT&T Intellectual Property.
 *
-
--->
\ No newline at end of file
+*/
\ No newline at end of file

diff --git a/env/pom.xml b/env/pom.xml
index e4e7e18..4b2f122 100644 (file)
--- a/env/pom.xml
+++ b/env/pom.xml
@@ -65,7 +65,7 @@
                <snapshotNexusPath>/content/repositories/snapshots/</snapshotNexusPath>\r
                <releaseNexusPath>/content/repositories/releases/</releaseNexusPath>\r
                <stagingNexusPath>/content/repositories/staging/</stagingNexusPath>\r
-               <sitePath>/content/sites/site/${project.groupId}/${project.artifactId}/${project.version}</sitePath>\r
+               <sitePath>/content/sites/site/org/onap/aaf/inno/${project.artifactId}/${project.version}</sitePath>\r
        </properties>\r
        <dependencies>\r
                <dependency>\r
@@ -99,7 +99,6 @@
                                        <nexusUrl>${nexusproxy}</nexusUrl>\r
                                        <stagingProfileId>176c31dfe190a</stagingProfileId>\r
                                        <serverId>ecomp-staging</serverId>\r
-                                       <skipNexusStagingDeployMojo>${skip.staging.artifacts}</skipNexusStagingDeployMojo>\r
                                </configuration>\r
                        </plugin>               \r
                        <plugin>\r
@@ -155,7 +154,6 @@
                        </plugin>\r
                \r
        </plugins>\r
-\r
        </build>\r
        <distributionManagement>\r
                <repository>\r
@@ -173,33 +171,5 @@
                        <url>dav:${nexusproxy}${sitePath}</url>\r
                </site>\r
        </distributionManagement>\r
-<pluginRepositories>\r
-        <pluginRepository>\r
-            <id>onap-plugin-snapshots</id>\r
-            <url>https://nexus.onap.org/content/repositories/snapshots/</url>\r
-        </pluginRepository>\r
-    </pluginRepositories>\r
-       \r
-       <repositories>\r
-               <repository>\r
-                       <id>central</id>\r
-                       <name>Maven 2 repository 2</name>\r
-                       <url>http://repo2.maven.org/maven2/</url>\r
-               </repository>\r
-               <repository>\r
-            <id>onap-jar-snapshots</id>\r
-            <url>https://nexus.onap.org/content/repositories/snapshots</url>\r
-        </repository>\r
-               <repository>\r
-                       <id>spring-repo</id>\r
-                       <name>Spring repo</name>\r
-                       <url>https://artifacts.alfresco.com/nexus/content/repositories/public/</url>\r
-               </repository>\r
-               <repository>\r
-                       <id>repository.jboss.org-public</id>\r
-                       <name>JBoss.org Maven repository</name>\r
-                       <url>https://repository.jboss.org/nexus/content/groups/public</url>\r
-               </repository>\r
-       </repositories>\r
 </project>\r
 \r

diff --git a/log4j/pom.xml b/log4j/pom.xml
index 2ed9bf6..fd7f950 100644 (file)
--- a/log4j/pom.xml
+++ b/log4j/pom.xml
@@ -64,7 +64,7 @@
                <snapshotNexusPath>/content/repositories/snapshots/</snapshotNexusPath>\r
                <releaseNexusPath>/content/repositories/releases/</releaseNexusPath>\r
                <stagingNexusPath>/content/repositories/staging/</stagingNexusPath>\r
-               <sitePath>/content/sites/site/${project.groupId}/${project.artifactId}/${project.version}</sitePath>\r
+               <sitePath>/content/sites/site/org/onap/aaf/inno/${project.artifactId}/${project.version}</sitePath>\r
        </properties>\r
        <dependencies>\r
                <dependency>\r
@@ -115,7 +115,6 @@
                                        <nexusUrl>${nexusproxy}</nexusUrl>\r
                                        <stagingProfileId>176c31dfe190a</stagingProfileId>\r
                                        <serverId>ecomp-staging</serverId>\r
-                                       <skipNexusStagingDeployMojo>${skip.staging.artifacts}</skipNexusStagingDeployMojo>\r
                                </configuration>\r
                        </plugin>               \r
                        <plugin>\r
@@ -188,34 +187,5 @@
                        <url>dav:${nexusproxy}${sitePath}</url>\r
                </site>\r
        </distributionManagement>\r
-       <pluginRepositories>\r
-        <pluginRepository>\r
-            <id>onap-plugin-snapshots</id>\r
-            <url>https://nexus.onap.org/content/repositories/snapshots/</url>\r
-        </pluginRepository>\r
-    </pluginRepositories>\r
-       \r
-       <repositories>\r
-               <repository>\r
-                       <id>central</id>\r
-                       <name>Maven 2 repository 2</name>\r
-                       <url>http://repo2.maven.org/maven2/</url>\r
-               </repository>\r
-               <repository>\r
-            <id>onap-jar-snapshots</id>\r
-            <url>https://nexus.onap.org/content/repositories/snapshots</url>\r
-        </repository>\r
-               <repository>\r
-                       <id>spring-repo</id>\r
-                       <name>Spring repo</name>\r
-                       <url>https://artifacts.alfresco.com/nexus/content/repositories/public/</url>\r
-               </repository>\r
-               <repository>\r
-                       <id>repository.jboss.org-public</id>\r
-                       <name>JBoss.org Maven repository</name>\r
-                       <url>https://repository.jboss.org/nexus/content/groups/public</url>\r
-               </repository>\r
-       </repositories>\r
-       \r
        \r
 </project>\r

diff --git a/pom.xml b/pom.xml
index e3a1211..02e013e 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -51,8 +51,9 @@
         <parent>
                <groupId>org.onap.oparent</groupId>
                <artifactId>oparent</artifactId>
-               <version>1.0.0-SNAPSHOT</version>
+               <version>0.1.1</version>
        </parent>
+
        
        <properties>
                <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -138,7 +139,6 @@
                                        <nexusUrl>${nexusproxy}</nexusUrl>
                                        <stagingProfileId>176c31dfe190a</stagingProfileId>
                                        <serverId>ecomp-staging</serverId>
-                                       <skipNexusStagingDeployMojo>${skip.staging.artifacts}</skipNexusStagingDeployMojo>
                                </configuration>
                        </plugin>               
                        <plugin>
@@ -210,54 +210,11 @@
                        <url>dav:${nexusproxy}${sitePath}</url>
                </site>
        </distributionManagement>
-<pluginRepositories>
-        <pluginRepository>
-            <id>onap-plugin-snapshots</id>
-            <url>https://nexus.onap.org/content/repositories/snapshots/</url>
-        </pluginRepository>
-    </pluginRepositories>
-       
-       <repositories>
-               <repository>
-                       <id>central</id>
-                       <name>Maven 2 repository 2</name>
-                       <url>http://repo2.maven.org/maven2/</url>
-               </repository>
-               <repository>
-            <id>onap-jar-snapshots</id>
-            <url>https://nexus.onap.org/content/repositories/snapshots</url>
-        </repository>
-               <repository>
-                       <id>spring-repo</id>
-                       <name>Spring repo</name>
-                       <url>https://artifacts.alfresco.com/nexus/content/repositories/public/</url>
-               </repository>
-               <repository>
-                       <id>repository.jboss.org-public</id>
-                       <name>JBoss.org Maven repository</name>
-                       <url>https://repository.jboss.org/nexus/content/groups/public</url>
-               </repository>
-       </repositories>
+
        <modules>
                <module>env</module>
                <module>xgen</module>
                <module>rosetta</module>
-
-               <!-- 
-               <module>persist</module>
-               <module>fsdb</module>
-               <module>rosetta</module>
-               <module>persist-fsdb</module>
-               <module>rmodel</module>
-               <module>rclient</module>
-               <module>rserv</module>
-               <module>fsdbrserv</module>
-               <module>guigen</module>
-               <module>mdgui</module>
-               <module>poll</module>
-               <module>ngreq</module>
-               <module>lpeer</module>
-                -->
                <module>log4j</module>
        </modules>
 

diff --git a/rosetta/pom.xml b/rosetta/pom.xml
index c9c224f..896a728 100644 (file)
--- a/rosetta/pom.xml
+++ b/rosetta/pom.xml
@@ -64,7 +64,7 @@
                <snapshotNexusPath>/content/repositories/snapshots/</snapshotNexusPath>\r
                <releaseNexusPath>/content/repositories/releases/</releaseNexusPath>\r
                <stagingNexusPath>/content/repositories/staging/</stagingNexusPath>\r
-               <sitePath>/content/sites/site/${project.groupId}/${project.artifactId}/${project.version}</sitePath>\r
+               <sitePath>/content/sites/site/org/onap/aaf/inno/${project.artifactId}/${project.version}</sitePath>\r
        </properties>\r
        <dependencies>\r
                <dependency>\r
@@ -179,7 +179,6 @@
                                        <nexusUrl>${nexusproxy}</nexusUrl>\r
                                        <stagingProfileId>176c31dfe190a</stagingProfileId>\r
                                        <serverId>ecomp-staging</serverId>\r
-                                       <skipNexusStagingDeployMojo>${skip.staging.artifacts}</skipNexusStagingDeployMojo>\r
                                </configuration>\r
                        </plugin>               \r
                        <plugin>\r
@@ -251,34 +250,5 @@
                        <url>dav:${nexusproxy}${sitePath}</url>\r
                </site>\r
        </distributionManagement>\r
-       <pluginRepositories>\r
-        <pluginRepository>\r
-            <id>onap-plugin-snapshots</id>\r
-            <url>https://nexus.onap.org/content/repositories/snapshots/</url>\r
-        </pluginRepository>\r
-    </pluginRepositories>\r
-       \r
-       <repositories>\r
-               <repository>\r
-                       <id>central</id>\r
-                       <name>Maven 2 repository 2</name>\r
-                       <url>http://repo2.maven.org/maven2/</url>\r
-               </repository>\r
-               <repository>\r
-            <id>onap-jar-snapshots</id>\r
-            <url>https://nexus.onap.org/content/repositories/snapshots</url>\r
-        </repository>\r
-               <repository>\r
-                       <id>spring-repo</id>\r
-                       <name>Spring repo</name>\r
-                       <url>https://artifacts.alfresco.com/nexus/content/repositories/public/</url>\r
-               </repository>\r
-               <repository>\r
-                       <id>repository.jboss.org-public</id>\r
-                       <name>JBoss.org Maven repository</name>\r
-                       <url>https://repository.jboss.org/nexus/content/groups/public</url>\r
-               </repository>\r
-       </repositories>\r
-       \r
 \r
 </project>\r

diff --git a/xgen/pom.xml b/xgen/pom.xml
index 52a6d3e..7cf0380 100644 (file)
--- a/xgen/pom.xml
+++ b/xgen/pom.xml
@@ -65,7 +65,7 @@
                <snapshotNexusPath>/content/repositories/snapshots/</snapshotNexusPath>\r
                <releaseNexusPath>/content/repositories/releases/</releaseNexusPath>\r
                <stagingNexusPath>/content/repositories/staging/</stagingNexusPath>\r
-               <sitePath>/content/sites/site/${project.groupId}/${project.artifactId}/${project.version}</sitePath>\r
+               <sitePath>/content/sites/site/org/onap/aaf/inno/${project.artifactId}/${project.version}</sitePath>\r
 \r
        </properties>\r
        <dependencies>\r
@@ -103,7 +103,6 @@
                                        <nexusUrl>${nexusproxy}</nexusUrl>\r
                                        <stagingProfileId>176c31dfe190a</stagingProfileId>\r
                                        <serverId>ecomp-staging</serverId>\r
-                                       <skipNexusStagingDeployMojo>${skip.staging.artifacts}</skipNexusStagingDeployMojo>\r
                                </configuration>\r
                        </plugin>               \r
                        <plugin>\r
@@ -177,34 +176,5 @@
                        <url>dav:${nexusproxy}${sitePath}</url>\r
                </site>\r
        </distributionManagement>\r
-    <pluginRepositories>\r
-        <pluginRepository>\r
-            <id>onap-plugin-snapshots</id>\r
-            <url>https://nexus.onap.org/content/repositories/snapshots/</url>\r
-        </pluginRepository>\r
-    </pluginRepositories>\r
-       \r
-       <repositories>\r
-               <repository>\r
-                       <id>central</id>\r
-                       <name>Maven 2 repository 2</name>\r
-                       <url>http://repo2.maven.org/maven2/</url>\r
-               </repository>\r
-               <repository>\r
-            <id>onap-jar-snapshots</id>\r
-            <url>https://nexus.onap.org/content/repositories/snapshots</url>\r
-        </repository>\r
-               <repository>\r
-                       <id>spring-repo</id>\r
-                       <name>Spring repo</name>\r
-                       <url>https://artifacts.alfresco.com/nexus/content/repositories/public/</url>\r
-               </repository>\r
-               <repository>\r
-                       <id>repository.jboss.org-public</id>\r
-                       <name>JBoss.org Maven repository</name>\r
-                       <url>https://repository.jboss.org/nexus/content/groups/public</url>\r
-               </repository>\r
-       </repositories>\r
-       \r
        \r
 </project>\r