You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by sc...@apache.org on 2009/09/24 05:19:11 UTC
svn commit: r818353 - in /incubator/uima/sandbox/trunk:
ConfigurableFeatureExtractor/NoticeFileResearchLog.txt
ConfigurableFeatureExtractor/pom.xml RegularExpressionAnnotator/pom.xml
SimpleServer/pom.xml
Author: schor
Date: Thu Sep 24 03:19:05 2009
New Revision: 818353
URL: http://svn.apache.org/viewvc?rev=818353&view=rev
Log:
UIMA-1587 replace stax with geronimo version due to license questions
Modified:
incubator/uima/sandbox/trunk/ConfigurableFeatureExtractor/NoticeFileResearchLog.txt
incubator/uima/sandbox/trunk/ConfigurableFeatureExtractor/pom.xml
incubator/uima/sandbox/trunk/RegularExpressionAnnotator/pom.xml
incubator/uima/sandbox/trunk/SimpleServer/pom.xml
Modified: incubator/uima/sandbox/trunk/ConfigurableFeatureExtractor/NoticeFileResearchLog.txt
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/ConfigurableFeatureExtractor/NoticeFileResearchLog.txt?rev=818353&r1=818352&r2=818353&view=diff
==============================================================================
--- incubator/uima/sandbox/trunk/ConfigurableFeatureExtractor/NoticeFileResearchLog.txt (original)
+++ incubator/uima/sandbox/trunk/ConfigurableFeatureExtractor/NoticeFileResearchLog.txt Thu Sep 24 03:19:05 2009
@@ -91,8 +91,14 @@
Notice File has several notices in it, but nothing that states the notices
need to be copied to a project which includes it.
License: Apache v2
- xmlbeans depends on stax:stax-api, but this dependency is "excluded", and
- stax-api jar is not distributed with this project. The API is now part of Java.
+ xmlbeans depends on stax:stax-api
+
+
+ stax:stax-api dependency replaced with
+ org.apache.geronimo.specs:geronimo-stax-api_1.0_spec
+ version 1.0.1
+ see https://issues.apache.org/jira/browse/LEGAL-42
+
Modified: incubator/uima/sandbox/trunk/ConfigurableFeatureExtractor/pom.xml
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/ConfigurableFeatureExtractor/pom.xml?rev=818353&r1=818352&r2=818353&view=diff
==============================================================================
--- incubator/uima/sandbox/trunk/ConfigurableFeatureExtractor/pom.xml (original)
+++ incubator/uima/sandbox/trunk/ConfigurableFeatureExtractor/pom.xml Thu Sep 24 03:19:05 2009
@@ -48,6 +48,17 @@
<groupId>org.apache.xmlbeans</groupId>
<artifactId>xmlbeans</artifactId>
<version>2.4.0</version>
+ <exclusions>
+ <exclusion> <!-- licensing issues, use geronimo instead -->
+ <groupId>stax</groupId>
+ <artifactId>stax-api</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-stax-api_1.0_spec</artifactId>
+ <version>1.0.1</version>
</dependency>
<dependency>
<groupId>org.eclipse.emf.ecore</groupId>
@@ -64,11 +75,11 @@
<artifactId>ecore</artifactId>
<version>2.3.0-v200706262000</version>
</dependency>
- <dependency>
+ <!--dependency>
<groupId>stax</groupId>
<artifactId>stax-api</artifactId>
<version>1.0.1</version>
- </dependency>
+ </dependency-->
</dependencies>
<build>
Modified: incubator/uima/sandbox/trunk/RegularExpressionAnnotator/pom.xml
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/RegularExpressionAnnotator/pom.xml?rev=818353&r1=818352&r2=818353&view=diff
==============================================================================
--- incubator/uima/sandbox/trunk/RegularExpressionAnnotator/pom.xml (original)
+++ incubator/uima/sandbox/trunk/RegularExpressionAnnotator/pom.xml Thu Sep 24 03:19:05 2009
@@ -53,11 +53,24 @@
<scope>system</scope>
<systemPath>${basedir}/lib/regex_annot_xml_types.jar</systemPath>
</dependency>
+
<dependency>
<groupId>org.apache.xmlbeans</groupId>
<artifactId>xmlbeans</artifactId>
<version>2.4.0</version>
+ <exclusions>
+ <exclusion> <!-- licensing issues, use geronimo instead -->
+ <groupId>stax</groupId>
+ <artifactId>stax-api</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-stax-api_1.0_spec</artifactId>
+ <version>1.0.1</version>
</dependency>
+
<!--dependency>
<groupId>local.xmlbeans.dependency</groupId>
<artifactId>xsdbeans</artifactId>
Modified: incubator/uima/sandbox/trunk/SimpleServer/pom.xml
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/SimpleServer/pom.xml?rev=818353&r1=818352&r2=818353&view=diff
==============================================================================
--- incubator/uima/sandbox/trunk/SimpleServer/pom.xml (original)
+++ incubator/uima/sandbox/trunk/SimpleServer/pom.xml Thu Sep 24 03:19:05 2009
@@ -61,7 +61,19 @@
<groupId>org.apache.xmlbeans</groupId>
<artifactId>xmlbeans</artifactId>
<version>2.4.0</version>
+ <exclusions>
+ <exclusion> <!-- licensing issues, use geronimo instead -->
+ <groupId>stax</groupId>
+ <artifactId>stax-api</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-stax-api_1.0_spec</artifactId>
+ <version>1.0.1</version>
+ </dependency>
+
<!--dependency>
<groupId>javax.xml.bind</groupId>
<artifactId>jsr173_api</artifactId>