Merge "Check in vhnf modified bandwith code"

diff --git a/aai-core/pom.xml b/aai-core/pom.xml
index 4d6fad6..10eef87 100644 (file)
--- a/aai-core/pom.xml
+++ b/aai-core/pom.xml
@@ -326,11 +326,6 @@
             <artifactId>xml-apis</artifactId>
             <version>1.0.b2</version>
         </dependency>
-        <dependency>
-            <groupId>commons-lang</groupId>
-            <artifactId>commons-lang</artifactId>
-            <version>2.6</version>
-        </dependency>
         <dependency>
             <groupId>commons-cli</groupId>
             <artifactId>commons-cli</artifactId>
@@ -423,11 +418,6 @@
             <artifactId>freemarker</artifactId>
             <version>2.3.14</version>
         </dependency>
-        <dependency>
-            <groupId>com.bazaarvoice.jolt</groupId>
-            <artifactId>jolt-complete</artifactId>
-            <version>0.0.24</version>
-        </dependency>
         <dependency>
             <groupId>com.github.fge</groupId>
             <artifactId>json-patch</artifactId>
@@ -482,10 +472,6 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-site-plugin</artifactId>
             </plugin>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>license-maven-plugin</artifactId>
-            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>

diff --git a/aai-schema/pom.xml b/aai-schema/pom.xml
index 786b580..0258270 100644 (file)
--- a/aai-schema/pom.xml
+++ b/aai-schema/pom.xml
@@ -22,10 +22,6 @@
     </dependencies>
     <build>
         <plugins>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>license-maven-plugin</artifactId>
-            </plugin>
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>jaxb2-maven-plugin</artifactId>

diff --git a/pom.xml b/pom.xml
index 5636144..24c4ffc 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -38,55 +38,6 @@
                         <target>1.8</target>
                     </configuration>
                 </plugin>
-                <plugin>
-                    <groupId>org.codehaus.mojo</groupId>
-                    <artifactId>license-maven-plugin</artifactId>
-                    <version>1.12</version>
-                    <configuration>
-                        <addJavaLicenseAfterPackage>false</addJavaLicenseAfterPackage>
-                        <licenseName>apache_v2</licenseName>
-                        <inceptionYear>2017</inceptionYear>
-                        <organizationName>AT&amp;T Intellectual Property. All rights reserved.</organizationName>
-                        <projectName>org.openecomp.aai</projectName>
-                        <canUpdateCopyright>true</canUpdateCopyright>
-                        <canUpdateDescription>true</canUpdateDescription>
-                        <canUpdateLicense>true</canUpdateLicense>
-                        <emptyLineAfterHeader>true</emptyLineAfterHeader>
-                        <processStartTag>
-                            ============LICENSE_START=======================================================
-                        </processStartTag>
-                        <processEndTag>
-                            ============LICENSE_END=========================================================
-                        </processEndTag>
-                        <sectionDelimiter>
-                            ================================================================================
-                        </sectionDelimiter>
-                        <includes>
-                            <include>**/*.java</include>
-                            <include>**/*.ksh</include>
-                            <include>**/*.sh</include>
-                            <include>**/*.ftl</include>
-                            <include>**/*.xsd</include>
-                            <include>**/*.xjb</include>
-                            <include>**/aai*.xml</include>
-                            <include>**/*logback*.xml</include>
-                            <include>**/*aaiconfig*.properties</include>
-                            <include>**/*titan*.properties</include>
-                        </includes>
-                        <excludes>
-                            <exclude>ecomp-auth/*</exclude>
-                        </excludes>
-                    </configuration>
-                    <executions>
-                        <execution>
-                            <id>first</id>
-                            <goals>
-                                <goal>update-file-header</goal>
-                            </goals>
-                            <phase>process-sources</phase>
-                        </execution>
-                    </executions>
-                </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-deploy-plugin</artifactId>