Author: schor
Date: Wed Dec 19 23:01:34 2018
New Revision: 1849346
URL: http://svn.apache.org/viewvc?rev=1849346&view=rev
Log:
[UIMA-5937] change to v 3.0.1. fix scm connection to the uv3/uima-as-v3/trunk.
change to v12 of parent. change to depend on 3.0.1 of uimaj sdk. update
versions of other dependencies per uima-as-v2, except for slf4j - make that the
same as uimaj v3 (it is later than the v2).

Modified:
uima/uv3/uima-as-v3/trunk/uima-as-parent/pom.xml
Modified: uima/uv3/uima-as-v3/trunk/uima-as-parent/pom.xml
URL:
http://svn.apache.org/viewvc/uima/uv3/uima-as-v3/trunk/uima-as-parent/pom.xml?rev=1849346&r1=1849345&r2=1849346&view=diff
==============================================================================
--- uima/uv3/uima-as-v3/trunk/uima-as-parent/pom.xml (original)
+++ uima/uv3/uima-as-v3/trunk/uima-as-parent/pom.xml Wed Dec 19 23:01:34 2018
@@ -1,14 +1,22 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- Licensed to the Apache Software Foundation (ASF) under one or more
contributor
- license agreements. See the NOTICE file distributed with this work for
additional
- information regarding copyright ownership. The ASF licenses this file to
- you under the Apache License, Version 2.0 (the "License"); you may not use
- this file except in compliance with the License. You may obtain a copy of
- the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required
- by applicable law or agreed to in writing, software distributed under the
- License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS
- OF ANY KIND, either express or implied. See the License for the specific
- language governing permissions and limitations under the License. -->
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
<!-- This pom serves as the the UIMA-AS common parent pom, and may include
overrides to the project-wide parent-pom. Over time, things in this pom
which
@@ -22,27 +30,27 @@
<parent>
<groupId>org.apache.uima</groupId>
<artifactId>parent-pom</artifactId>
- <version>9</version>
+ <version>12</version>
<relativePath />
</parent>
<!-- >groupId>org.apache.uima</groupId -->
<artifactId>uima-as-parent</artifactId>
<packaging>pom</packaging>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.0.1-SNAPSHOT</version>
<name>Apache UIMA-AS: ${project.artifactId}</name>
<description>The common parent pom for uima-as</description>
<url>${uimaWebsiteUrl}</url>
<scm>
<connection>
- scm:svn:http://svn.apache.org/repos/asf/uima/uima-as/trunk/uima-as-parent
+
scm:svn:http://svn.apache.org/repos/asf/uima/uv3/uima-as-v3/trunk/uima-as-parent
</connection>
<developerConnection>
-
scm:svn:https://svn.apache.org/repos/asf/uima/uima-as/trunk/uima-as-parent
+
scm:svn:https://svn.apache.org/repos/asf/uima/uv3/uima-as-v3/trunk/uima-as-parent
</developerConnection>
<url>
- http://svn.apache.org/viewvc/uima/uima-as/trunk/uima-as-parent
+ http://svn.apache.org/viewvc/uima/uv3/uima-as-v3/trunk/uima-as-parent
</url>
</scm>
@@ -122,14 +130,14 @@
<uimaScmRoot>uima-as</uimaScmRoot>
<uimaScmProject>${project.artifactId}</uimaScmProject>
<!-- level of uimaj sdk this release depends on -->
- <uimajDependencyVersion>3.0.0-alpha02</uimajDependencyVersion>
- <uimajDependencyVersionEp>3.0.0.alpha02</uimajDependencyVersionEp>
+ <uimajDependencyVersion>3.0.1</uimajDependencyVersion>
+ <uimajDependencyVersionEp>3.0.1</uimajDependencyVersionEp>
<!-- level of ActiveMQ this release depends on -->
- <org.apache.activemq.version>5.14.0</org.apache.activemq.version>
+
<org.apache.activemq.version>5.15.2</org.apache.activemq.version>
<!-- level of SpringFramework this release depends on -->
- <org.springframework.version>4.1.9.RELEASE</org.springframework.version>
+
<org.springframework.version>4.3.9.RELEASE</org.springframework.version>
- <org.apache.camel.version>2.15.3</org.apache.camel.version>
+ <org.apache.camel.version>2.19.3</org.apache.camel.version>
<org.apache.geronimo.jms.specs.version>1.1.1</org.apache.geronimo.jms.specs.version>
@@ -137,21 +145,21 @@
<org.apache.geronimo.servlet.specs.version>1.0</org.apache.geronimo.servlet.specs.version>
- <jetty.version>9.2.13.v20150730</jetty.version>
+ <jetty.version>9.2.22.v20170606</jetty.version>
<commons-pool.version>2.4.2</commons-pool.version>
- <xstream.version>1.4.8</xstream.version>
+ <xstream.version>1.4.10</xstream.version>
<log4j.version>1.2.17</log4j.version>
- <xmlbeans.version>2.4.0</xmlbeans.version>
+ <xmlbeans.version>3.0.0</xmlbeans.version>
- <slf4j.version>1.7.24</slf4j.version>
+ <slf4j.version>1.7.25</slf4j.version> <!-- match 3.0.1 SDK -->
<xpp3.version>1.1.4c</xpp3.version>
- <http.client.version>4.5.1</http.client.version>
+ <http.client.version>4.5.3</http.client.version>
<http.core.version>4.4.4</http.core.version>