Author: schor
Date: Thu Dec 20 14:47:54 2018
New Revision: 1849400
URL: http://svn.apache.org/viewvc?rev=1849400&view=rev
Log:
[UIMA-5937] update pom version and scm, record merge
Modified:
uima/uv3/uima-as-v3/trunk/uimaj-as-camel/ (props changed)
uima/uv3/uima-as-v3/trunk/uimaj-as-camel/pom.xml
Propchange: uima/uv3/uima-as-v3/trunk/uimaj-as-camel/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Dec 20 14:47:54 2018
@@ -1,2 +1,3 @@
/uima/uima-as/branches/depend-on-parent-pom-4/uimaj-as-camel:961335-961760
/uima/uima-as/branches/mavenAlign/uimaj-as-camel:941450-944450
+/uima/uima-as/trunk/uimaj-as-camel:1786000-1846917
Modified: uima/uv3/uima-as-v3/trunk/uimaj-as-camel/pom.xml
URL:
http://svn.apache.org/viewvc/uima/uv3/uima-as-v3/trunk/uimaj-as-camel/pom.xml?rev=1849400&r1=1849399&r2=1849400&view=diff
==============================================================================
--- uima/uv3/uima-as-v3/trunk/uimaj-as-camel/pom.xml (original)
+++ uima/uv3/uima-as-v3/trunk/uimaj-as-camel/pom.xml Thu Dec 20 14:47:54 2018
@@ -15,7 +15,7 @@
<parent>
<groupId>org.apache.uima</groupId>
<artifactId>uima-as-parent</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.0.1-SNAPSHOT</version>
<relativePath>../uima-as-parent/pom.xml</relativePath>
</parent>
@@ -32,13 +32,13 @@
cutting/pasting the <scm> element, and just changing the
following two properties -->
<scm>
<connection>
- scm:svn:http://svn.apache.org/repos/asf/uima/uima-as/trunk/uimaj-as-camel
+
scm:svn:http://svn.apache.org/repos/asf/uima/uv3/uima-as-v3/trunk/uimaj-as-camel
</connection>
<developerConnection>
-
scm:svn:https://svn.apache.org/repos/asf/uima/uima-as/trunk/uimaj-as-camel
+
scm:svn:https://svn.apache.org/repos/asf/uima/uv3/uima-as-v3/trunk/uimaj-as-camel
</developerConnection>
<url>
- http://svn.apache.org/viewvc/uima/uima-as/trunk/uimaj-as-camel
+ http://svn.apache.org/viewvc/uima/uv3/uima-as-v3/trunk/uimaj-as-camel
</url>
</scm>
