[maven-release-plugin] copy for tag uimafit-2.1.0
git-svn-id: https://svn.apache.org/repos/asf/uima/uimafit/tags/uimafit-2.1.0@1601251 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/NOTICE b/NOTICE
index b27c28e..63b1ef8 100644
--- a/NOTICE
+++ b/NOTICE
@@ -16,5 +16,4 @@
JBoss, Home of Professional Open Source
Copyright 2008, Red Hat Middleware LLC, and individual contributors
-by the @authors tag. See the copyright.txt in the distribution for a
-full listing of individual contributors.
\ No newline at end of file
+by the @authors tag.
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 306a2e4..2a5b563 100644
--- a/pom.xml
+++ b/pom.xml
@@ -132,6 +132,9 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-changes-plugin</artifactId>
+ <!-- See UIMA-3764 -->
+ <!-- Can be removed after upgrading to uima-parent-pom 10+ -->
+ <version>2.10</version>
<inherited>false</inherited>
<executions>
<execution>
diff --git a/src/main/dist-bin/NOTICE b/src/main/dist-bin/NOTICE
index 0f24fa6..d9acfce 100644
--- a/src/main/dist-bin/NOTICE
+++ b/src/main/dist-bin/NOTICE
@@ -1,3 +1,10 @@
+Apache UIMA uimaFIT
+Copyright 2012-2014 The Apache Software Foundation
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
+
+
Apache UIMA uimaFIT - Core
Copyright 2013-2014 The Apache Software Foundation
@@ -13,9 +20,6 @@
Apache UIMA uimaFIT - Legacy uimaFIT support
Copyright 2012-2014 The Apache Software Foundation
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
-
Apache UIMA Base: uimaj-core
Apache UIMA Base: jVinci: Vinci Transport Library
@@ -23,9 +27,6 @@
Apache UIMA Base: uimaj-cpe: Collection Processing Engine
Copyright 2006-2014 The Apache Software Foundation
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
-
Portions of Apache UIMA were originally developed by
International Business Machines Corporation and are
licensed to the Apache Software Foundation under the
@@ -37,36 +38,18 @@
Apache Commons IO
Copyright 2002-2012 The Apache Software Foundation
-This product includes software developed by
-The Apache Software Foundation (http://www.apache.org/).
-
Apache Commons Lang
Copyright 2001-2011 The Apache Software Foundation
-This product includes software developed by
-The Apache Software Foundation (http://www.apache.org/).
-
Commons Logging
Copyright 2001-2007 The Apache Software Foundation
-
-This product includes/uses software(s) developed by 'an unknown organization'
- - Unnamed - avalon-framework:avalon-framework:jar:4.1.3
- - Unnamed - log4j:log4j:jar:1.2.12
- - Unnamed - logkit:logkit:jar:1.0.1
Spring Framework 3.1
Copyright (c) 2002-2011 SpringSource, a division of VMware, Inc.
-This product is licensed to you under the Apache License, Version 2.0 (the "License").
-You may not use this product except in compliance with the License.
-
-This product may include a number of subcomponents with separate copyright notices and
-license terms. Your use of the source code for the these subcomponents is subject to
-the terms and conditions of the subcomponent's license, as noted in the LICENSE file.
-
AnnotationLiteral.java
@@ -75,5 +58,4 @@
JBoss, Home of Professional Open Source
Copyright 2008, Red Hat Middleware LLC, and individual contributors
-by the @authors tag. See the copyright.txt in the distribution for a
-full listing of individual contributors.
\ No newline at end of file
+by the @authors tag.
\ No newline at end of file
diff --git a/uimafit-legacy-support/NOTICE b/uimafit-legacy-support/NOTICE
index 7b1d5f4..6fb06d7 100644
--- a/uimafit-legacy-support/NOTICE
+++ b/uimafit-legacy-support/NOTICE
@@ -5,5 +5,4 @@
JBoss, Home of Professional Open Source
Copyright 2008, Red Hat Middleware LLC, and individual contributors
-by the @authors tag. See the copyright.txt in the distribution for a
-full listing of individual contributors.
\ No newline at end of file
+by the @authors tag.
\ No newline at end of file
diff --git a/uimafit-maven-plugin/pom.xml b/uimafit-maven-plugin/pom.xml
index 9d79937..5f11010 100644
--- a/uimafit-maven-plugin/pom.xml
+++ b/uimafit-maven-plugin/pom.xml
@@ -124,14 +124,10 @@
<artifactId>maven-plugin-plugin</artifactId>
<!-- Version 3.3 required for Java 8 builds, see also
http://jira.codehaus.org/browse/MPLUGIN-244 -->
+ <!-- This can be removed when upgrading to Apache parent pom 10+ -->
<version>3.3</version>
<executions>
<execution>
- <!-- See http://jira.codehaus.org/browse/MPLUGIN-267 -->
- <id>default-descriptor</id>
- <phase>process-classes</phase>
- </execution>
- <execution>
<id>generated-helpmojo</id>
<goals>
<goal>helpmojo</goal>
