aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIdan Amit <ia096e@intl.att.com>2017-11-07 18:07:30 +0200
committerIdan Amit <ia096e@intl.att.com>2017-11-07 18:07:30 +0200
commit3c2636c53deea68359a8deb028bef3ef1e31502f (patch)
treecec2c9cd85eec81793d0e49a2f7b7e018d11ac49
parent2f95647e5ef79a4552592f64eb98986cd1c53d1b (diff)
Remove MojoHaus license plugin
Removed MojoHaus license-maven-plugin from sdc-distribution-client pom.xml Fixed LICENSE.TXT file to match the other projects LICENSE.TXT files Change-Id: I8a2cdada4937204e87f349852b4d023ad0df293a Issue-Id: SDC-161 Signed-off-by: Idan Amit <ia096e@intl.att.com>
-rw-r--r--LICENSE.TXT6
-rw-r--r--pom.xml34
2 files changed, 3 insertions, 37 deletions
diff --git a/LICENSE.TXT b/LICENSE.TXT
index 3d6f0e2..e425d6c 100644
--- a/LICENSE.TXT
+++ b/LICENSE.TXT
@@ -1,4 +1,4 @@
-/*
+/*
* ============LICENSE_START==========================================
* ===================================================================
* Copyright © 2017 AT&T Intellectual Property.
@@ -16,8 +16,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
* ============LICENSE_END============================================
-*
-* ECOMP and OpenECOMP are trademarks
-* and service marks of AT&T Intellectual Property.
+* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*
*/ \ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 3b0c875..abfad51 100644
--- a/pom.xml
+++ b/pom.xml
@@ -137,39 +137,7 @@
<artifactId>maven-javadoc-plugin</artifactId>
<version>2.10.3</version>
<configuration/>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>license-maven-plugin</artifactId>
- <version>1.10</version>
- <configuration>
- <addJavaLicenseAfterPackage>false</addJavaLicenseAfterPackage>
- <processStartTag>============LICENSE_START=======================================================</processStartTag>
- <processEndTag>============LICENSE_END=========================================================</processEndTag>
- <sectionDelimiter>================================================================================</sectionDelimiter>
- <licenseName>apache_v2</licenseName>
- <inceptionYear>2017</inceptionYear>
- <organizationName>AT&amp;T Intellectual Property. All rights reserved.</organizationName>
- <projectName>sdc-distribution-client</projectName>
- <canUpdateCopyright>true</canUpdateCopyright>
- <canUpdateDescription>true</canUpdateDescription>
- <canUpdateLicense>true</canUpdateLicense>
- <emptyLineAfterHeader>true</emptyLineAfterHeader>
- <verbose>false</verbose>
- <includes>
- <include>**/*.java</include>
- </includes>
- </configuration>
- <executions>
- <execution>
- <id>first</id>
- <goals>
- <goal>update-file-header</goal>
- </goals>
- <!--phase>process-sources</phase -->
- </execution>
- </executions>
- </plugin>
+ </plugin>
<plugin>
<groupId>org.sonarsource.scanner.maven</groupId>
<artifactId>sonar-maven-plugin</artifactId>