You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by cw...@apache.org on 2014/06/05 20:43:35 UTC
svn commit: r1600723 - in /uima/uima-as/trunk: NOTICE src/main/readme/NOTICE
uima-as-parent/pom.xml uimaj-as-activemq/pom.xml uimaj-as-core/pom.xml
uimaj-as-jms/pom.xml
Author: cwiklik
Date: Thu Jun 5 18:43:35 2014
New Revision: 1600723
URL: http://svn.apache.org/r1600723
Log:
UIMA-3548 defined new property in uima as parent pom postNoticeText. This was defined in each of the subproject pom. It was also incorrect as it did not include mention of UIMA.
Modified:
uima/uima-as/trunk/NOTICE
uima/uima-as/trunk/src/main/readme/NOTICE
uima/uima-as/trunk/uima-as-parent/pom.xml
uima/uima-as/trunk/uimaj-as-activemq/pom.xml
uima/uima-as/trunk/uimaj-as-core/pom.xml
uima/uima-as/trunk/uimaj-as-jms/pom.xml
Modified: uima/uima-as/trunk/NOTICE
URL: http://svn.apache.org/viewvc/uima/uima-as/trunk/NOTICE?rev=1600723&r1=1600722&r2=1600723&view=diff
==============================================================================
--- uima/uima-as/trunk/NOTICE (original)
+++ uima/uima-as/trunk/NOTICE Thu Jun 5 18:43:35 2014
@@ -11,6 +11,13 @@ licensed to the Apache Software Foundati
"IBM UIMA-EE License Agreement".
Copyright (c) 2007, 2008 IBM Corporation
+Portions of Apache UIMA were originally developed by
+International Business Machines Corporation and are
+licensed to the Apache Software Foundation under the
+"Software Grant License Agreement", informally known as the
+"IBM UIMA License Agreement".
+Copyright (c) 2003, 2006 IBM Corporation.
+
This product includes software, Apache ActiveMQ, developed
at the Apache Software Foundation (http://www.apache.org/).
Modified: uima/uima-as/trunk/src/main/readme/NOTICE
URL: http://svn.apache.org/viewvc/uima/uima-as/trunk/src/main/readme/NOTICE?rev=1600723&r1=1600722&r2=1600723&view=diff
==============================================================================
--- uima/uima-as/trunk/src/main/readme/NOTICE (original)
+++ uima/uima-as/trunk/src/main/readme/NOTICE Thu Jun 5 18:43:35 2014
@@ -11,6 +11,13 @@ licensed to the Apache Software Foundati
"IBM UIMA-EE License Agreement".
Copyright (c) 2007, 2008 IBM Corporation
+Portions of Apache UIMA were originally developed by
+International Business Machines Corporation and are
+licensed to the Apache Software Foundation under the
+"Software Grant License Agreement", informally known as the
+"IBM UIMA License Agreement".
+Copyright (c) 2003, 2006 IBM Corporation.
+
------------------- www.ibatis.com Notice -------
This product also includes software developed by
Clinton Begin (http://www.ibatis.com).
Modified: uima/uima-as/trunk/uima-as-parent/pom.xml
URL: http://svn.apache.org/viewvc/uima/uima-as/trunk/uima-as-parent/pom.xml?rev=1600723&r1=1600722&r2=1600723&view=diff
==============================================================================
--- uima/uima-as/trunk/uima-as-parent/pom.xml (original)
+++ uima/uima-as/trunk/uima-as-parent/pom.xml Thu Jun 5 18:43:35 2014
@@ -151,6 +151,26 @@
<http.commons.core.version>4.2.1</http.commons.core.version>
+
+
+ <!-- Needed for NOTICE file packaged in each jar under META-INF -->
+ <uimaASNoticeText>
+Portions of UIMA-AS were originally developed by
+International Business Machines Corporation and are
+licensed to the Apache Software Foundation under the
+"Software Grant License Agreement", informally known as the
+"IBM UIMA-EE License Agreement".
+Copyright (c) 2007, 2008 IBM Corporation
+ </uimaASNoticeText>
+
+ <!-- Needed for NOTICE file packaged in each jar under META-INF -->
+ <postNoticeText>
+${ibmNoticeText}
+
+${uimaASNoticeText}
+
+ </postNoticeText>
+
</properties>
Modified: uima/uima-as/trunk/uimaj-as-activemq/pom.xml
URL: http://svn.apache.org/viewvc/uima/uima-as/trunk/uimaj-as-activemq/pom.xml?rev=1600723&r1=1600722&r2=1600723&view=diff
==============================================================================
--- uima/uima-as/trunk/uimaj-as-activemq/pom.xml (original)
+++ uima/uima-as/trunk/uimaj-as-activemq/pom.xml Thu Jun 5 18:43:35 2014
@@ -44,7 +44,6 @@
<properties>
<uimaScmProject>${project.artifactId}</uimaScmProject>
- <postNoticeText>${ibmNoticeText}</postNoticeText>
</properties>
<dependencies>
Modified: uima/uima-as/trunk/uimaj-as-core/pom.xml
URL: http://svn.apache.org/viewvc/uima/uima-as/trunk/uimaj-as-core/pom.xml?rev=1600723&r1=1600722&r2=1600723&view=diff
==============================================================================
--- uima/uima-as/trunk/uimaj-as-core/pom.xml (original)
+++ uima/uima-as/trunk/uimaj-as-core/pom.xml Thu Jun 5 18:43:35 2014
@@ -44,7 +44,6 @@
<properties>
<uimaScmProject>${project.artifactId}</uimaScmProject>
- <postNoticeText>${ibmNoticeText}</postNoticeText>
</properties>
Modified: uima/uima-as/trunk/uimaj-as-jms/pom.xml
URL: http://svn.apache.org/viewvc/uima/uima-as/trunk/uimaj-as-jms/pom.xml?rev=1600723&r1=1600722&r2=1600723&view=diff
==============================================================================
--- uima/uima-as/trunk/uimaj-as-jms/pom.xml (original)
+++ uima/uima-as/trunk/uimaj-as-jms/pom.xml Thu Jun 5 18:43:35 2014
@@ -43,7 +43,6 @@
<properties>
<uimaScmProject>${project.artifactId}</uimaScmProject>
- <postNoticeText>${ibmNoticeText}</postNoticeText>
</properties>
<dependencies>