You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by re...@apache.org on 2014/06/04 18:25:56 UTC
svn commit: r1600325 - in /uima/uimafit/branches/2.1.x: ./
src/main/dist-bin/ uimafit-core/ uimafit-cpe/ uimafit-docbook/
uimafit-examples/ uimafit-legacy-support/ uimafit-maven-plugin/
uimafit-parent/ uimafit-spring/
Author: rec
Date: Wed Jun 4 16:25:56 2014
New Revision: 1600325
URL: http://svn.apache.org/r1600325
Log:
[UIMA-3845] Prepare for release version 2.1.0
- Revert version to 2.1.0-SNAPSHOT
- Fix "Apache License" name in pom.xml files (was "The Apache Software License")
- Fix Apache copyright year range in NOTICE files
- Some formatting in README
- Added missing sections to NOTICE file for binary distribution, conflating redundant parts for UIMA artifacts and uimaFIT artifacts
- Removed redundant sections from NOTICE files in individual modules. These files contain only module-specific *extra* sections which are added to the auto-generated Apache UIMA uimaFIT section.
- Changed module names from "uimaFIT - XXX" to "Apache UIMA uimaFIT - XXX"
Modified:
uima/uimafit/branches/2.1.x/NOTICE
uima/uimafit/branches/2.1.x/README
uima/uimafit/branches/2.1.x/pom.xml
uima/uimafit/branches/2.1.x/src/main/dist-bin/NOTICE
uima/uimafit/branches/2.1.x/uimafit-core/NOTICE
uima/uimafit/branches/2.1.x/uimafit-core/pom.xml
uima/uimafit/branches/2.1.x/uimafit-cpe/pom.xml
uima/uimafit/branches/2.1.x/uimafit-docbook/pom.xml
uima/uimafit/branches/2.1.x/uimafit-examples/NOTICE
uima/uimafit/branches/2.1.x/uimafit-examples/pom.xml
uima/uimafit/branches/2.1.x/uimafit-legacy-support/pom.xml
uima/uimafit/branches/2.1.x/uimafit-maven-plugin/pom.xml
uima/uimafit/branches/2.1.x/uimafit-parent/pom.xml
uima/uimafit/branches/2.1.x/uimafit-spring/NOTICE
uima/uimafit/branches/2.1.x/uimafit-spring/pom.xml
Modified: uima/uimafit/branches/2.1.x/NOTICE
URL: http://svn.apache.org/viewvc/uima/uimafit/branches/2.1.x/NOTICE?rev=1600325&r1=1600324&r2=1600325&view=diff
==============================================================================
--- uima/uimafit/branches/2.1.x/NOTICE (original)
+++ uima/uimafit/branches/2.1.x/NOTICE Wed Jun 4 16:25:56 2014
@@ -1,5 +1,5 @@
Apache UIMA uimaFIT
-Copyright 2013 The Apache Software Foundation
+Copyright 2013-2014 The Apache Software Foundation
Copyright 2009-2012 Regents of the University of Colorado.
All rights reserved.
@@ -7,3 +7,14 @@ All rights reserved.
Copyright 2009-2012 Ubiquitous Knowledge Processing (UKP) Lab.
Technische Universität Darmstadt.
All rights reserved.
+
+
+AnnotationLiteral.java
+
+Licensed under the Apache License, Version 2.0.
+File was copied from the javax.enterprise cdi-api version 1.0.
+
+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
Modified: uima/uimafit/branches/2.1.x/README
URL: http://svn.apache.org/viewvc/uima/uimafit/branches/2.1.x/README?rev=1600325&r1=1600324&r2=1600325&view=diff
==============================================================================
--- uima/uimafit/branches/2.1.x/README (original)
+++ uima/uimafit/branches/2.1.x/README Wed Jun 4 16:25:56 2014
@@ -59,17 +59,17 @@ Availability
uimaFIT is licensed under the Apache License 2.0 and is available from the Apache UIMA project:
-http://uima.apache.org
-http://svn.apache.org/repos/asf/uima/uimafit
+ http://uima.apache.org
+ http://svn.apache.org/repos/asf/uima/uimafit
uimaFIT is available via Maven Central. If you use Maven for your build environment, then you can
add uimaFIT as a dependency to your pom.xml file with the following:
-<dependency>
- <groupId>org.apache.uima</groupId>
- <artifactId>uimafit-core</artifactId>
- <version>2.1.0</version>
-</dependency>
+ <dependency>
+ <groupId>org.apache.uima</groupId>
+ <artifactId>uimafit-core</artifactId>
+ <version>2.1.0</version>
+ </dependency>
Modules
Modified: uima/uimafit/branches/2.1.x/pom.xml
URL: http://svn.apache.org/viewvc/uima/uimafit/branches/2.1.x/pom.xml?rev=1600325&r1=1600324&r2=1600325&view=diff
==============================================================================
--- uima/uimafit/branches/2.1.x/pom.xml (original)
+++ uima/uimafit/branches/2.1.x/pom.xml Wed Jun 4 16:25:56 2014
@@ -21,14 +21,14 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>uimafit</artifactId>
<packaging>pom</packaging>
- <name>uimaFIT</name>
+ <name>Apache UIMA uimaFIT</name>
<description>Factories, Injection, and Testing library for UIMA</description>
<url>${uimaWebsiteUrl}</url>
<inceptionYear>2012</inceptionYear>
<parent>
<groupId>org.apache.uima</groupId>
<artifactId>uimafit-parent</artifactId>
- <version>2.1.1-SNAPSHOT</version>
+ <version>2.1.0-SNAPSHOT</version>
<relativePath>uimafit-parent</relativePath>
</parent>
<properties>
@@ -42,7 +42,7 @@
<licenses>
<license>
- <name>The Apache Software License, Version 2.0</name>
+ <name>Apache License, Version 2.0</name>
<url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
<distribution>repo</distribution>
</license>
@@ -51,17 +51,17 @@
<dependency>
<groupId>org.apache.uima</groupId>
<artifactId>uimafit-core</artifactId>
- <version>2.1.1-SNAPSHOT</version>
+ <version>2.1.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.uima</groupId>
<artifactId>uimafit-cpe</artifactId>
- <version>2.1.1-SNAPSHOT</version>
+ <version>2.1.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.uima</groupId>
<artifactId>uimafit-legacy-support</artifactId>
- <version>2.1.1-SNAPSHOT</version>
+ <version>2.1.0-SNAPSHOT</version>
</dependency>
</dependencies>
<build>
Modified: uima/uimafit/branches/2.1.x/src/main/dist-bin/NOTICE
URL: http://svn.apache.org/viewvc/uima/uimafit/branches/2.1.x/src/main/dist-bin/NOTICE?rev=1600325&r1=1600324&r2=1600325&view=diff
==============================================================================
--- uima/uimafit/branches/2.1.x/src/main/dist-bin/NOTICE (original)
+++ uima/uimafit/branches/2.1.x/src/main/dist-bin/NOTICE Wed Jun 4 16:25:56 2014
@@ -1,5 +1,5 @@
-Apache UIMA uimaFIT
-Copyright 2013 The Apache Software Foundation
+Apache UIMA uimaFIT - Core
+Copyright 2013-2014 The Apache Software Foundation
Copyright 2009-2012 Regents of the University of Colorado.
All rights reserved.
@@ -9,6 +9,54 @@ Technische Universität Darmstadt.
All rights reserved.
+Apache UIMA uimaFIT - Collection Processing Engine support
+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
+Apache UIMA Base: uimaj-adapter-vinci: Vinci Adapter
+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
+"Software Grant License Agreement", informally known as the
+"IBM UIMA License Agreement".
+Copyright (c) 2003, 2006 IBM Corporation.
+
+
+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.
Modified: uima/uimafit/branches/2.1.x/uimafit-core/NOTICE
URL: http://svn.apache.org/viewvc/uima/uimafit/branches/2.1.x/uimafit-core/NOTICE?rev=1600325&r1=1600324&r2=1600325&view=diff
==============================================================================
--- uima/uimafit/branches/2.1.x/uimafit-core/NOTICE (original)
+++ uima/uimafit/branches/2.1.x/uimafit-core/NOTICE Wed Jun 4 16:25:56 2014
@@ -1,6 +1,3 @@
-Apache UIMA uimaFIT
-Copyright 2013 The Apache Software Foundation
-
Copyright 2009-2012 Regents of the University of Colorado.
All rights reserved.
Modified: uima/uimafit/branches/2.1.x/uimafit-core/pom.xml
URL: http://svn.apache.org/viewvc/uima/uimafit/branches/2.1.x/uimafit-core/pom.xml?rev=1600325&r1=1600324&r2=1600325&view=diff
==============================================================================
--- uima/uimafit/branches/2.1.x/uimafit-core/pom.xml (original)
+++ uima/uimafit/branches/2.1.x/uimafit-core/pom.xml Wed Jun 4 16:25:56 2014
@@ -21,13 +21,13 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>uimafit-core</artifactId>
<packaging>jar</packaging>
- <name>uimaFIT - Core</name>
+ <name>Apache UIMA uimaFIT - Core</name>
<description>Factories, Injection, and Testing library for UIMA</description>
<url>${uimaWebsiteUrl}</url>
<parent>
<groupId>org.apache.uima</groupId>
<artifactId>uimafit-parent</artifactId>
- <version>2.1.1-SNAPSHOT</version>
+ <version>2.1.0-SNAPSHOT</version>
<relativePath>../uimafit-parent</relativePath>
</parent>
<dependencies>
@@ -91,7 +91,7 @@
</dependencies>
<licenses>
<license>
- <name>The Apache Software License, Version 2.0</name>
+ <name>Apache License, Version 2.0</name>
<url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
<distribution>repo</distribution>
</license>
Modified: uima/uimafit/branches/2.1.x/uimafit-cpe/pom.xml
URL: http://svn.apache.org/viewvc/uima/uimafit/branches/2.1.x/uimafit-cpe/pom.xml?rev=1600325&r1=1600324&r2=1600325&view=diff
==============================================================================
--- uima/uimafit/branches/2.1.x/uimafit-cpe/pom.xml (original)
+++ uima/uimafit/branches/2.1.x/uimafit-cpe/pom.xml Wed Jun 4 16:25:56 2014
@@ -22,16 +22,16 @@
<parent>
<groupId>org.apache.uima</groupId>
<artifactId>uimafit-parent</artifactId>
- <version>2.1.1-SNAPSHOT</version>
+ <version>2.1.0-SNAPSHOT</version>
<relativePath>../uimafit-parent</relativePath>
</parent>
<artifactId>uimafit-cpe</artifactId>
- <name>uimaFIT - Collection Processing Engine support</name>
+ <name>Apache UIMA uimaFIT - Collection Processing Engine support</name>
<dependencies>
<dependency>
<groupId>org.apache.uima</groupId>
<artifactId>uimafit-core</artifactId>
- <version>2.1.1-SNAPSHOT</version>
+ <version>2.1.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.uima</groupId>
Modified: uima/uimafit/branches/2.1.x/uimafit-docbook/pom.xml
URL: http://svn.apache.org/viewvc/uima/uimafit/branches/2.1.x/uimafit-docbook/pom.xml?rev=1600325&r1=1600324&r2=1600325&view=diff
==============================================================================
--- uima/uimafit/branches/2.1.x/uimafit-docbook/pom.xml (original)
+++ uima/uimafit/branches/2.1.x/uimafit-docbook/pom.xml Wed Jun 4 16:25:56 2014
@@ -22,11 +22,11 @@
<parent>
<groupId>org.apache.uima</groupId>
<artifactId>uimafit-parent</artifactId>
- <version>2.1.1-SNAPSHOT</version>
+ <version>2.1.0-SNAPSHOT</version>
<relativePath>../uimafit-parent</relativePath>
</parent>
<artifactId>uimafit-docbook</artifactId>
- <name>uimaFIT - Documentation</name>
+ <name>Apache UIMA uimaFIT - Documentation</name>
<packaging>pom</packaging>
<properties>
<uimaScmProject>${project.artifactId}</uimaScmProject>
Modified: uima/uimafit/branches/2.1.x/uimafit-examples/NOTICE
URL: http://svn.apache.org/viewvc/uima/uimafit/branches/2.1.x/uimafit-examples/NOTICE?rev=1600325&r1=1600324&r2=1600325&view=diff
==============================================================================
--- uima/uimafit/branches/2.1.x/uimafit-examples/NOTICE (original)
+++ uima/uimafit/branches/2.1.x/uimafit-examples/NOTICE Wed Jun 4 16:25:56 2014
@@ -1,6 +1,3 @@
-Apache UIMA uimaFIT
-Copyright 2013 The Apache Software Foundation
-
Copyright 2009-2012 Regents of the University of Colorado.
All rights reserved.
Modified: uima/uimafit/branches/2.1.x/uimafit-examples/pom.xml
URL: http://svn.apache.org/viewvc/uima/uimafit/branches/2.1.x/uimafit-examples/pom.xml?rev=1600325&r1=1600324&r2=1600325&view=diff
==============================================================================
--- uima/uimafit/branches/2.1.x/uimafit-examples/pom.xml (original)
+++ uima/uimafit/branches/2.1.x/uimafit-examples/pom.xml Wed Jun 4 16:25:56 2014
@@ -21,19 +21,19 @@
<parent>
<groupId>org.apache.uima</groupId>
<artifactId>uimafit-parent</artifactId>
- <version>2.1.1-SNAPSHOT</version>
+ <version>2.1.0-SNAPSHOT</version>
<relativePath>../uimafit-parent</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>uimafit-examples</artifactId>
- <name>uimaFIT - Examples</name>
+ <name>Apache UIMA uimaFIT - Examples</name>
<description>Factories, Injection, and Testing library for UIMA</description>
<url>${uimaWebsiteUrl}</url>
<dependencies>
<dependency>
<groupId>org.apache.uima</groupId>
<artifactId>uimafit-core</artifactId>
- <version>2.1.1-SNAPSHOT</version>
+ <version>2.1.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.uima</groupId>
@@ -51,7 +51,7 @@
</dependencies>
<licenses>
<license>
- <name>The Apache Software License, Version 2.0</name>
+ <name>Apache License, Version 2.0</name>
<url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
<distribution>repo</distribution>
</license>
Modified: uima/uimafit/branches/2.1.x/uimafit-legacy-support/pom.xml
URL: http://svn.apache.org/viewvc/uima/uimafit/branches/2.1.x/uimafit-legacy-support/pom.xml?rev=1600325&r1=1600324&r2=1600325&view=diff
==============================================================================
--- uima/uimafit/branches/2.1.x/uimafit-legacy-support/pom.xml (original)
+++ uima/uimafit/branches/2.1.x/uimafit-legacy-support/pom.xml Wed Jun 4 16:25:56 2014
@@ -22,16 +22,16 @@
<parent>
<groupId>org.apache.uima</groupId>
<artifactId>uimafit-parent</artifactId>
- <version>2.1.1-SNAPSHOT</version>
+ <version>2.1.0-SNAPSHOT</version>
<relativePath>../uimafit-parent</relativePath>
</parent>
<artifactId>uimafit-legacy-support</artifactId>
- <name>uimaFIT - Legacy uimaFIT support</name>
+ <name>Apache UIMA uimaFIT - Legacy uimaFIT support</name>
<description>Adds support for uimaFIT 1.x annotations.</description>
<url>${uimaWebsiteUrl}</url>
<licenses>
<license>
- <name>The Apache Software License, Version 2.0</name>
+ <name>Apache License, Version 2.0</name>
<url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
<distribution>repo</distribution>
</license>
@@ -53,7 +53,7 @@
<dependency>
<groupId>org.apache.uima</groupId>
<artifactId>uimafit-core</artifactId>
- <version>2.1.1-SNAPSHOT</version>
+ <version>2.1.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
Modified: uima/uimafit/branches/2.1.x/uimafit-maven-plugin/pom.xml
URL: http://svn.apache.org/viewvc/uima/uimafit/branches/2.1.x/uimafit-maven-plugin/pom.xml?rev=1600325&r1=1600324&r2=1600325&view=diff
==============================================================================
--- uima/uimafit/branches/2.1.x/uimafit-maven-plugin/pom.xml (original)
+++ uima/uimafit/branches/2.1.x/uimafit-maven-plugin/pom.xml Wed Jun 4 16:25:56 2014
@@ -22,15 +22,15 @@
<parent>
<groupId>org.apache.uima</groupId>
<artifactId>uimafit-parent</artifactId>
- <version>2.1.1-SNAPSHOT</version>
+ <version>2.1.0-SNAPSHOT</version>
<relativePath>../uimafit-parent</relativePath>
</parent>
<artifactId>uimafit-maven-plugin</artifactId>
- <name>uimaFIT - Maven Plugin</name>
+ <name>Apache UIMA uimaFIT - Maven Plugin</name>
<packaging>maven-plugin</packaging>
<licenses>
<license>
- <name>The Apache Software License, Version 2.0</name>
+ <name>Apache License, Version 2.0</name>
<url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
<distribution>repo</distribution>
</license>
@@ -56,7 +56,7 @@
<dependency>
<groupId>org.apache.uima</groupId>
<artifactId>uimafit-core</artifactId>
- <version>2.1.1-SNAPSHOT</version>
+ <version>2.1.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.javassist</groupId>
Modified: uima/uimafit/branches/2.1.x/uimafit-parent/pom.xml
URL: http://svn.apache.org/viewvc/uima/uimafit/branches/2.1.x/uimafit-parent/pom.xml?rev=1600325&r1=1600324&r2=1600325&view=diff
==============================================================================
--- uima/uimafit/branches/2.1.x/uimafit-parent/pom.xml (original)
+++ uima/uimafit/branches/2.1.x/uimafit-parent/pom.xml Wed Jun 4 16:25:56 2014
@@ -7,9 +7,9 @@
<version>9</version>
</parent>
<artifactId>uimafit-parent</artifactId>
- <version>2.1.1-SNAPSHOT</version>
+ <version>2.1.0-SNAPSHOT</version>
<packaging>pom</packaging>
- <name>uimaFIT - Parent</name>
+ <name>Apache UIMA uimaFIT - Parent</name>
<url>${uimaWebsiteUrl}</url>
<inceptionYear>2012</inceptionYear>
<properties>
@@ -132,7 +132,7 @@
</dependencyManagement>
<licenses>
<license>
- <name>The Apache Software License, Version 2.0</name>
+ <name>Apache License, Version 2.0</name>
<url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
<distribution>repo</distribution>
</license>
Modified: uima/uimafit/branches/2.1.x/uimafit-spring/NOTICE
URL: http://svn.apache.org/viewvc/uima/uimafit/branches/2.1.x/uimafit-spring/NOTICE?rev=1600325&r1=1600324&r2=1600325&view=diff
==============================================================================
--- uima/uimafit/branches/2.1.x/uimafit-spring/NOTICE (original)
+++ uima/uimafit/branches/2.1.x/uimafit-spring/NOTICE Wed Jun 4 16:25:56 2014
@@ -1,6 +1,3 @@
-Apache UIMA uimaFIT
-Copyright 2013 The Apache Software Foundation
-
Copyright 2009-2012 Regents of the University of Colorado.
All rights reserved.
Modified: uima/uimafit/branches/2.1.x/uimafit-spring/pom.xml
URL: http://svn.apache.org/viewvc/uima/uimafit/branches/2.1.x/uimafit-spring/pom.xml?rev=1600325&r1=1600324&r2=1600325&view=diff
==============================================================================
--- uima/uimafit/branches/2.1.x/uimafit-spring/pom.xml (original)
+++ uima/uimafit/branches/2.1.x/uimafit-spring/pom.xml Wed Jun 4 16:25:56 2014
@@ -21,13 +21,13 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>uimafit-spring</artifactId>
<packaging>jar</packaging>
- <name>uimaFIT - Spring integration</name>
+ <name>Apache UIMA uimaFIT - Spring integration</name>
<description>Factories, Injection, and Testing library for UIMA</description>
<url>${uimaWebsiteUrl}</url>
<parent>
<groupId>org.apache.uima</groupId>
<artifactId>uimafit-parent</artifactId>
- <version>2.1.1-SNAPSHOT</version>
+ <version>2.1.0-SNAPSHOT</version>
<relativePath>../uimafit-parent</relativePath>
</parent>
<dependencies>
@@ -46,12 +46,12 @@
<dependency>
<groupId>org.apache.uima</groupId>
<artifactId>uimafit-core</artifactId>
- <version>2.1.1-SNAPSHOT</version>
+ <version>2.1.0-SNAPSHOT</version>
</dependency>
</dependencies>
<licenses>
<license>
- <name>The Apache Software License, Version 2.0</name>
+ <name>Apache License, Version 2.0</name>
<url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
<distribution>repo</distribution>
</license>