svn commit: r935745 - /uima/build/trunk/parent-poms/parent-pom-uimaj-eclipse-plugins/
Author: schor Date: Mon Apr 19 21:01:12 2010 New Revision: 935745 URL: http://svn.apache.org/viewvc?rev=935745view=rev Log: no Jira - svn ignore the target folder Modified: uima/build/trunk/parent-poms/parent-pom-uimaj-eclipse-plugins/ (props changed) Propchange: uima/build/trunk/parent-poms/parent-pom-uimaj-eclipse-plugins/ -- --- svn:ignore (added) +++ svn:ignore Mon Apr 19 21:01:12 2010 @@ -0,0 +1 @@ +target
svn commit: r936404 - /uima/uimaj/branches/mavenAlign/uimaj-ep-configurator/pom.xml
Author: schor
Date: Wed Apr 21 18:02:47 2010
New Revision: 936404
URL: http://svn.apache.org/viewvc?rev=936404view=rev
Log:
[UIMA-1756] use new parent poms
Modified:
uima/uimaj/branches/mavenAlign/uimaj-ep-configurator/pom.xml
Modified: uima/uimaj/branches/mavenAlign/uimaj-ep-configurator/pom.xml
URL:
http://svn.apache.org/viewvc/uima/uimaj/branches/mavenAlign/uimaj-ep-configurator/pom.xml?rev=936404r1=936403r2=936404view=diff
==
--- uima/uimaj/branches/mavenAlign/uimaj-ep-configurator/pom.xml (original)
+++ uima/uimaj/branches/mavenAlign/uimaj-ep-configurator/pom.xml Wed Apr 21
18:02:47 2010
@@ -21,28 +21,45 @@
xmlns:xsi=http://www.w3.org/2001/XMLSchema-instance;
xsi:schemaLocation=http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd;
modelVersion4.0.0/modelVersion
- !-- groupId omitted - inherited from parent --
+
+ parent
+groupIdorg.apache.uima/groupId
+artifactIdparent-pom-uimaj-eclipse-plugins/artifactId
+version1-SNAPSHOT/version
+ /parent
+
+ groupIdorg.apache.uima/groupId
artifactIduimaj-ep-configurator/artifactId
+ version2.3.1-SNAPSHOT/version
packagingbundle/packaging
- !-- version omitted - inherited from parent--
+
nameApache UIMA Configurator Eclipse Plugin/name
- urlhttp://incubator.apache.org/uima/url
- licenses
-license
- nameThe Apache Software License, Version 2.0/name
- urlhttp://www.apache.org/licenses/LICENSE-2.0.txt/url
- distributionrepo/distribution
-/license
- /licenses
+ !-- Special inheritance note
+ even though the scm element that follows is exactly the
+ same as those in super poms, it cannot be inherited because
+ there is some special code that incorrectly computes the
+ connection elements from the chain of parent poms, if this is omitted.
+
+ Keeping this a bit factored allows cutting/pasting the scm
+ element, and just changing the following two properties --
scm
-urlhttp://svn.apache.org/viewvc/incubator/uima/url
+connection
+
scm:svn:http://svn.apache.org/repos/asf/uima/${uimaScmRoot}/trunk/${uimaScmProject}
+/connection
+developerConnection
+
scm:svn:https://svn.apache.org/repos/asf/uima/${uimaScmRoot}/trunk/${uimaScmProject}
+/developerConnection
+url
+ http://svn.apache.org/viewvc/uima/${uimaScmRoot}/trunk/${uimaScmProject}
+/url
/scm
- parent
-groupIdorg.apache.uima/groupId
-artifactIduimaj-eclipse-plugins/artifactId
-version2.3.0.incubating/version !-- this comment is a flag for
changeVersion --
-relativePath../uimaj/eclipse-plugin-superPom/relativePath
- /parent
+
+ properties
+uimaScmRootuimaj/uimaScmRoot
+uimaScmProjectjvinci/uimaScmProject
+uimaDependenciesVersion2.3.0-incubating/uimaDependenciesVersion
+ /properties
+
dependencies
!-- UIMA dependencies --
!-- depending on the ep-runtime doesn't work without manual intervention
because
@@ -62,14 +79,14 @@
dependency
groupIdorg.apache.uima/groupId
artifactIduimaj-core/artifactId
- version${uimaj-release-version}/version
+ version2.3.0-incubating/version
scopecompile/scope
/dependency
dependency
groupIdorg.apache.uima/groupId
artifactIduimaj-tools/artifactId
- version${uimaj-release-version}/version
+ version2.3.0-incubating/version
!-- must be provided to get pax:eclipse to work, but
must be compile to get eclipse:eclipse to include
them as Referenced Libraries --
@@ -79,7 +96,7 @@
dependency
groupIdorg.apache.uima/groupId
artifactIduimaj-ep-jcasgen/artifactId
- version${uimaj-release-eclipse-version}/version
+ version2.3.0.incubating/version
scopeprovided/scope
/dependency
@@ -203,7 +220,7 @@
build
-
finalNameorg.apache.uima.desceditor_${uimaj-release-eclipse-version}/finalName
+finalNameorg.apache.uima.desceditor_2.3.1-SNAPSHOT/finalName
plugins
@@ -211,7 +228,6 @@
groupIdorg.apache.felix/groupId
artifactIdmaven-bundle-plugin/artifactId
!-- version 1.4.0 to support _nouses instruction --
-version1.4.0/version
extensionstrue/extensions
configuration
manifestLocationMETA-INF/manifestLocation
svn commit: r936931 - /uima/build/trunk/parent-poms/parent-pom-top/pom.xml
Author: schor Date: Thu Apr 22 16:14:48 2010 New Revision: 936931 URL: http://svn.apache.org/viewvc?rev=936931view=rev Log: [UIMA-1756] add version for maven-bundle-plugin. remove extra execution of remote-resources plugin - no longer needed. Modified: uima/build/trunk/parent-poms/parent-pom-top/pom.xml Modified: uima/build/trunk/parent-poms/parent-pom-top/pom.xml URL: http://svn.apache.org/viewvc/uima/build/trunk/parent-poms/parent-pom-top/pom.xml?rev=936931r1=936930r2=936931view=diff == --- uima/build/trunk/parent-poms/parent-pom-top/pom.xml (original) +++ uima/build/trunk/parent-poms/parent-pom-top/pom.xml Thu Apr 22 16:14:48 2010 @@ -268,6 +268,14 @@ /plugin plugin + groupIdorg.apache.felix/groupId + artifactIdmaven-bundle-plugin/artifactId + !-- version 2.0.0 fails -- + version2.0.1/version + extensionstrue/extensions +/plugin + +plugin groupIdorg.apache.rat/groupId artifactIdapache-rat-plugin/artifactId version0.6/version @@ -312,9 +320,8 @@ plugin groupIdorg.apache.maven.plugins/groupId artifactIdmaven-remote-resources-plugin/artifactId -executions +executions execution -iduima-notice/id goalsgoalprocess/goal/goals configuration resourceBundles
svn commit: r936932 - in /uima/build/trunk/parent-poms: parent-pom-uimaj-eclipse-plugins-ibm-notice/ parent-pom-uimaj-eclipse-plugins-ibm-notice/target/ parent-pom-uimaj-eclipse-plugins-ibm-notice/tar
Author: schor
Date: Thu Apr 22 16:16:59 2010
New Revision: 936932
URL: http://svn.apache.org/viewvc?rev=936932view=rev
Log:
change default of ibm-notice for eclipse-plugins - most will not have the extra
ibm notice.
Added:
uima/build/trunk/parent-poms/parent-pom-uimaj-eclipse-plugins-ibm-notice/
uima/build/trunk/parent-poms/parent-pom-uimaj-eclipse-plugins-ibm-notice/pom.xml
uima/build/trunk/parent-poms/parent-pom-uimaj-eclipse-plugins-ibm-notice/target/
uima/build/trunk/parent-poms/parent-pom-uimaj-eclipse-plugins-ibm-notice/target/maven-shared-archive-resources/
Modified:
uima/build/trunk/parent-poms/parent-pom-uimaj-eclipse-plugins/pom.xml
Added:
uima/build/trunk/parent-poms/parent-pom-uimaj-eclipse-plugins-ibm-notice/pom.xml
URL:
http://svn.apache.org/viewvc/uima/build/trunk/parent-poms/parent-pom-uimaj-eclipse-plugins-ibm-notice/pom.xml?rev=936932view=auto
==
---
uima/build/trunk/parent-poms/parent-pom-uimaj-eclipse-plugins-ibm-notice/pom.xml
(added)
+++
uima/build/trunk/parent-poms/parent-pom-uimaj-eclipse-plugins-ibm-notice/pom.xml
Thu Apr 22 16:16:59 2010
@@ -0,0 +1,78 @@
+!--
+ 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 is the common parent pom for the uima java sdk --
+
+project xmlns=http://maven.apache.org/POM/4.0.0;
+ xmlns:xsi=http://www.w3.org/2001/XMLSchema-instance;
+ xsi:schemaLocation=http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd;
+ modelVersion4.0.0/modelVersion
+
+ parent
+groupIdorg.apache.uima/groupId
+artifactIdparent-pom-uimaj-eclipse-plugins/artifactId
+version1-SNAPSHOT/version
+ /parent
+
+ groupIdorg.apache.uima/groupId
+ artifactIdparent-pom-uimaj-eclipse-plugins-ibm-notice/artifactId
+ packagingpom/packaging
+ version1-SNAPSHOT/version
+
+ nameApache UIMA Java SDK Parent for Eclipse Plugins with IBM copyright in
the Notice/name
+ descriptionAdds the IBM Copyright to the Notice file for selected source
files/description
+ url${uimaWebsiteUrl}/url
+
+ !-- Special inheritance note
+ even though the scm element that follows is exactly the
+ same as those in super poms, it cannot be inherited because
+ there is some special code that computes the connection elements
+ from the chain of parent poms, if this is omitted.
+
+ Keeping this a bit factored allows cutting/pasting the scm
+ element, and just changing the following two properties --
+ scm
+connection
+
scm:svn:http://svn.apache.org/repos/asf/uima/${uimaScmRoot}/trunk/${uimaScmProject}
+/connection
+developerConnection
+
scm:svn:https://svn.apache.org/repos/asf/uima/${uimaScmRoot}/trunk/${uimaScmProject}
+/developerConnection
+url
+ http://svn.apache.org/viewvc/uima/${uimaScmRoot}/trunk/${uimaScmProject}
+/url
+ /scm
+
+ properties
+uimaScmRootbuild/uimaScmRoot
+
uimaScmProjectparent-poms/parent-pom-uimaj-eclipse-plugins-ibm-notice/uimaScmProject
+postNoticeText
+Portions of 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.
+/postNoticeText
+ /properties
+
+ !--reporting--
+
+ !-- profiles --
+/project
\ No newline at end of file
Modified: uima/build/trunk/parent-poms/parent-pom-uimaj-eclipse-plugins/pom.xml
URL:
http://svn.apache.org/viewvc/uima/build/trunk/parent-poms/parent-pom-uimaj-eclipse-plugins/pom.xml?rev=936932r1=936931r2=936932view=diff
==
--- uima/build/trunk/parent-poms/parent-pom-uimaj-eclipse-plugins/pom.xml
(original)
+++ uima/build/trunk/parent-poms/parent-pom-uimaj-eclipse-plugins/pom.xml Thu
Apr 22 16:16:59 2010
@@ -42,6 +42,7 @@
nameApache UIMA Java SDK common Eclipse plugin settings/name
descriptionHolds common, factored out settings for eclipse
plugins/description
+ url${uimaWebsiteUrl}/url
!-- Special inheritance
svn commit: r936935 - /uima/build/trunk/parent-poms/parent-pom-uimaj-eclipse-plugins-ibm-notice/target/
Author: schor Date: Thu Apr 22 16:21:54 2010 New Revision: 936935 URL: http://svn.apache.org/viewvc?rev=936935view=rev Log: no Jira - delete target mistakenly checked in Removed: uima/build/trunk/parent-poms/parent-pom-uimaj-eclipse-plugins-ibm-notice/target/
svn commit: r936936 - /uima/build/trunk/parent-poms/parent-pom-uimaj-eclipse-plugins-ibm-notice/
Author: schor Date: Thu Apr 22 16:23:27 2010 New Revision: 936936 URL: http://svn.apache.org/viewvc?rev=936936view=rev Log: no Jira svn ignore target Modified: uima/build/trunk/parent-poms/parent-pom-uimaj-eclipse-plugins-ibm-notice/ (props changed) Propchange: uima/build/trunk/parent-poms/parent-pom-uimaj-eclipse-plugins-ibm-notice/ -- --- svn:ignore (added) +++ svn:ignore Thu Apr 22 16:23:27 2010 @@ -0,0 +1 @@ +target
svn commit: r937018 - /uima/uimaj/branches/mavenAlign/aggregate-pom-uimaj/pom.xml
Author: schor
Date: Thu Apr 22 19:13:46 2010
New Revision: 937018
URL: http://svn.apache.org/viewvc?rev=937018view=rev
Log:
[UIMA-1756] add uimaj aggregate pom
Added:
uima/uimaj/branches/mavenAlign/aggregate-pom-uimaj/pom.xml
Added: uima/uimaj/branches/mavenAlign/aggregate-pom-uimaj/pom.xml
URL:
http://svn.apache.org/viewvc/uima/uimaj/branches/mavenAlign/aggregate-pom-uimaj/pom.xml?rev=937018view=auto
==
--- uima/uimaj/branches/mavenAlign/aggregate-pom-uimaj/pom.xml (added)
+++ uima/uimaj/branches/mavenAlign/aggregate-pom-uimaj/pom.xml Thu Apr 22
19:13:46 2010
@@ -0,0 +1,84 @@
+!--
+ 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.
+--
+
+project xmlns=http://maven.apache.org/POM/4.0.0;
+ xmlns:xsi=http://www.w3.org/2001/XMLSchema-instance;
+ xsi:schemaLocation=http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd;
+ modelVersion4.0.0/modelVersion
+
+ parent
+groupIdorg.apache.uima/groupId
+artifactIdparent-pom-uimaj/artifactId
+version1-SNAPSHOT/version
+ /parent
+
+ artifactIdaggregate-pom-uimaj/artifactId
+ packagingpom/packaging
+ version2.3.1-SNAPSHOT/version
+ nameUIMA Aggregate POM ${artifactId}: UIMA Base/name
+ descriptionThe aggregate for the base UIMA framework build and
release/description
+ url${uimaWebsiteUrl}/url
+
+ !-- Special inheritance note
+ even though the scm element that follows is exactly the
+ same as those in super poms, it cannot be inherited because
+ there is some special code that computes the connection elements
+ from the chain of parent poms, if this is omitted.
+
+ Keeping this a bit factored allows cutting/pasting the scm
+ element, and just changing the following two properties --
+ scm
+connection
+
scm:svn:http://svn.apache.org/repos/asf/uima/${uimaScmRoot}/trunk/${uimaScmProject}
+/connection
+developerConnection
+
scm:svn:https://svn.apache.org/repos/asf/uima/${uimaScmRoot}/trunk/${uimaScmProject}
+/developerConnection
+url
+ http://svn.apache.org/viewvc/uima/${uimaScmRoot}/trunk/${uimaScmProject}
+/url
+ /scm
+
+ properties
+uimaScmRootuimaj/uimaScmRoot
+uimaScmProject${project.artifactId}/uimaScmProject
+uimaDependencyVersion2.3.1-SNAPSHOT/uimaDependencyVersion
+ /properties
+
+ modules
+module../uimaj-core/module
+module../uimaj-cpe/module
+module../uimaj-examples/module
+module../uimaj-tools/module
+module../uimaj-adapter-vinci/module
+module../uimaj-adapter-soap/module
+module../uimaj-test-util/module
+module../uimaj-component-test-util/module
+module../jVinci/module
+module../aggregate-pom-uimaj-eclipse-plugins/module
+!--moduledistr-superPom/module--
+module../uimaj-document-annotation/module
+module../PearPackagingMavenPlugin/module
+!-- the internal tools project is not part of any release
+ and can't be built automatically - to build it,
+ cd to the project directory and do mvn install --
+!--module../uimaj-internal-tools/module--
+module../uimaj-bootstrap/module
+ /modules
+/project
\ No newline at end of file
svn commit: r937020 - /uima/uimaj/branches/mavenAlign/aggregate-pom-uimaj/
Author: schor Date: Thu Apr 22 19:15:18 2010 New Revision: 937020 URL: http://svn.apache.org/viewvc?rev=937020view=rev Log: no Jira - set svn ignore for target and .project Modified: uima/uimaj/branches/mavenAlign/aggregate-pom-uimaj/ (props changed) Propchange: uima/uimaj/branches/mavenAlign/aggregate-pom-uimaj/ -- --- svn:ignore (added) +++ svn:ignore Thu Apr 22 19:15:18 2010 @@ -0,0 +1,2 @@ +target +.project
svn commit: r937026 - /uima/uimaj/branches/mavenAlign/aggregate-pom-uimaj-eclipse-plugins/
Author: schor Date: Thu Apr 22 19:16:11 2010 New Revision: 937026 URL: http://svn.apache.org/viewvc?rev=937026view=rev Log: [UIMA-1756] add uimaj eclipse plugins aggregate pom Added: uima/uimaj/branches/mavenAlign/aggregate-pom-uimaj-eclipse-plugins/
svn commit: r937035 - /uima/uimaj/branches/mavenAlign/uimaj-ep-cas-editor/pom.xml
Author: schor
Date: Thu Apr 22 19:45:14 2010
New Revision: 937035
URL: http://svn.apache.org/viewvc?rev=937035view=rev
Log:
[UIMA-1756] add description, add scm connection info, change parent poms, code
version explictly, factor licenses, remove repository info (is inherited),
change 2 eclipse lower version number ranges so that artifacts can be found in
the repos, add RAT exclusions where needed for test resources, etc., remove
relative-path for parent pom
Modified:
uima/uimaj/branches/mavenAlign/uimaj-ep-cas-editor/pom.xml
Modified: uima/uimaj/branches/mavenAlign/uimaj-ep-cas-editor/pom.xml
URL:
http://svn.apache.org/viewvc/uima/uimaj/branches/mavenAlign/uimaj-ep-cas-editor/pom.xml?rev=937035r1=937034r2=937035view=diff
==
--- uima/uimaj/branches/mavenAlign/uimaj-ep-cas-editor/pom.xml (original)
+++ uima/uimaj/branches/mavenAlign/uimaj-ep-cas-editor/pom.xml Thu Apr 22
19:45:14 2010
@@ -18,38 +18,46 @@
project xmlns=http://maven.apache.org/POM/4.0.0;
xmlns:xsi=http://www.w3.org/2001/XMLSchema-instance;
xsi:schemaLocation=http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd;
modelVersion4.0.0/modelVersion
- !-- groupId omitted - inherited from parent --
+
+ parent
+groupIdorg.apache.uima/groupId
+artifactIdparent-pom-uimaj-eclipse-plugins/artifactId
+version1-SNAPSHOT/version
+ /parent
+
artifactIduimaj-ep-cas-editor/artifactId
+ version2.3.1.SNAPSHOT/version
packagingbundle/packaging
- !-- version omitted - inherited from parent--
- nameApache UIMA Cas Editor Eclipse Plugin/name
- urlhttp://incubator.apache.org/uima/url
- licenses
- license
- nameThe Apache Software License, Version 2.0/name
-
urlhttp://www.apache.org/licenses/LICENSE-2.0.txt/url
- distributionrepo/distribution
- /license
- /licenses
- scm
- urlhttp://svn.apache.org/viewvc/incubator/uima/url
- /scm
- parent
- groupIdorg.apache.uima/groupId
- artifactIduimaj-eclipse-plugins/artifactId
- version2.3.0.incubating/version !-- this comment is a flag
for changeVersion --
-relativePath../uimaj/eclipse-plugin-superPom/relativePath
- /parent
-
- repositories
- repository
- idApacheIncubatorRepository/id
- url
-
http://people.apache.org/repo/m2-incubating-repository
- /url
- /repository
- /repositories
-
+ nameUIMA Eclipse: ${artifactId}/name
+ descriptionAllows editing the contents of a saved CAS/description
+ url${uimaWebsiteUrl}/url
+
+ !-- Special inheritance note
+ even though the scm element that follows is exactly the
+ same as those in super poms, it cannot be inherited because
+ there is some special code that computes the connection elements
+ from the chain of parent poms, if this is omitted.
+
+ Keeping this a bit factored allows cutting/pasting the scm
+ element, and just changing the following two properties --
+ scm
+connection
+
scm:svn:http://svn.apache.org/repos/asf/uima/${uimaScmRoot}/trunk/${uimaScmProject}
+/connection
+developerConnection
+
scm:svn:https://svn.apache.org/repos/asf/uima/${uimaScmRoot}/trunk/${uimaScmProject}
+/developerConnection
+url
+ http://svn.apache.org/viewvc/uima/${uimaScmRoot}/trunk/${uimaScmProject}
+/url
+ /scm
+
+ properties
+uimaScmRootuimaj/uimaScmRoot
+uimaScmProject${project.artifactId}/uimaScmProject
+uimaDependencyVersion2.3.1-SNAPSHOT/uimaDependencyVersion
+ /properties
+
dependencies
dependency
groupIdjunit/groupId
@@ -66,14 +74,14 @@
dependency
groupIdorg.apache.uima/groupId
artifactIduimaj-core/artifactId
- version${uimaj-release-version}/version
+ version${uimaDependencyVersion}/version
scopecompile/scope
/dependency
dependency
groupIdorg.apache.uima/groupId
artifactIduimaj-tools/artifactId
- version${uimaj-release-version}/version
+ version${uimaDependencyVersion}/version
scopecompile/scope
/dependency
@@ -103,7 +111,11 @@
dependency
groupIdorg.eclipse.swt/groupId
artifactIdorg.eclipse.swt.win32.win32.x86/artifactId
- version[3.3.0.0,4.0.0)/version
+ !-- changing the lower version number to 3.2.0
svn commit: r937285 - in /uima/uimaj/branches/mavenAlign: PearPackagingMavenPlugin/ PearPackagingMavenPlugin/docbook/PearPackagingMavenPluginUserGuide/ aggregate-pom-uimaj-eclipse-plugins/ aggregate-p
Author: schor
Date: Fri Apr 23 13:23:16 2010
New Revision: 937285
URL: http://svn.apache.org/viewvc?rev=937285view=rev
Log:
[UIMA-1756] m2eclipse runs using maven 3. Maven 3 has deprecated property
names that are missing their top-level names (e.g. ${version} is deprecated,
use ${project.version}. Change version and artifactId to include the project.
prefix.
Modified:
uima/uimaj/branches/mavenAlign/PearPackagingMavenPlugin/docbook/PearPackagingMavenPluginUserGuide/PearPackagingMavenPluginUserGuide.xml
uima/uimaj/branches/mavenAlign/PearPackagingMavenPlugin/pom.xml
uima/uimaj/branches/mavenAlign/aggregate-pom-uimaj-eclipse-plugins/pom.xml
uima/uimaj/branches/mavenAlign/aggregate-pom-uimaj/pom.xml
uima/uimaj/branches/mavenAlign/jVinci/pom.xml
uima/uimaj/branches/mavenAlign/uimaj-adapter-soap/pom.xml
uima/uimaj/branches/mavenAlign/uimaj-adapter-vinci/pom.xml
uima/uimaj/branches/mavenAlign/uimaj-bootstrap/pom.xml
uima/uimaj/branches/mavenAlign/uimaj-component-test-util/pom.xml
uima/uimaj/branches/mavenAlign/uimaj-core/pom.xml
uima/uimaj/branches/mavenAlign/uimaj-cpe/pom.xml
uima/uimaj/branches/mavenAlign/uimaj-distr/src/main/assembly/bin.xml
uima/uimaj/branches/mavenAlign/uimaj-document-annotation/pom.xml
uima/uimaj/branches/mavenAlign/uimaj-ep-cas-editor/pom.xml
uima/uimaj/branches/mavenAlign/uimaj-ep-configurator/pom.xml
uima/uimaj/branches/mavenAlign/uimaj-ep-debug/pom.xml
uima/uimaj/branches/mavenAlign/uimaj-ep-runtime/pom.xml
uima/uimaj/branches/mavenAlign/uimaj-examples/pom.xml
uima/uimaj/branches/mavenAlign/uimaj-internal-tools/pom.xml
uima/uimaj/branches/mavenAlign/uimaj-test-util/pom.xml
uima/uimaj/branches/mavenAlign/uimaj-tools/pom.xml
Modified:
uima/uimaj/branches/mavenAlign/PearPackagingMavenPlugin/docbook/PearPackagingMavenPluginUserGuide/PearPackagingMavenPluginUserGuide.xml
URL:
http://svn.apache.org/viewvc/uima/uimaj/branches/mavenAlign/PearPackagingMavenPlugin/docbook/PearPackagingMavenPluginUserGuide/PearPackagingMavenPluginUserGuide.xml?rev=937285r1=937284r2=937285view=diff
==
---
uima/uimaj/branches/mavenAlign/PearPackagingMavenPlugin/docbook/PearPackagingMavenPluginUserGuide/PearPackagingMavenPluginUserGuide.xml
(original)
+++
uima/uimaj/branches/mavenAlign/PearPackagingMavenPlugin/docbook/PearPackagingMavenPluginUserGuide/PearPackagingMavenPluginUserGuide.xml
Fri Apr 23 13:23:16 2010
@@ -85,12 +85,12 @@
mainComponentDesc
!-- PEAR file main component descriptor --
-desc/${artifactId}.xml
+desc/${project.artifactId}.xml
/mainComponentDesc
componentId
!-- PEAR file component ID --
-${artifactId}
+${project.artifactId}
/componentId
datapath
@@ -138,14 +138,14 @@
codelt;mainComponentDesc/code
- This element specifies the
relative path to the main component descriptor
that should be used to run
the PEAR content. The path must be relative to the
- project root. A good default
to use is codedesc/${artifactId}.xml/code.
+ project root. A good default
to use is codedesc/${project.artifactId}.xml/code.
/para
/listitem
listitem
para
codelt;componentID/code
- This element specifies the
PEAR package component ID. A good default
- to use is
code${artifactId}/code.
+ to use is
code${project.artifactId}/code.
/para
/listitem
listitem
Modified: uima/uimaj/branches/mavenAlign/PearPackagingMavenPlugin/pom.xml
URL:
http://svn.apache.org/viewvc/uima/uimaj/branches/mavenAlign/PearPackagingMavenPlugin/pom.xml?rev=937285r1=937284r2=937285view=diff
==
--- uima/uimaj/branches/mavenAlign/PearPackagingMavenPlugin/pom.xml (original)
+++ uima/uimaj/branches/mavenAlign/PearPackagingMavenPlugin/pom.xml Fri Apr 23
13:23:16 2010
@@ -30,7 +30,7 @@
artifactIdPearPackagingMavenPlugin/artifactId
version2.3.1-SNAPSHOT/version
packagingmaven-plugin/packaging
- nameUIMA Maven Plugin ${artifactId}/name
+ nameUIMA Maven Plugin ${project.artifactId}/name
descriptionThis is a maven plugin that produces
svn commit: r937287 - in /uima/site/trunk/uima-website: docs/doc-uima-pears.html docs/maven-design.html xdocs/maven-design.xml
Author: schor
Date: Fri Apr 23 13:31:28 2010
New Revision: 937287
URL: http://svn.apache.org/viewvc?rev=937287view=rev
Log:
[UIMA-1756] requirement to use project.xxx, in maven 3
Modified:
uima/site/trunk/uima-website/docs/doc-uima-pears.html
uima/site/trunk/uima-website/docs/maven-design.html
uima/site/trunk/uima-website/xdocs/maven-design.xml
Modified: uima/site/trunk/uima-website/docs/doc-uima-pears.html
URL:
http://svn.apache.org/viewvc/uima/site/trunk/uima-website/docs/doc-uima-pears.html?rev=937287r1=937286r2=937287view=diff
==
--- uima/site/trunk/uima-website/docs/doc-uima-pears.html (original)
+++ uima/site/trunk/uima-website/docs/doc-uima-pears.html Fri Apr 23 13:31:28
2010
@@ -361,8 +361,8 @@
lt;phasegt;packagelt;/phasegt;
lt;configurationgt;
lt;classpathgt;$main_root/lib/sample.jarlt;/classpathgt;
-
lt;mainComponentDescgt;desc/${artifactId}.xmllt;/mainComponentDescgt;
- lt;componentIdgt;${artifactId}lt;/componentIdgt;
+
lt;mainComponentDescgt;desc/${project.artifactId}.xmllt;/mainComponentDescgt;
+ lt;componentIdgt;${project.artifactId}lt;/componentIdgt;
lt;datapathgt;$main_root/resourceslt;/datapathgt;
lt;/configurationgt;
lt;goalsgt;
Modified: uima/site/trunk/uima-website/docs/maven-design.html
URL:
http://svn.apache.org/viewvc/uima/site/trunk/uima-website/docs/maven-design.html?rev=937287r1=937286r2=937287view=diff
==
--- uima/site/trunk/uima-website/docs/maven-design.html (original)
+++ uima/site/trunk/uima-website/docs/maven-design.html Fri Apr 23 13:31:28 2010
@@ -214,6 +214,13 @@ and aggregation POMs do not do common fa
parent. Doing this is a recommended best practice./li
/ul
/p
+pMaven 3 has more
requirements on POMs
+pA transition to Maven 3 is occuring in 2010. The Eclipse plugin,
m2eclipse, embeds
+ Maven 3 already./p
+ul
+ liProperty names have to include their path from project, etc. For
instance, you cannot use
+${version}, you have to use ${project.version}./li
+/ul/p
/blockquote
/p
/td/tr
Modified: uima/site/trunk/uima-website/xdocs/maven-design.xml
URL:
http://svn.apache.org/viewvc/uima/site/trunk/uima-website/xdocs/maven-design.xml?rev=937287r1=937286r2=937287view=diff
==
--- uima/site/trunk/uima-website/xdocs/maven-design.xml (original)
+++ uima/site/trunk/uima-website/xdocs/maven-design.xml Fri Apr 23 13:31:28 2010
@@ -73,6 +73,13 @@ and aggregation POMs do not do common fa
parent. Doing this is a recommended best practice./li
/ul
/p
+ pMaven 3 has more requirements on POMs
+pA transition to Maven 3 is occuring in 2010. The Eclipse plugin,
m2eclipse, embeds
+ Maven 3 already./p
+ul
+ liProperty names have to include their path from project, etc. For
instance, you cannot use
+${version}, you have to use ${project.version}./li
+/ul/p
/section
/body
/document
\ No newline at end of file
svn commit: r939834 - in /uima/site/trunk/uima-website/docs/doap: ./ uima.rdf
Author: schor Date: Fri Apr 30 21:46:03 2010 New Revision: 939834 URL: http://svn.apache.org/viewvc?rev=939834view=rev Log: no Jira - add doap file for uima project Added: uima/site/trunk/uima-website/docs/doap/ uima/site/trunk/uima-website/docs/doap/uima.rdf Added: uima/site/trunk/uima-website/docs/doap/uima.rdf URL: http://svn.apache.org/viewvc/uima/site/trunk/uima-website/docs/doap/uima.rdf?rev=939834view=auto == --- uima/site/trunk/uima-website/docs/doap/uima.rdf (added) +++ uima/site/trunk/uima-website/docs/doap/uima.rdf Fri Apr 30 21:46:03 2010 @@ -0,0 +1,63 @@ +?xml version=1.0? +!-- + 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. +-- + +rdf:RDF xmlns:rdf=http://www.w3.org/1999/02/22-rdf-syntax-ns#; + xmlns=http://usefulinc.com/ns/doap#; xmlns:foaf=http://xmlns.com/foaf/0.1/; + xmlns:labs=http://labs.apache.org/doap-ext/1.0#; + xmlns:projects=http://projects.apache.org/ns/asfext#; + + Project rdf:about=http://uima.apache.org; +nameApache UIMA/name +shortnameUIMA/shortname + +shortdesc xml:lang=enAnnotator components and a +scalable integration and deployment framework for +Unstructured Information analysis/shortdesc + +description xml:lang=enThe Apache UIMA project supports +the community working on the analysis of unstructured information +with a unifying Java and C++ framework, tooling, +and analysis components, guided by the OASIS UIMA standard. +It includes support for very large scaleout using networked +clusters of compute nodes./description + +homepage rdf:resource=http://uima.apache.org// +license rdf:resource=http://usefulinc.com/doap/licenses/asl20/ +mailing-list rdf:resource=http://uima.apache.org/mail-lists.html; / +download-page rdf:resource=http://uima.apache.org/downloads.cgi; / +created2010-04-30/created +labs:statusactive/labs:status + +maintainer + foaf:Person rdf:about=http://people.apache.org/~thorsten/#me; +foaf:nameMarshall Schor/foaf:name +foaf:homepage rdf:resource=http://people.apache.org/~schor// + /foaf:Person +/maintainer +repository + SVNRepository +location rdf:resource=http://svn.apache.org/repos/asf/uima// +browse rdf:resource=http://svn.apache.org/viewcvs/uima// + /SVNRepository +/repository +programming-languageJava/programming-language +programming-languageC++/programming-language + /Project +/rdf:RDF
svn commit: r940296 - /uima/build/trunk/parent-poms/.project
Author: schor Date: Sun May 2 18:45:10 2010 New Revision: 940296 URL: http://svn.apache.org/viewvc?rev=940296view=rev Log: [UIMA-1756] remove .project from svn for parent-poms Removed: uima/build/trunk/parent-poms/.project
svn commit: r940456 - in /uima/uimaj/branches/mavenAlign: aggregate-pom-uimaj/ aggregate-uimaj/
Author: schor Date: Mon May 3 13:51:28 2010 New Revision: 940456 URL: http://svn.apache.org/viewvc?rev=940456view=rev Log: [UIMA-1756] cleanup - shorten name Added: uima/uimaj/branches/mavenAlign/aggregate-uimaj/ - copied from r940455, uima/uimaj/branches/mavenAlign/aggregate-pom-uimaj/ Removed: uima/uimaj/branches/mavenAlign/aggregate-pom-uimaj/
svn commit: r940800 - in /uima/uimaj/branches/mavenAlign/uimaj-cpe/src/main/java/org/apache/uima/collection/impl: cpm/engine/CPMChunkTimeoutException.java metadata/cpe/CpeDescriptorFactory.java
Author: schor
Date: Tue May 4 10:47:45 2010
New Revision: 940800
URL: http://svn.apache.org/viewvc?rev=940800view=rev
Log:
[UIMA-1778] correct bad javadoc comments reported by running Javadoc
Modified:
uima/uimaj/branches/mavenAlign/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/engine/CPMChunkTimeoutException.java
uima/uimaj/branches/mavenAlign/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/metadata/cpe/CpeDescriptorFactory.java
Modified:
uima/uimaj/branches/mavenAlign/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/engine/CPMChunkTimeoutException.java
URL:
http://svn.apache.org/viewvc/uima/uimaj/branches/mavenAlign/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/engine/CPMChunkTimeoutException.java?rev=940800r1=940799r2=940800view=diff
==
---
uima/uimaj/branches/mavenAlign/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/engine/CPMChunkTimeoutException.java
(original)
+++
uima/uimaj/branches/mavenAlign/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/engine/CPMChunkTimeoutException.java
Tue May 4 10:47:45 2010
@@ -48,14 +48,14 @@ public class CPMChunkTimeoutException ex
}
/**
- * @return
+ * @return the docID
*/
public long getDocID() {
return docID;
}
/**
- * @return
+ * @return the ThrottleID
*/
public String getThrottleID() {
return throttleID;
Modified:
uima/uimaj/branches/mavenAlign/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/metadata/cpe/CpeDescriptorFactory.java
URL:
http://svn.apache.org/viewvc/uima/uimaj/branches/mavenAlign/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/metadata/cpe/CpeDescriptorFactory.java?rev=940800r1=940799r2=940800view=diff
==
---
uima/uimaj/branches/mavenAlign/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/metadata/cpe/CpeDescriptorFactory.java
(original)
+++
uima/uimaj/branches/mavenAlign/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/metadata/cpe/CpeDescriptorFactory.java
Tue May 4 10:47:45 2010
@@ -175,7 +175,7 @@ public class CpeDescriptorFactory {
/**
*
- * @param aInitializerDescriptorPath
+ * @param aPath
* @param aDescriptor
* @throws CpeDescriptorException
*
@@ -210,7 +210,7 @@ protected static CpeCollectionReaderCasI
/**
*
- * @param aDescriptorPath
+ * @param aPath
*/
public static CpeComponentDescriptor produceComponentDescriptor(String
aPath) {
svn commit: r941287 - /uima/build/trunk/parent-poms/parent-pom-uimaj-eclipse-plugins/pom.xml
Author: schor
Date: Wed May 5 13:47:34 2010
New Revision: 941287
URL: http://svn.apache.org/viewvc?rev=941287view=rev
Log:
[UIMA-1756] move defaulting things into pluginManagement, switch mode of
running felix to goal: manifest, so we can use normal jar packaging and get the
apache license/notice files in there. Turn off extra unused felix bundle
executions
Modified:
uima/build/trunk/parent-poms/parent-pom-uimaj-eclipse-plugins/pom.xml
Modified: uima/build/trunk/parent-poms/parent-pom-uimaj-eclipse-plugins/pom.xml
URL:
http://svn.apache.org/viewvc/uima/build/trunk/parent-poms/parent-pom-uimaj-eclipse-plugins/pom.xml?rev=941287r1=941286r2=941287view=diff
==
--- uima/build/trunk/parent-poms/parent-pom-uimaj-eclipse-plugins/pom.xml
(original)
+++ uima/build/trunk/parent-poms/parent-pom-uimaj-eclipse-plugins/pom.xml Wed
May 5 13:47:34 2010
@@ -68,6 +68,8 @@
/properties
build
+finalName${project.artifactId}_${parsedVersion.osgiVersion}/finalName
+
!-- resources are merged --
!-- needed to copy resources, icons, and the plugin.xml to the result
--
resources
@@ -83,28 +85,77 @@
directorysrc/main/resources/directory
/resource
/resources
-
-plugins
- !-- special eclipse:eclipse configuration for Eclipse plugins --
- plugin
-groupIdorg.apache.maven.plugins/groupId
-artifactIdmaven-eclipse-plugin/artifactId
-version2.4/version
-configuration
- manifest.ignore/manifest
- pdetrue/pde
- !-- set next to false because refs to runtime project
- as a project don't work (because it is a library project,
- and has no sources of its own
-
-A consequence of this: If you change code a plugin depends on,
-run mvn install on the changed code to get your plugin to
-pick up the changes
---
- useProjectReferencesfalse/useProjectReferences
-/configuration
- /plugin
-/plugins
+
+pluginManagement
+
+ !-- run the felix plugin in manifest mode
+ because that plugin doesn't resolve
+ all properties e.g., parsedVersion.osgiVersion --
+ plugins
+plugin
+ groupIdorg.apache.felix/groupId
+ artifactIdmaven-bundle-plugin/artifactId
+ executions
+execution
+ iduima-bundle/id
+ goalsgoalmanifest/goal/goals
+ phaseprocess-classes/phase
+ configuration
+!-- we put the generate manifest in the spot where Eclipse
+ plugins think it will be --
+ manifestLocationMETA-INF//manifestLocation
+ /configuration
+/execution
+!-- turn off unneeded executions --
+execution
+ iddefault-deploy/id
+ phase/
+/execution
+execution
+ iddefault-install/id
+ phase/
+/execution
+execution
+ iddefault-bundle/id
+ phase/
+/execution
+ /executions
+/plugin
+
+!-- pick up the manifest felix generates --
+plugin
+ groupIdorg.apache.maven.plugins/groupId
+ artifactIdmaven-jar-plugin/artifactId
+ configuration
+archive
+ manifestFileMETA-INF/MANIFEST.MF/manifestFile
+/archive
+ /configuration
+/plugin
+
+!-- special eclipse:eclipse configuration for Eclipse plugins --
+plugin
+ groupIdorg.apache.maven.plugins/groupId
+ artifactIdmaven-eclipse-plugin/artifactId
+ version2.4/version
+ configuration
+manifest.ignore/manifest
+pdetrue/pde
+!-- set next to false because refs to runtime project
+ as a project don't work (because it is a library project,
+ and has no sources of its own
+
+ A consequence of this: If you change code a plugin depends on,
+ run mvn install on the changed code to get your plugin to
+ pick up the changes
+ --
+useProjectReferencesfalse/useProjectReferences
+ /configuration
+/plugin
+
+ /plugins
+/pluginManagement
+
/build
/project
\ No newline at end of file
svn commit: r941320 - in /uima/uimaj/branches/mavenAlign: uimaj-eclipse-feature-runtime/ uimaj-eclipse-feature-tools/ uimaj-eclipse-update-site/
Author: schor
Date: Wed May 5 14:44:09 2010
New Revision: 941320
URL: http://svn.apache.org/viewvc?rev=941320view=rev
Log:
[UIMA-1756] use parsedVersion.osgiVersion, change to 2.3.1.SNAPSHOT version,
change strategy for getting plugin and feature jars - to getting them from mvn
repo, cleanup POMs to conform to conventions
Modified:
uima/uimaj/branches/mavenAlign/uimaj-eclipse-feature-runtime/ (props
changed)
uima/uimaj/branches/mavenAlign/uimaj-eclipse-feature-runtime/feature.xml
uima/uimaj/branches/mavenAlign/uimaj-eclipse-feature-runtime/pom.xml
uima/uimaj/branches/mavenAlign/uimaj-eclipse-feature-tools/ (props
changed)
uima/uimaj/branches/mavenAlign/uimaj-eclipse-feature-tools/feature.xml
uima/uimaj/branches/mavenAlign/uimaj-eclipse-feature-tools/pom.xml
uima/uimaj/branches/mavenAlign/uimaj-eclipse-update-site/ (props changed)
uima/uimaj/branches/mavenAlign/uimaj-eclipse-update-site/pom.xml
uima/uimaj/branches/mavenAlign/uimaj-eclipse-update-site/site.xml
Propchange: uima/uimaj/branches/mavenAlign/uimaj-eclipse-feature-runtime/
--
--- svn:ignore (original)
+++ svn:ignore Wed May 5 14:44:09 2010
@@ -1,2 +1,5 @@
META-INF
target
+src
+.settings
+.classpath
Modified:
uima/uimaj/branches/mavenAlign/uimaj-eclipse-feature-runtime/feature.xml
URL:
http://svn.apache.org/viewvc/uima/uimaj/branches/mavenAlign/uimaj-eclipse-feature-runtime/feature.xml?rev=941320r1=941319r2=941320view=diff
==
--- uima/uimaj/branches/mavenAlign/uimaj-eclipse-feature-runtime/feature.xml
(original)
+++ uima/uimaj/branches/mavenAlign/uimaj-eclipse-feature-runtime/feature.xml
Wed May 5 14:44:09 2010
@@ -20,7 +20,7 @@
feature
id=org.apache.uima.runtime
label=UIMA Runtime
- version=2.3.0.incubating
+ version=2.3.1.SNAPSHOT
provider-name=Apache Software Foundation
description url=http://incubator.apache.org/uima;
@@ -58,7 +58,7 @@ under the License.
id=org.apache.uima.runtime
download-size=0
install-size=0
- version=2.3.0.incubating
+ version=2.3.1.SNAPSHOT
unpack=false/
/feature
Modified: uima/uimaj/branches/mavenAlign/uimaj-eclipse-feature-runtime/pom.xml
URL:
http://svn.apache.org/viewvc/uima/uimaj/branches/mavenAlign/uimaj-eclipse-feature-runtime/pom.xml?rev=941320r1=941319r2=941320view=diff
==
--- uima/uimaj/branches/mavenAlign/uimaj-eclipse-feature-runtime/pom.xml
(original)
+++ uima/uimaj/branches/mavenAlign/uimaj-eclipse-feature-runtime/pom.xml Wed
May 5 14:44:09 2010
@@ -18,19 +18,51 @@
project xmlns=http://maven.apache.org/POM/4.0.0;
xmlns:xsi=http://www.w3.org/2001/XMLSchema-instance;
xsi:schemaLocation=http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd;
modelVersion4.0.0/modelVersion
- !-- groupId omitted - inherited from parent --
- artifactIduimaj-eclipse-feature-runtime/artifactId
- packagingjar/packaging
- !-- version omitted - inherited from parent--
- nameApache UIMA Eclipse Feature: Runtime/name
+
parent
groupIdorg.apache.uima/groupId
-artifactIduimaj-eclipse-plugins/artifactId
-version2.3.0.incubating/version !-- this comment is a flag for
changeVersion --
+artifactIdparent-pom-top/artifactId
+version1-SNAPSHOT/version
+relativePath/
/parent
+ artifactIduimaj-eclipse-feature-runtime/artifactId
+ packagingjar/packaging
+ version2.3.1-SNAPSHOT/version
+ nameUIMA Eclipse: ${project.artifactId}/name
+ descriptionUIMA Eclipse Plugin Feature that
+has the base UIMA runtime, referred to by other plugins that
+need UIMA framework code/description
+ url${uimaWebsiteUrl}/url
+
+ !-- Special inheritance note
+ even though the scm element that follows is exactly the
+ same as those in super poms, it cannot be inherited because
+ there is some special code that computes the connection elements
+ from the chain of parent poms, if this is omitted.
+
+ Keeping this a bit factored allows cutting/pasting the scm
+ element, and just changing the following two properties --
+ scm
+connection
+
scm:svn:http://svn.apache.org/repos/asf/uima/${uimaScmRoot}/trunk/${uimaScmProject}
+/connection
+developerConnection
+
scm:svn:https://svn.apache.org/repos/asf/uima/${uimaScmRoot}/trunk/${uimaScmProject}
+/developerConnection
+url
+ http://svn.apache.org/viewvc/uima/${uimaScmRoot}/trunk/${uimaScmProject}
+/url
+ /scm
+
+ properties
+uimaScmRootuimaj/uimaScmRoot
+uimaScmProject${project.artifactId}/uimaScmProject
+ /properties
+
build
-
finalNameorg.apache.uima.runtime_${uimaj-release-eclipse-version}/finalName
+!-- parsedVersion set in parent-pom-top by builder
svn commit: r941322 - /uima/uimaj/branches/mavenAlign/uimaj-eclipse-feature-runtime/.project
Author: schor Date: Wed May 5 14:46:12 2010 New Revision: 941322 URL: http://svn.apache.org/viewvc?rev=941322view=rev Log: [UIMA-1756] let m2eclipse generate the .project Removed: uima/uimaj/branches/mavenAlign/uimaj-eclipse-feature-runtime/.project
svn commit: r941445 - /uima/build/trunk/parent-poms/parent-pom-top/pom.xml
Author: schor Date: Wed May 5 19:42:57 2010 New Revision: 941445 URL: http://svn.apache.org/viewvc?rev=941445view=rev Log: [UIMA-1756] add parsedVersion info using build-helper, configure felix bundle plugin uima-bundle defaults Modified: uima/build/trunk/parent-poms/parent-pom-top/pom.xml Modified: uima/build/trunk/parent-poms/parent-pom-top/pom.xml URL: http://svn.apache.org/viewvc/uima/build/trunk/parent-poms/parent-pom-top/pom.xml?rev=941445r1=941444r2=941445view=diff == --- uima/build/trunk/parent-poms/parent-pom-top/pom.xml (original) +++ uima/build/trunk/parent-poms/parent-pom-top/pom.xml Wed May 5 19:42:57 2010 @@ -248,6 +248,12 @@ /executions /plugin +plugin + groupIdorg.codehaus.mojo/groupId + artifactIdbuild-helper-maven-plugin/artifactId + version1.5/version +/plugin + !-- set Java 1.5 as the source and target of compilation -- plugin groupIdorg.apache.maven.plugins/groupId @@ -343,6 +349,13 @@ !-- version 2.0.0 fails -- version2.0.1/version extensionstrue/extensions + executions +execution + iduima-bundle/id + goalsgoalmanifest/goal/goals + phaseprocess-classes/phase +/execution + /executions /plugin plugin @@ -380,6 +393,28 @@ /execution /executions /plugin + + !-- sets the following properties: +parsedVersion.majorVersion +parsedVersion.minorVersion +parsedVersion.incrementalVersion +parsedVersion.qualifier +parsedVersion.buildNumber +parsedVersion.osgiVersion + -- + plugin +groupIdorg.codehaus.mojo/groupId +artifactIdbuild-helper-maven-plugin/artifactId +executions + execution +idparse-project-version/id +goalsgoalparse-version/goal/goals +configuration + propertyPrefixparsedVersion/propertyPrefix +/configuration + /execution +/executions + /plugin /plugins /build
svn commit: r941449 - /uima/uima-as/branches/
Author: schor Date: Wed May 5 19:48:39 2010 New Revision: 941449 URL: http://svn.apache.org/viewvc?rev=941449view=rev Log: [UIMA-1756] start work in branch on uima-as Added: uima/uima-as/branches/
svn commit: r941738 - /uima/uimaj/branches/mavenAlign/uima-docbook-references/
Author: schor Date: Thu May 6 14:01:07 2010 New Revision: 941738 URL: http://svn.apache.org/viewvc?rev=941738view=rev Log: [UIMA-1757] split uima-docbooks, rework for docbkx Added: uima/uimaj/branches/mavenAlign/uima-docbook-references/
svn commit: r941919 - in /uima/uima-as/branches/mavenAlign: uimaj-as-activemq/ uimaj-as-camel/ uimaj-as-core/ uimaj-as-jms/ uimaj-as-osgi-runtime/ uimaj-as/eclipse-plugin-superPom/ uimaj-as/eclipse-pl
Author: schor
Date: Thu May 6 20:52:58 2010
New Revision: 941919
URL: http://svn.apache.org/viewvc?rev=941919view=rev
Log:
[UIMA-1756] convert uima-as to new build parents
Added:
uima/uima-as/branches/mavenAlign/uimaj-as/eclipse-plugin-superPom/.project
uima/uima-as/branches/mavenAlign/uimaj-as/eclipse-plugin-superPom/.settings/
uima/uima-as/branches/mavenAlign/uimaj-as/eclipse-plugin-superPom/.settings/org.maven.ide.eclipse.prefs
Modified:
uima/uima-as/branches/mavenAlign/uimaj-as-activemq/pom.xml
uima/uima-as/branches/mavenAlign/uimaj-as-camel/pom.xml
uima/uima-as/branches/mavenAlign/uimaj-as-core/pom.xml
uima/uima-as/branches/mavenAlign/uimaj-as-jms/pom.xml
uima/uima-as/branches/mavenAlign/uimaj-as-osgi-runtime/pom.xml
uima/uima-as/branches/mavenAlign/uimaj-eclipse-feature-deployeditor/pom.xml
uima/uima-as/branches/mavenAlign/uimaj-ep-deployeditor/pom.xml
uima/uima-as/branches/mavenAlign/uimaj-ep-runtime-deployeditor/pom.xml
Modified: uima/uima-as/branches/mavenAlign/uimaj-as-activemq/pom.xml
URL:
http://svn.apache.org/viewvc/uima/uima-as/branches/mavenAlign/uimaj-as-activemq/pom.xml?rev=941919r1=941918r2=941919view=diff
==
--- uima/uima-as/branches/mavenAlign/uimaj-as-activemq/pom.xml (original)
+++ uima/uima-as/branches/mavenAlign/uimaj-as-activemq/pom.xml Thu May 6
20:52:58 2010
@@ -22,18 +22,46 @@
xmlns:xsi=http://www.w3.org/2001/XMLSchema-instance;
xsi:schemaLocation=http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd;
modelVersion4.0.0/modelVersion
- groupIdorg.apache.uima/groupId
+
+ parent
+groupIdorg.apache.uima/groupId
+artifactIdparent-pom-ibm-notice/artifactId
+version1-SNAPSHOT/version
+relativePath/
+ /parent
+
artifactIduimaj-as-activemq/artifactId
- packagingjar/packaging
- version${uimaj-as-release-version}/version
- nameApache UIMA Async Scaleout using ActiveMQ/name
+ version2.3.1-SNAPSHOT/version
+ nameUIMA-AS: ${project.artifactId}/name
+ descriptionUIMA-AS ActiveMQ incorporation/description
urlhttp://incubator.apache.org/uima/url
- parent
- groupIdorg.apache.uima/groupId
- artifactIduimaj-as/artifactId
- version2.3.0-incubating/version !-- this comment is a flag
for changeVersion --
-relativePath../uimaj-as/relativePath
- /parent
+
+ !-- Special inheritance note
+ even though the scm element that follows is exactly the
+ same as those in super poms, it cannot be inherited because
+ there is some special code that computes the connection elements
+ from the chain of parent poms, if this is omitted.
+
+ Keeping this a bit factored allows cutting/pasting the scm
+ element, and just changing the following two properties --
+ scm
+connection
+
scm:svn:http://svn.apache.org/repos/asf/uima/${uimaScmRoot}/trunk/${uimaScmProject}
+/connection
+developerConnection
+
scm:svn:https://svn.apache.org/repos/asf/uima/${uimaScmRoot}/trunk/${uimaScmProject}
+/developerConnection
+url
+ http://svn.apache.org/viewvc/uima/${uimaScmRoot}/trunk/${uimaScmProject}
+/url
+ /scm
+
+ properties
+uimaScmRootuimaj/uimaScmRoot
+uimaScmProject${project.artifactId}/uimaScmProject
+uimaDependencyVersion2.3.1-SNAPSHOT/uimaDependencyVersion
+ /properties
+
dependencies
!--dependency
@@ -46,7 +74,7 @@
dependency
groupIdorg.apache.uima/groupId
artifactIduimaj-core/artifactId
- version${uimaj-release-version}/version
+ version${project.version}/version
scopecompile/scope
/dependency
@@ -202,14 +230,14 @@
dependency
groupIdorg.apache.uima/groupId
artifactIduimaj-as-core/artifactId
- version${uimaj-as-release-version}/version
+ version${project.version}/version
scopecompile/scope
/dependency
dependency
groupIdorg.apache.uima/groupId
artifactIduimaj-as-jms/artifactId
- version${uimaj-as-release-version}/version
+ version${project.version}/version
scopecompile/scope
/dependency
@@ -260,7 +288,7 @@
dependency
groupIdorg.apache.uima/groupId
artifactIduimaj-examples/artifactId
- version${uimaj-release-version}/version
+ version${project.version}/version
scopetest/scope
/dependency
@@ -274,15 +302,18 @@
dependency
groupIdorg.apache.uima/groupId
artifactIduimaj-test-util
svn commit: r942173 - in /uima/sandbox/branches/mavenAlign/ConceptMapper: ./ docbook/ docs/ src/docbook/ src/docbook/ConceptMapperAnnotatorUserGuide/ src/docbook/ConceptMapperAnnotatorUserGuide/images
Author: schor
Date: Fri May 7 18:42:02 2010
New Revision: 942173
URL: http://svn.apache.org/viewvc?rev=942173view=rev
Log:
[UIMA-1756] partial fixup
Added:
uima/sandbox/branches/mavenAlign/ConceptMapper/src/docbook/
- copied from r941967,
uima/sandbox/branches/mavenAlign/ConceptMapper/docbook/
uima/sandbox/branches/mavenAlign/ConceptMapper/src/docbook/ConceptMapperAnnotatorUserGuide.xml
- copied unchanged from r941967,
uima/sandbox/branches/mavenAlign/ConceptMapper/docbook/ConceptMapperAnnotatorUserGuide/ConceptMapperAnnotatorUserGuide.xml
uima/sandbox/branches/mavenAlign/ConceptMapper/src/docbook/images/
- copied from r941967,
uima/sandbox/branches/mavenAlign/ConceptMapper/docbook/ConceptMapperAnnotatorUserGuide/images/
Removed:
uima/sandbox/branches/mavenAlign/ConceptMapper/build_documentation.xml
uima/sandbox/branches/mavenAlign/ConceptMapper/docbook/
uima/sandbox/branches/mavenAlign/ConceptMapper/docs/
uima/sandbox/branches/mavenAlign/ConceptMapper/src/docbook/ConceptMapperAnnotatorUserGuide/ConceptMapperAnnotatorUserGuide.xml
uima/sandbox/branches/mavenAlign/ConceptMapper/src/docbook/ConceptMapperAnnotatorUserGuide/images/
Modified:
uima/sandbox/branches/mavenAlign/ConceptMapper/pom.xml
Modified: uima/sandbox/branches/mavenAlign/ConceptMapper/pom.xml
URL:
http://svn.apache.org/viewvc/uima/sandbox/branches/mavenAlign/ConceptMapper/pom.xml?rev=942173r1=942172r2=942173view=diff
==
--- uima/sandbox/branches/mavenAlign/ConceptMapper/pom.xml (original)
+++ uima/sandbox/branches/mavenAlign/ConceptMapper/pom.xml Fri May 7 18:42:02
2010
@@ -19,23 +19,25 @@
project xmlns=http://maven.apache.org/POM/4.0.0;
xmlns:xsi=http://www.w3.org/2001/XMLSchema-instance;
xsi:schemaLocation=http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd;
modelVersion4.0.0/modelVersion
- groupIdorg.apache.uima/groupId
- artifactIdConceptMapper/artifactId
- packagingjar/packaging
- version${uimaj-release-version}/version
- nameApache UIMA Java Annotator - ConceptMapper/name
parent
groupIdorg.apache.uima/groupId
-artifactIdSandboxDistr/artifactId
-version2.3.0-incubating/version !-- this comment is a flag for
changeVersion --
-relativePath../SandboxDistr/relativePath
+artifactIdparent-pom-annotator/artifactId
+version1-SNAPSHOT/version
+relativePath/
/parent
+ artifactIdConceptMapper/artifactId
+ version2.3.1-SNAPSHOT/version
+ nameUIMA Annotator: ${project.artifactId}/name
+ descriptionExtracts concepts from a CAS/description
+
dependencies
dependency
groupIdorg.apache.uima/groupId
artifactIduimaj-core/artifactId
+ version2.3.1-SNAPSHOT/version
+ scopeprovided/scope
/dependency
/dependencies
svn commit: r942471 - /uima/build/trunk/uima-docbook-resource-bundle/src/main/resources/docbook-shared/common/pdf.xsl
Author: schor Date: Sat May 8 21:37:30 2010 New Revision: 942471 URL: http://svn.apache.org/viewvc?rev=942471view=rev Log: [UIMA-1780] local customization corrects issue with missing cross refs in PDF output, for the docbkx toolchain Modified: uima/build/trunk/uima-docbook-resource-bundle/src/main/resources/docbook-shared/common/pdf.xsl Modified: uima/build/trunk/uima-docbook-resource-bundle/src/main/resources/docbook-shared/common/pdf.xsl URL: http://svn.apache.org/viewvc/uima/build/trunk/uima-docbook-resource-bundle/src/main/resources/docbook-shared/common/pdf.xsl?rev=942471r1=942470r2=942471view=diff == --- uima/build/trunk/uima-docbook-resource-bundle/src/main/resources/docbook-shared/common/pdf.xsl (original) +++ uima/build/trunk/uima-docbook-resource-bundle/src/main/resources/docbook-shared/common/pdf.xsl Sat May 8 21:37:30 2010 @@ -19,179 +19,151 @@ under the License. -- -xsl:stylesheet xmlns:xsl=http://www.w3.org/1999/XSL/Transform; -xmlns:fo=http://www.w3.org/1999/XSL/Format; -xmlns:d=http://docbook.org/ns/docbook; -version='1.0' - - !-- width specifications: inside, center, outside -- - !-- OVERRIDE: inside is large to accommodate large version strings without overflowing -- - xsl:param name=footer.column.widths6 8 1/xsl:param - - - xsl:param name=fop.version/ - xsl:param name=docbook.xsl.root/ - - !-- selects fop or fop1 for 0.20.5 / 0.93 versions of FOP -- - xsl:param name=fop1.extensions -xsl:choose - xsl:when test=$fop.version = '0.93'1/xsl:when - xsl:when test=$fop.version = '0.95'1/xsl:when - xsl:otherwise0/xsl:otherwise -/xsl:choose - /xsl:param - - xsl:param name=fop.extensions -xsl:choose - xsl:when test=$fop.version = '0.20.5'1/xsl:when - xsl:otherwise0/xsl:otherwise -/xsl:choose - /xsl:param - - !--xsl:param name=draft.watermark.image select=concat($docbook.xsl.root, '/images/draft.png')/-- - - !-- Fonts, default alignment -- - - xsl:param name=body.font.family select='Palatino'/ - xsl:param name=body.font.masterselect='10.5'/ - -!--### +xsl:stylesheet xmlns:xsl=http://www.w3.org/1999/XSL/Transform; xmlns:fo=http://www.w3.org/1999/XSL/Format; + xmlns:d=http://docbook.org/ns/docbook; version='1.0' + !-- width specifications: inside, center, outside -- + !-- OVERRIDE: inside is large to accommodate large version strings without overflowing -- + xsl:param name=footer.column.widths6 8 1/xsl:param + xsl:param name=fop.version/ + xsl:param name=docbook.xsl.root/ + !-- selects fop or fop1 for 0.20.5 / 0.93 versions of FOP -- + xsl:param name=fop1.extensions +xsl:choose + xsl:when test=$fop.version = '0.93'1/xsl:when + xsl:when test=$fop.version = '0.95'1/xsl:when + xsl:otherwise0/xsl:otherwise +/xsl:choose + /xsl:param + xsl:param name=fop.extensions +xsl:choose + xsl:when test=$fop.version = '0.20.5'1/xsl:when + xsl:otherwise0/xsl:otherwise +/xsl:choose + /xsl:param + !--xsl:param name=draft.watermark.image select=concat($docbook.xsl.root, '/images/draft.png')/-- + !-- Fonts, default alignment -- + xsl:param name=body.font.family select='Palatino'/ + xsl:param name=body.font.master select='10.5'/ + !--### 0.93 fixups -### -- - !-- Need to verify OK for 0.20.5 -- -xsl:attribute-set name=table.properties - xsl:attribute name=keep-together.within-columnauto/xsl:attribute -/xsl:attribute-set - -xsl:attribute-set name=orderedlist.properties - xsl:attribute name=margin-left0.25in/xsl:attribute -/xsl:attribute-set - -xsl:attribute-set name=itemizedlist.properties - xsl:attribute name=margin-left0.25in/xsl:attribute -/xsl:attribute-set - - -!--### +### -- + !-- Need to verify OK for 0.20.5 -- + xsl:attribute-set name=table.properties +xsl:attribute name=keep-together.within-columnauto/xsl:attribute + /xsl:attribute-set + xsl:attribute-set name=orderedlist.properties +xsl:attribute name=margin-left0.25in/xsl:attribute + /xsl:attribute-set + xsl:attribute-set name=itemizedlist.properties +xsl:attribute name=margin-left0.25in/xsl:attribute + /xsl:attribute-set + !--### olink styling -### -- - xsl:param name=insert.xref.page.number select='yes'/ - xsl:param name=insert.olink.pdf.frag select=1/ - +### -- + xsl:param name=insert.xref.page.number select='yes'/ + xsl:param name=insert.olink.pdf.frag
svn commit: r943503 - in /uima/build/trunk/uima-assembly-single-project: ./ pom.xml src/ src/main/ src/main/resources/ src/main/resources/assemblies/ src/main/resources/assemblies/uima-single-project-
Author: schor
Date: Wed May 12 14:15:56 2010
New Revision: 943503
URL: http://svn.apache.org/viewvc?rev=943503view=rev
Log:
[UIMA-1756] add parent single-project assembly bin descriptor
Added:
uima/build/trunk/uima-assembly-single-project/pom.xml
uima/build/trunk/uima-assembly-single-project/src/
uima/build/trunk/uima-assembly-single-project/src/main/
uima/build/trunk/uima-assembly-single-project/src/main/resources/
uima/build/trunk/uima-assembly-single-project/src/main/resources/assemblies/
uima/build/trunk/uima-assembly-single-project/src/main/resources/assemblies/uima-single-project-bin.xml
Modified:
uima/build/trunk/uima-assembly-single-project/ (props changed)
Propchange: uima/build/trunk/uima-assembly-single-project/
--
--- svn:ignore (added)
+++ svn:ignore Wed May 12 14:15:56 2010
@@ -0,0 +1,2 @@
+target
+.project
Added: uima/build/trunk/uima-assembly-single-project/pom.xml
URL:
http://svn.apache.org/viewvc/uima/build/trunk/uima-assembly-single-project/pom.xml?rev=943503view=auto
==
--- uima/build/trunk/uima-assembly-single-project/pom.xml (added)
+++ uima/build/trunk/uima-assembly-single-project/pom.xml Wed May 12 14:15:56
2010
@@ -0,0 +1,92 @@
+!--
+ 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 holds common, factored-out settings for all
+ projects that are packaged as single projects
+ (that is, not as multi-module projects).
+
+ It builds, in addition to the standard artifacts and attachments,
+ a binary artifact, which includes:
+ - The main generated artifact, in the lib/ dir
+ - dependent artifacts needed at runtime (not otherwise provided), in
the lib/ dir
+ - Lic/Not/Readme/releaseNotes from root dir
+ - generated documentation in the docs/ dir
+ - other folders per the PEAR spec at the top level
+ -- bin folders - we set execute permissions on .sh
+
+ At release time the standard Apache parent builds the
+ - source-release artifact, and the
+ - javadocs artifact
+
+ Conventions:
+
+ License/Notice for Jar: using the uimaj-jar-resource-bundle
+ License/Notice for bin: using files from project top level
+ dependencies on other artifacts:
+ Specified as scope runtime or compile causes these to be included in
the lib dir
+ Other top level directories per the PEAR conventions
+ copied to the assembly xxx/ directory
+ typically used for bin - scripts, and other binary resources
+ bin - sets execution flags
+ --
+
+project xmlns=http://maven.apache.org/POM/4.0.0;
+ xmlns:xsi=http://www.w3.org/2001/XMLSchema-instance;
+ xsi:schemaLocation=http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd;
+ modelVersion4.0.0/modelVersion
+
+ parent
+groupIdorg.apache.uima/groupId
+artifactIdparent-pom-docbook/artifactId
+version1-SNAPSHOT/version
+relativePath/
+ /parent
+
+ artifactIduima-assembly-single-project/artifactId
+ version1-SNAPSHOT/version
+ nameUIMA ${project.artifactId}/name
+ descriptionassembly descriptor for single-project/description
+ url${uimaWebsiteUrl}/url
+
+ !-- Special inheritance note
+ even though the scm element that follows is exactly the
+ same as those in super poms, it cannot be inherited because
+ there is some special code that incorrectly computes the
+ connection elements from the chain of parent poms, if this is omitted.
+
+ Keeping this a bit factored allows cutting/pasting the scm
+ element, and just changing the following two properties --
+ scm
+connection
+
scm:svn:http://svn.apache.org/repos/asf/uima/${uimaScmRoot}/trunk/${uimaScmProject}
+/connection
+developerConnection
+
scm:svn:https://svn.apache.org/repos/asf/uima/${uimaScmRoot}/trunk/${uimaScmProject}
+/developerConnection
+url
+ http://svn.apache.org/viewvc/uima/${uimaScmRoot}/trunk/${uimaScmProject}
+/url
+ /scm
+
+ properties
+uimaScmRootbuild
svn commit: r943505 - in /uima/build/trunk/uima-build-helper-maven-plugin: ./ src/ src/main/ src/main/java/ src/main/java/org/ src/main/java/org/apache/ src/main/java/org/apache/uima/ src/main/java/or
Author: schor Date: Wed May 12 14:18:51 2010 New Revision: 943505 URL: http://svn.apache.org/viewvc?rev=943505view=rev Log: [UIMA-1756] maven helper plugin - used to format the build date month and year and set maven properties with result Added: uima/build/trunk/uima-build-helper-maven-plugin/pom.xml uima/build/trunk/uima-build-helper-maven-plugin/src/ uima/build/trunk/uima-build-helper-maven-plugin/src/main/ uima/build/trunk/uima-build-helper-maven-plugin/src/main/java/ uima/build/trunk/uima-build-helper-maven-plugin/src/main/java/org/ uima/build/trunk/uima-build-helper-maven-plugin/src/main/java/org/apache/ uima/build/trunk/uima-build-helper-maven-plugin/src/main/java/org/apache/uima/ uima/build/trunk/uima-build-helper-maven-plugin/src/main/java/org/apache/uima/buildhelper/ uima/build/trunk/uima-build-helper-maven-plugin/src/main/java/org/apache/uima/buildhelper/ParseDateTime.java uima/build/trunk/uima-build-helper-maven-plugin/src/main/java/org/apache/uima/buildhelper/ParseSpec.java uima/build/trunk/uima-build-helper-maven-plugin/src/site/ uima/build/trunk/uima-build-helper-maven-plugin/src/site/apt/ uima/build/trunk/uima-build-helper-maven-plugin/src/site/apt/index.apt uima/build/trunk/uima-build-helper-maven-plugin/src/site/apt/usage.apt.vm uima/build/trunk/uima-build-helper-maven-plugin/src/site/site.xml Modified: uima/build/trunk/uima-build-helper-maven-plugin/ (props changed) Propchange: uima/build/trunk/uima-build-helper-maven-plugin/ -- --- svn:ignore (added) +++ svn:ignore Wed May 12 14:18:51 2010 @@ -0,0 +1,4 @@ +.settings +target +.classpath +.project Added: uima/build/trunk/uima-build-helper-maven-plugin/pom.xml URL: http://svn.apache.org/viewvc/uima/build/trunk/uima-build-helper-maven-plugin/pom.xml?rev=943505view=auto == --- uima/build/trunk/uima-build-helper-maven-plugin/pom.xml (added) +++ uima/build/trunk/uima-build-helper-maven-plugin/pom.xml Wed May 12 14:18:51 2010 @@ -0,0 +1,70 @@ +project xmlns=http://maven.apache.org/POM/4.0.0; xmlns:xsi=http://www.w3.org/2001/XMLSchema-instance; + xsi:schemaLocation=http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd; + modelVersion4.0.0/modelVersion + + parent +artifactIdmaven-plugins/artifactId +groupIdorg.apache.maven.plugins/groupId +version18/version + /parent + + groupIdorg.apache.uima/groupId + artifactIduima-build-helper/artifactId + version1.0.0-SNAPSHOT/version + packagingmaven-plugin/packaging + + nameuima-build-helper Maven Plugin/name + inceptionYear2010/inceptionYear + urlhttp://maven.apache.org/url + + properties +project.build.sourceEncodingUTF-8/project.build.sourceEncoding + /properties + + dependencies +dependency + groupIdorg.apache.maven/groupId + artifactIdmaven-plugin-api/artifactId + version2.0/version +/dependency +dependency + groupIdorg.apache.maven/groupId + artifactIdmaven-model/artifactId + version2.0.9/version +/dependency +dependency + groupIdorg.apache.maven/groupId + artifactIdmaven-project/artifactId + version2.0.9/version +/dependency + + +dependency + groupIdjunit/groupId + artifactIdjunit/artifactId + version3.8.1/version + scopetest/scope +/dependency + /dependencies + + build +plugins + plugin +groupIdorg.apache.maven.plugins/groupId +artifactIdmaven-plugin-plugin/artifactId +version2.5.1/version +configuration + goalPrefixuima-build-helper/goalPrefix +/configuration +executions + execution +idgenerated-helpmojo/id +goals + goalhelpmojo/goal +/goals + /execution +/executions + /plugin +/plugins + /build +/project Added: uima/build/trunk/uima-build-helper-maven-plugin/src/main/java/org/apache/uima/buildhelper/ParseDateTime.java URL: http://svn.apache.org/viewvc/uima/build/trunk/uima-build-helper-maven-plugin/src/main/java/org/apache/uima/buildhelper/ParseDateTime.java?rev=943505view=auto == --- uima/build/trunk/uima-build-helper-maven-plugin/src/main/java/org/apache/uima/buildhelper/ParseDateTime.java (added) +++ uima/build/trunk/uima-build-helper-maven-plugin/src/main/java/org/apache/uima/buildhelper/ParseDateTime.java Wed May 12 14:18:51 2010 @@ -0,0 +1,78 @@ +/* + * 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
svn commit: r943514 - /uima/build/trunk/parent-poms/parent-pom-annotator/target/
Author: schor Date: Wed May 12 14:30:17 2010 New Revision: 943514 URL: http://svn.apache.org/viewvc?rev=943514view=rev Log: no Jira - target dir should not be in svn Removed: uima/build/trunk/parent-poms/parent-pom-annotator/target/
svn commit: r943529 - in /uima/sandbox/branches/mavenAlign/BSFAnnotator: DISCLAIMER desc/ desc/BSFAnnotator.xml pom.xml
Author: schor
Date: Wed May 12 14:51:43 2010
New Revision: 943529
URL: http://svn.apache.org/viewvc?rev=943529view=rev
Log:
[UIMA-1756] package as single-project, remove disclaimer, reformat POM to
conventions
Added:
uima/sandbox/branches/mavenAlign/BSFAnnotator/desc/
uima/sandbox/branches/mavenAlign/BSFAnnotator/desc/BSFAnnotator.xml
Removed:
uima/sandbox/branches/mavenAlign/BSFAnnotator/DISCLAIMER
Modified:
uima/sandbox/branches/mavenAlign/BSFAnnotator/pom.xml
Added: uima/sandbox/branches/mavenAlign/BSFAnnotator/desc/BSFAnnotator.xml
URL:
http://svn.apache.org/viewvc/uima/sandbox/branches/mavenAlign/BSFAnnotator/desc/BSFAnnotator.xml?rev=943529view=auto
==
--- uima/sandbox/branches/mavenAlign/BSFAnnotator/desc/BSFAnnotator.xml (added)
+++ uima/sandbox/branches/mavenAlign/BSFAnnotator/desc/BSFAnnotator.xml Wed May
12 14:51:43 2010
@@ -0,0 +1,77 @@
+?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.
+ ***
+--
+!-- This is a dummy descriptor, used to allow Pear packaging to work
+ Real uses of this annotator have to specify a type system that the
+ script will work with --
+analysisEngineDescription
+ xmlns=http://uima.apache.org/resourceSpecifier;
+ frameworkImplementation
+org.apache.uima.java
+ /frameworkImplementation
+ primitivetrue/primitive
+ annotatorImplementationName
+org.apache.uima.annotator.bsf.BSFAnnotator
+ /annotatorImplementationName
+
+ analysisEngineMetaData
+nameBean Scripting Framework (BSF) Annotator/name
+description
+ Runs annotator scripts using Apache's Bean Scripting Framework
+/description
+version${project.version}/version
+vendorThe Apache Software Foundation/vendor
+
+configurationParameters
+ configurationParameter
+nameSourceFile/name
+description
+ The name of the source file containing the
+ script to run.
+/description
+typeString/type
+multiValuedfalse/multiValued
+mandatorytrue/mandatory
+ /configurationParameter
+
+/configurationParameters
+
+configurationParameterSettings
+!--
+ nameValuePair
+nameSourceFile/name
+value
+ array
+string./string
+ /array
+/value
+ /nameValuePair
+--
+/configurationParameterSettings
+
+typeSystemDescription/
+fsIndexes /
+capabilities/
+
+ /analysisEngineMetaData
+/analysisEngineDescription
+
Modified: uima/sandbox/branches/mavenAlign/BSFAnnotator/pom.xml
URL:
http://svn.apache.org/viewvc/uima/sandbox/branches/mavenAlign/BSFAnnotator/pom.xml?rev=943529r1=943528r2=943529view=diff
==
--- uima/sandbox/branches/mavenAlign/BSFAnnotator/pom.xml (original)
+++ uima/sandbox/branches/mavenAlign/BSFAnnotator/pom.xml Wed May 12 14:51:43
2010
@@ -16,36 +16,74 @@
specific language governing permissions and limitations
under the License.
--
+
+!-- packaged as a single project.
+ PEAR packaging not appropriate, because user needs to define own type
system, etc.
+ --
+
project xmlns=http://maven.apache.org/POM/4.0.0;
xmlns:xsi=http://www.w3.org/2001/XMLSchema-instance;
xsi:schemaLocation=http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd;
modelVersion4.0.0/modelVersion
- groupIdorg.apache.uima/groupId
- artifactIdBSFAnnotator/artifactId
- packagingjar/packaging
- version${uimaj-release-version}/version
- nameApache UIMA Java Annotator - BSFAnnotator/name
- urlhttp://incubator.apache.org/uima/url
parent
groupIdorg.apache.uima/groupId
-artifactIdSandboxDistr/artifactId
-version2.3.0-incubating/version !-- this comment is a flag for
changeVersion --
-relativePath../SandboxDistr/relativePath
+artifactIdparent-pom-single-project/artifactId
+version1-SNAPSHOT/version
+relativePath
svn commit: r943530 - in /uima/sandbox/branches/mavenAlign/ConceptMapper: DISCLAIMER pom.xml src/docbook/ConceptMapperAnnotatorUserGuide.xml src/docbook/ConceptMapperAnnotatorUserGuide/
Author: schor
Date: Wed May 12 14:53:41 2010
New Revision: 943530
URL: http://svn.apache.org/viewvc?rev=943530view=rev
Log:
[UIMA-1756] package as PEAR,remove disclaimer, reformat POM to conventions,
fixup docbook
Removed:
uima/sandbox/branches/mavenAlign/ConceptMapper/DISCLAIMER
uima/sandbox/branches/mavenAlign/ConceptMapper/src/docbook/ConceptMapperAnnotatorUserGuide/
Modified:
uima/sandbox/branches/mavenAlign/ConceptMapper/pom.xml
uima/sandbox/branches/mavenAlign/ConceptMapper/src/docbook/ConceptMapperAnnotatorUserGuide.xml
Modified: uima/sandbox/branches/mavenAlign/ConceptMapper/pom.xml
URL:
http://svn.apache.org/viewvc/uima/sandbox/branches/mavenAlign/ConceptMapper/pom.xml?rev=943530r1=943529r2=943530view=diff
==
--- uima/sandbox/branches/mavenAlign/ConceptMapper/pom.xml (original)
+++ uima/sandbox/branches/mavenAlign/ConceptMapper/pom.xml Wed May 12 14:53:41
2010
@@ -16,6 +16,7 @@
specific language governing permissions and limitations
under the License.
--
+
project xmlns=http://maven.apache.org/POM/4.0.0;
xmlns:xsi=http://www.w3.org/2001/XMLSchema-instance;
xsi:schemaLocation=http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd;
modelVersion4.0.0/modelVersion
@@ -31,7 +32,36 @@
version2.3.1-SNAPSHOT/version
nameUIMA Annotator: ${project.artifactId}/name
descriptionExtracts concepts from a CAS/description
-
+ urlhttp://incubator.apache.org/uima/url
+
+ !-- Special inheritance note
+ even though the scm element that follows is exactly the
+ same as those in super poms, it cannot be inherited because
+ there is some special code that computes the connection elements
+ from the chain of parent poms, if this is omitted.
+
+ Keeping this a bit factored allows cutting/pasting the scm
+ element, and just changing the following two properties --
+ scm
+connection
+
scm:svn:http://svn.apache.org/repos/asf/uima/${uimaScmRoot}/trunk/${uimaScmProject}
+/connection
+developerConnection
+
scm:svn:https://svn.apache.org/repos/asf/uima/${uimaScmRoot}/trunk/${uimaScmProject}
+/developerConnection
+url
+ http://svn.apache.org/viewvc/uima/${uimaScmRoot}/trunk/${uimaScmProject}
+/url
+ /scm
+
+ properties
+uimaScmRootsandbox/uimaScmRoot
+uimaScmProject${project.artifactId}/uimaScmProject
+uimaDependencyVersion2.3.1-SNAPSHOT/uimaDependencyVersion
+
pearMainDescriptordesc/analysis_engine/primitive/ConceptMapperOffsetTokenizer.xml/pearMainDescriptor
+bookNameRootConceptMapperAnnotatorUserGuide/bookNameRoot
+ /properties
+
dependencies
dependency
groupIdorg.apache.uima/groupId
@@ -53,7 +83,6 @@
iddefault-cli/id
configuration
excludes
-excludedocs/html/images/*.svg/exclude !-- generated image
files for docbook --
excludesrc/main/java/org/apache/uima/conceptMapper/DictTerm.java/exclude
!-- generated --
excludesrc/main/java/org/apache/uima/conceptMapper/DictTerm_Type.java/exclude
!-- generated --
excludesrc/main/java/org/apache/uima/conceptMapper/support/tokenizer/TokenAnnotation.java/exclude
!-- generated --
Modified:
uima/sandbox/branches/mavenAlign/ConceptMapper/src/docbook/ConceptMapperAnnotatorUserGuide.xml
URL:
http://svn.apache.org/viewvc/uima/sandbox/branches/mavenAlign/ConceptMapper/src/docbook/ConceptMapperAnnotatorUserGuide.xml?rev=943530r1=943529r2=943530view=diff
==
---
uima/sandbox/branches/mavenAlign/ConceptMapper/src/docbook/ConceptMapperAnnotatorUserGuide.xml
(original)
+++
uima/sandbox/branches/mavenAlign/ConceptMapper/src/docbook/ConceptMapperAnnotatorUserGuide.xml
Wed May 12 14:53:41 2010
@@ -1,5 +1,5 @@
?xml version=1.0 encoding=UTF-8?
-!DOCTYPE chapter PUBLIC -//OASIS//DTD DocBook XML V4.5//EN
http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd; [
+!DOCTYPE chapter PUBLIC -//OASIS//DTD DocBook XML V4.4//EN
http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd; [
!ENTITY imgroot ./images/
!ENTITY % xinclude SYSTEM ../../../uima-docbook-tool/xinclude.mod
]
@@ -25,7 +25,7 @@
title
Apache UIMA ConceptMapper Annotator Documentation
/title
- xi:include xmlns:xi=http://www.w3.org/2001/XInclude;
href=../../../SandboxDocs/src/docbook/book_info.xml/
+ xi:include xmlns:xi=http://www.w3.org/2001/XInclude;
href=../../target/docbook-shared/common_book_info.xml/
preface id=intro
titleIntroduction/title
para
svn commit: r944713 - /uima/sandbox/trunk/aggregate-addons/
Author: schor Date: Sat May 15 20:29:40 2010 New Revision: 944713 URL: http://svn.apache.org/viewvc?rev=944713view=rev Log: [UIMA-1756] copy new aggregate-addons proj to sandbox trunk Added: uima/sandbox/trunk/aggregate-addons/ - copied from r944712, uima/sandbox/branches/mavenAlign/aggregate-addons/
svn commit: r945136 - in /uima/build/trunk: parent-poms/ parent-poms/parent-pom-annotator/ parent-poms/parent-pom-distr/ parent-poms/parent-pom-docbook/ parent-poms/parent-pom-eclipse-plugins-ibm-noti
Author: schor Date: Mon May 17 13:17:28 2010 New Revision: 945136 URL: http://svn.apache.org/viewvc?rev=945136view=rev Log: [UIMA-1756] add xml header to poms - specifying xml version 1.0 and utf-8 encoding Added: uima/build/trunk/parent-poms/target/ uima/build/trunk/parent-poms/target/rat.txt Modified: uima/build/trunk/parent-poms/parent-pom-annotator/pom.xml uima/build/trunk/parent-poms/parent-pom-distr/pom.xml uima/build/trunk/parent-poms/parent-pom-docbook/pom.xml uima/build/trunk/parent-poms/parent-pom-eclipse-plugins-ibm-notice/pom.xml uima/build/trunk/parent-poms/parent-pom-eclipse-plugins/pom.xml uima/build/trunk/parent-poms/parent-pom-ibm-notice/pom.xml uima/build/trunk/parent-poms/parent-pom-single-project/pom.xml uima/build/trunk/parent-poms/parent-pom-top/pom.xml uima/build/trunk/parent-poms/pom.xml uima/build/trunk/uima-build-helper-maven-plugin/pom.xml uima/build/trunk/uima-docbook-olink/pom.xml uima/build/trunk/uima-docbook-resource-bundle/pom.xml uima/build/trunk/uima-jar-resource-bundle/pom.xml Modified: uima/build/trunk/parent-poms/parent-pom-annotator/pom.xml URL: http://svn.apache.org/viewvc/uima/build/trunk/parent-poms/parent-pom-annotator/pom.xml?rev=945136r1=945135r2=945136view=diff == --- uima/build/trunk/parent-poms/parent-pom-annotator/pom.xml (original) +++ uima/build/trunk/parent-poms/parent-pom-annotator/pom.xml Mon May 17 13:17:28 2010 @@ -1,3 +1,4 @@ +?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 Modified: uima/build/trunk/parent-poms/parent-pom-distr/pom.xml URL: http://svn.apache.org/viewvc/uima/build/trunk/parent-poms/parent-pom-distr/pom.xml?rev=945136r1=945135r2=945136view=diff == --- uima/build/trunk/parent-poms/parent-pom-distr/pom.xml (original) +++ uima/build/trunk/parent-poms/parent-pom-distr/pom.xml Mon May 17 13:17:28 2010 @@ -1,3 +1,4 @@ +?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 Modified: uima/build/trunk/parent-poms/parent-pom-docbook/pom.xml URL: http://svn.apache.org/viewvc/uima/build/trunk/parent-poms/parent-pom-docbook/pom.xml?rev=945136r1=945135r2=945136view=diff == --- uima/build/trunk/parent-poms/parent-pom-docbook/pom.xml (original) +++ uima/build/trunk/parent-poms/parent-pom-docbook/pom.xml Mon May 17 13:17:28 2010 @@ -1,3 +1,4 @@ +?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 Modified: uima/build/trunk/parent-poms/parent-pom-eclipse-plugins-ibm-notice/pom.xml URL: http://svn.apache.org/viewvc/uima/build/trunk/parent-poms/parent-pom-eclipse-plugins-ibm-notice/pom.xml?rev=945136r1=945135r2=945136view=diff == --- uima/build/trunk/parent-poms/parent-pom-eclipse-plugins-ibm-notice/pom.xml (original) +++ uima/build/trunk/parent-poms/parent-pom-eclipse-plugins-ibm-notice/pom.xml Mon May 17 13:17:28 2010 @@ -1,3 +1,4 @@ +?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 Modified: uima/build/trunk/parent-poms/parent-pom-eclipse-plugins/pom.xml URL: http://svn.apache.org/viewvc/uima/build/trunk/parent-poms/parent-pom-eclipse-plugins/pom.xml?rev=945136r1=945135r2=945136view=diff == --- uima/build/trunk/parent-poms/parent-pom-eclipse-plugins/pom.xml (original) +++ uima/build/trunk/parent-poms/parent-pom-eclipse-plugins/pom.xml Mon May 17 13:17:28 2010 @@ -1,3 +1,4 @@ +?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 Modified: uima/build/trunk/parent-poms/parent-pom-ibm-notice/pom.xml URL: http://svn.apache.org/viewvc/uima/build/trunk/parent-poms/parent-pom-ibm-notice/pom.xml?rev=945136r1=945135r2=945136view=diff == --- uima/build/trunk/parent-poms/parent-pom-ibm-notice/pom.xml (original) +++ uima/build/trunk/parent-poms/parent-pom-ibm-notice/pom.xml Mon May 17 13:17:28 2010 @@ -1,3 +1,4 @@ +?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 Modified: uima/build/trunk/parent-poms/parent-pom-single-project/pom.xml URL: http
svn commit: r945137 - in /uima/uima-as/trunk: aggregate-uima-as-eclipse-plugins/ aggregate-uima-as/ uima-as-distr/ uima-as-distr/src/main/examples/run_configuration/ uima-as-docbooks/ uimaj-as-activem
Author: schor
Date: Mon May 17 13:17:35 2010
New Revision: 945137
URL: http://svn.apache.org/viewvc?rev=945137view=rev
Log:
[UIMA-1756] add xml header to poms - specifying xml version 1.0 and utf-8
encoding
Modified:
uima/uima-as/trunk/aggregate-uima-as-eclipse-plugins/pom.xml
uima/uima-as/trunk/aggregate-uima-as/pom.xml
uima/uima-as/trunk/uima-as-distr/pom.xml
uima/uima-as/trunk/uima-as-distr/src/main/examples/run_configuration/UIMA
Deploy AS Service.launch
uima/uima-as/trunk/uima-as-distr/src/main/examples/run_configuration/UIMA
Run Remote Async AE.launch
uima/uima-as/trunk/uima-as-docbooks/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
uima/uima-as/trunk/uimaj-as-osgi-runtime/pom.xml
uima/uima-as/trunk/uimaj-eclipse-feature-deployeditor/pom.xml
uima/uima-as/trunk/uimaj-ep-deployeditor/pom.xml
uima/uima-as/trunk/uimaj-ep-runtime-deployeditor/pom.xml
Modified: uima/uima-as/trunk/aggregate-uima-as-eclipse-plugins/pom.xml
URL:
http://svn.apache.org/viewvc/uima/uima-as/trunk/aggregate-uima-as-eclipse-plugins/pom.xml?rev=945137r1=945136r2=945137view=diff
==
--- uima/uima-as/trunk/aggregate-uima-as-eclipse-plugins/pom.xml (original)
+++ uima/uima-as/trunk/aggregate-uima-as-eclipse-plugins/pom.xml Mon May 17
13:17:35 2010
@@ -1,3 +1,4 @@
+?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
@@ -16,7 +17,6 @@
specific language governing permissions and limitations
under the License.
--
-
project xmlns=http://maven.apache.org/POM/4.0.0;
xmlns:xsi=http://www.w3.org/2001/XMLSchema-instance;
xsi:schemaLocation=http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd;
Modified: uima/uima-as/trunk/aggregate-uima-as/pom.xml
URL:
http://svn.apache.org/viewvc/uima/uima-as/trunk/aggregate-uima-as/pom.xml?rev=945137r1=945136r2=945137view=diff
==
--- uima/uima-as/trunk/aggregate-uima-as/pom.xml (original)
+++ uima/uima-as/trunk/aggregate-uima-as/pom.xml Mon May 17 13:17:35 2010
@@ -1,3 +1,4 @@
+?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
Modified: uima/uima-as/trunk/uima-as-distr/pom.xml
URL:
http://svn.apache.org/viewvc/uima/uima-as/trunk/uima-as-distr/pom.xml?rev=945137r1=945136r2=945137view=diff
==
--- uima/uima-as/trunk/uima-as-distr/pom.xml (original)
+++ uima/uima-as/trunk/uima-as-distr/pom.xml Mon May 17 13:17:35 2010
@@ -1,3 +1,4 @@
+?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
Modified:
uima/uima-as/trunk/uima-as-distr/src/main/examples/run_configuration/UIMA
Deploy AS Service.launch
URL:
http://svn.apache.org/viewvc/uima/uima-as/trunk/uima-as-distr/src/main/examples/run_configuration/UIMA%20Deploy%20AS%20Service.launch?rev=945137r1=945136r2=945137view=diff
==
--- uima/uima-as/trunk/uima-as-distr/src/main/examples/run_configuration/UIMA
Deploy AS Service.launch (original)
+++ uima/uima-as/trunk/uima-as-distr/src/main/examples/run_configuration/UIMA
Deploy AS Service.launch Mon May 17 13:17:35 2010
@@ -1,39 +1,23 @@
-?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.
---
+?xml version=1.0 encoding=UTF-8 standalone=no?
launchConfiguration type=org.eclipse.jdt.launching.localJavaApplication
-stringAttribute key=org.eclipse.jdt.launching.MAIN_TYPE
value=org.apache.uima.adapter.jms.service.UIMA_Service/
-stringAttribute key=org.eclipse.jdt.launching.PROGRAM_ARGUMENTS
value=-saxonURL quot;file:${env_var:UIMA_HOME}/saxon/saxon8.jarquot; -xslt
quot;${env_var:UIMA_HOME}/bin/dd2spring.xslquot; -dd
svn commit: r947628 - in /uima/build/trunk: parent-poms/parent-pom-docbook/pom.xml uima-docbook-olink/src/main/docbook-olink/html/site.xml uima-docbook-olink/src/main/docbook-olink/htmlsingle/site.xml
Author: schor
Date: Mon May 24 12:52:55 2010
New Revision: 947628
URL: http://svn.apache.org/viewvc?rev=947628view=rev
Log:
[UIMA-1790] update olink site info for docbook output in to target/site/d
Modified:
uima/build/trunk/parent-poms/parent-pom-docbook/pom.xml
uima/build/trunk/uima-docbook-olink/src/main/docbook-olink/html/site.xml
uima/build/trunk/uima-docbook-olink/src/main/docbook-olink/htmlsingle/site.xml
uima/build/trunk/uima-docbook-olink/src/main/docbook-olink/pdf/site.xml
Modified: uima/build/trunk/parent-poms/parent-pom-docbook/pom.xml
URL:
http://svn.apache.org/viewvc/uima/build/trunk/parent-poms/parent-pom-docbook/pom.xml?rev=947628r1=947627r2=947628view=diff
==
--- uima/build/trunk/parent-poms/parent-pom-docbook/pom.xml (original)
+++ uima/build/trunk/parent-poms/parent-pom-docbook/pom.xml Mon May 24 12:52:55
2010
@@ -300,7 +300,6 @@
version2.0.10/version
configuration !-- general configuration for both html and pdf
--
sourceDirectory${basedir}/src/docbook/sourceDirectory
-
targetDirectory${project.build.directory}/site/d/targetDirectory
includes${bookNameRoot}.xml/includes
highlightSource1/highlightSource
xincludeSupportedtrue/xincludeSupported
@@ -315,6 +314,7 @@
/goals
phasepackage/phase
configuration
+
targetDirectory${project.build.directory}/site/d/targetDirectory
htmlCustomization${project.build.directory}/docbook-shared/top/html-single.xsl/htmlCustomization
!-- olink --
targetDatabaseDocumentfile:///${dolUnzipped}/htmlsingle/site.xml/targetDatabaseDocument
@@ -326,6 +326,10 @@
goalsgoalgenerate-pdf/goal/goals
phasepackage/phase
configuration
+ !-- pdf: generate first in docbkx, then move.
+ because pdf generates an extra temp file xxx.fo
+ which we want to keep a bit in target in case of debug
need --
+
foCustomization${project.build.directory}/docbook-shared/top/pdf.xsl/foCustomization
!-- olink --
targetDatabaseDocumentfile:///${dolUnzipped}/pdf/site.xml/targetDatabaseDocument
@@ -427,7 +431,7 @@
goalsgoalcopy-resources/goal/goals
phasepackage/phase
configuration
-
outputDirectory${project.build.directory}/docbkx/html/images/outputDirectory
+
outputDirectory${project.build.directory}/site/d/images/outputDirectory
resources
resourcedirectorysrc/docbook/images/directory/resource
/resources
@@ -439,13 +443,27 @@
goalsgoalcopy-resources/goal/goals
phasepackage/phase
configuration
-
outputDirectory${project.build.directory}/docbkx/html/css/outputDirectory
+
outputDirectory${project.build.directory}/site/d/css/outputDirectory
resources
resourcedirectory${project.build.directory}/docbook-shared/css/directory/resource
/resources
/configuration
/execution
-
+ !-- move the pdf from the docbkx to the site/d/ --
+ execution
+iddocbook-move-pdf/id
+goalsgoalcopy-resources/goal/goals !-- no move
goal, use copy --
+phasepackage/phase
+configuration
+
outputDirectory${project.build.directory}/site/d/outputDirectory
+ resources
+resource
+
directory${project.build.directory}/docbkx/pdf/directory
+ excludesexclude**.fo/exclude/excludes
+/resource
+ /resources
+/configuration
+ /execution
/executions
/plugin
/plugins
Modified:
uima/build/trunk/uima-docbook-olink/src/main/docbook-olink/html/site.xml
URL:
http://svn.apache.org/viewvc/uima/build/trunk/uima-docbook-olink/src/main/docbook-olink/html/site.xml?rev=947628r1=947627r2=947628view=diff
==
--- uima/build/trunk/uima-docbook-olink/src/main/docbook-olink/html/site.xml
(original)
+++ uima/build/trunk/uima-docbook-olink/src/main/docbook-olink/html/site.xml
Mon May 24 12:52:55 2010
@@ -29,27 +29,42 @@ under the License.
targetsetinfoUIMA books olinks/targetsetinfo
!-- Site map for generating relative paths between documents --
+ !--
+base-url
+ artifactId
+d
svn commit: r951405 - /uima/build/trunk/parent-poms/parent-pom-top/pom.xml
Author: schor Date: Fri Jun 4 13:33:48 2010 New Revision: 951405 URL: http://svn.apache.org/viewvc?rev=951405view=rev Log: no Jira - fix spelling of jira url Modified: uima/build/trunk/parent-poms/parent-pom-top/pom.xml Modified: uima/build/trunk/parent-poms/parent-pom-top/pom.xml URL: http://svn.apache.org/viewvc/uima/build/trunk/parent-poms/parent-pom-top/pom.xml?rev=951405r1=951404r2=951405view=diff == --- uima/build/trunk/parent-poms/parent-pom-top/pom.xml (original) +++ uima/build/trunk/parent-poms/parent-pom-top/pom.xml Fri Jun 4 13:33:48 2010 @@ -133,7 +133,10 @@ issueManagement systemJira/system -urlhttp://issues.apache.org/jira/uima/url +!-- the form of the url is from http://maven.apache.org/plugins/maven-changes-plugin/usage.html -- + !--urlhttps://issues.apache.org/jira/BrowseProject.jspa?projectId=12310570/url-- +urlhttps://issues.apache.org/jira/browse/UIMA/url + /issueManagement !--ciManagement
svn commit: r951407 - /uima/build/trunk/parent-poms/
Author: schor Date: Fri Jun 4 13:37:04 2010 New Revision: 951407 URL: http://svn.apache.org/viewvc?rev=951407view=rev Log: no Jira - add target to svnignore Modified: uima/build/trunk/parent-poms/ (props changed) Propchange: uima/build/trunk/parent-poms/ -- --- svn:ignore (original) +++ svn:ignore Fri Jun 4 13:37:04 2010 @@ -1,2 +1,3 @@ .project .settings +target
svn commit: r951473 - in /uima/sandbox/trunk/SimpleServer/src/main/java/org/apache/uima/simpleserver/servlet: ResultMerger.java SimpleServerServlet.java
Author: schor Date: Fri Jun 4 16:13:21 2010 New Revision: 951473 URL: http://svn.apache.org/viewvc?rev=951473view=rev Log: [UIMA-1795] remove csv option from help text - not supported Modified: uima/sandbox/trunk/SimpleServer/src/main/java/org/apache/uima/simpleserver/servlet/ResultMerger.java uima/sandbox/trunk/SimpleServer/src/main/java/org/apache/uima/simpleserver/servlet/SimpleServerServlet.java Modified: uima/sandbox/trunk/SimpleServer/src/main/java/org/apache/uima/simpleserver/servlet/ResultMerger.java URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/SimpleServer/src/main/java/org/apache/uima/simpleserver/servlet/ResultMerger.java?rev=951473r1=951472r2=951473view=diff == --- uima/sandbox/trunk/SimpleServer/src/main/java/org/apache/uima/simpleserver/servlet/ResultMerger.java (original) +++ uima/sandbox/trunk/SimpleServer/src/main/java/org/apache/uima/simpleserver/servlet/ResultMerger.java Fri Jun 4 16:13:21 2010 @@ -94,12 +94,15 @@ public class ResultMerger extends Simple + li/btext/b - the value of this parameter is the text to analyze. Expected + encoding is UTF-8. This parameter must always be set. + li/bmode/b - the value of this parameter is either -+ quot;bxml/bquot;, quot;binline/bquot; or quot;bcsv/bquot;. ++ quot;bxml/bquot; or quot;binline/bquot;. +//+ or quot;bcsv/bquot;. // Jira 1795 + This parameter allows you to define, which view of the result should be returned. -+ quot;bxml/bquot; means to output the result as a XML-document containing a list of found entities, ++ quot;bxml/bquot; means to output the result as a XML-document containing a list of found entities, and + quot;binline/bquot; returns inline-xml containing the analyzed text in which all found entities are -+ represented by tags, and quot;bcsv/bquot; returns the found entities -+ in a comma-separated list. If this parameter is not set, xml output will be produced. ++ represented by tags. +//+ , and quot;bcsv/bquot; returns the found entities //Jira 1795 +//+ in a comma-separated list. ++ If this parameter is not set, xml output will be produced. + + li/burl1/b, burl2/b, burl3/b, etc. - the values of these parameters are the + URLs of other simple UIMA services which are to be invoked. Modified: uima/sandbox/trunk/SimpleServer/src/main/java/org/apache/uima/simpleserver/servlet/SimpleServerServlet.java URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/SimpleServer/src/main/java/org/apache/uima/simpleserver/servlet/SimpleServerServlet.java?rev=951473r1=951472r2=951473view=diff == --- uima/sandbox/trunk/SimpleServer/src/main/java/org/apache/uima/simpleserver/servlet/SimpleServerServlet.java (original) +++ uima/sandbox/trunk/SimpleServer/src/main/java/org/apache/uima/simpleserver/servlet/SimpleServerServlet.java Fri Jun 4 16:13:21 2010 @@ -120,7 +120,7 @@ public class SimpleServerServlet extends + containing a list of found entities); options.put(inline, returns inline-xml containing the analyzed + text in which all found entities are represented by tags); -options.put(csv, returns the found entities in a comma-separated list); +//options.put(csv, returns the found entities in a comma-separated list); // Jira 1795 this.servletPOSTParamOptions.put(MODE_PARAMETER, options); this.servletPOSTParameters.put(lang, This parameter sets the language
svn commit: r952350 - /uima/build/trunk/uima-docbook-olink/pom.xml
Author: schor
Date: Mon Jun 7 17:48:27 2010
New Revision: 952350
URL: http://svn.apache.org/viewvc?rev=952350view=rev
Log:
[UIMA-1806] change parent to top. Change zip build to build in target; install
will copy to repo.
Modified:
uima/build/trunk/uima-docbook-olink/pom.xml
Modified: uima/build/trunk/uima-docbook-olink/pom.xml
URL:
http://svn.apache.org/viewvc/uima/build/trunk/uima-docbook-olink/pom.xml?rev=952350r1=952349r2=952350view=diff
==
--- uima/build/trunk/uima-docbook-olink/pom.xml (original)
+++ uima/build/trunk/uima-docbook-olink/pom.xml Mon Jun 7 17:48:27 2010
@@ -20,7 +20,7 @@
project xmlns=http://maven.apache.org/POM/4.0.0;
xmlns:xsi=http://www.w3.org/2001/XMLSchema-instance;
xsi:schemaLocation=http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd;
modelVersion4.0.0/modelVersion
parent
-artifactIdparent-pom-docbook/artifactId
+artifactIdparent-pom-top/artifactId
groupIdorg.apache.uima/groupId
version1-SNAPSHOT/version
relativePath/
@@ -78,9 +78,17 @@
properties
uimaScmRootbuild/uimaScmRoot
uimaScmProject${project.artifactId}/uimaScmProject
+!-- olink databases are defined in a common superpom of this and the
parent-pom-docbook
+ to avoid circular references --
/properties
build
+!-- FLOW:
+
+ The build step builds the new olink in the local repo, and
+ at the very end, zips the result into the target, where
+ it is attached
+--
plugins
!-- Copy the site.xml files from
src/main/resources --
@@ -110,8 +118,9 @@
to update any repo-newer items without overwriting
existing unzipped-newer items --
- !-- this next just downloads if needed the olink-dbs
+ !-- this next just downloads (if not already there) the olink-dbs
zip file from a remote repo into the local one --
+ !-- downloads all versions (but we should only have 1-SNAPSHOT) --
plugin
groupIdorg.apache.maven.plugins/groupId
artifactIdmaven-dependency-plugin/artifactId
@@ -177,7 +186,7 @@
phasepackage/phase
configuration
tasks
-zip destfile=${dolRepo}/${dolZip}
+zip destfile=${project.build.directory}/${dolZip}
basedir=${dolUnzipped}/
/tasks
/configuration
@@ -197,7 +206,7 @@
configuration
artifacts
artifact
- file${dolRepo}/${dolZip}/file
+ file${project.build.directory}/${dolZip}/file
typezip/type
classifier${dolClassifier}/classifier
/artifact
svn commit: r952360 - /uima/build/trunk/uima-assembly-single-project/
Author: schor Date: Mon Jun 7 18:23:06 2010 New Revision: 952360 URL: http://svn.apache.org/viewvc?rev=952360view=rev Log: no jira add .classpath and .settings to svn ignore Modified: uima/build/trunk/uima-assembly-single-project/ (props changed) Propchange: uima/build/trunk/uima-assembly-single-project/ -- --- svn:ignore (original) +++ svn:ignore Mon Jun 7 18:23:06 2010 @@ -1,2 +1,4 @@ target .project +.settings +.classpath
svn commit: r952362 - /uima/build/trunk/parent-poms/parent-pom-top/pom.xml
Author: schor Date: Mon Jun 7 18:44:02 2010 New Revision: 952362 URL: http://svn.apache.org/viewvc?rev=952362view=rev Log: [UIMA-1806] add release.properties to RAT excludes - a generated file, part of release Modified: uima/build/trunk/parent-poms/parent-pom-top/pom.xml Modified: uima/build/trunk/parent-poms/parent-pom-top/pom.xml URL: http://svn.apache.org/viewvc/uima/build/trunk/parent-poms/parent-pom-top/pom.xml?rev=952362r1=952361r2=952362view=diff == --- uima/build/trunk/parent-poms/parent-pom-top/pom.xml (original) +++ uima/build/trunk/parent-poms/parent-pom-top/pom.xml Mon Jun 7 18:44:02 2010 @@ -509,6 +509,11 @@ executions execution iddefault-cli/id +configuration + excludes +excluderelease.properties/exclude + /excludes +/configuration /execution /executions /plugin
svn commit: r952363 - /uima/build/trunk/parent-poms/pom.xml
Author: schor Date: Mon Jun 7 18:45:33 2010 New Revision: 952363 URL: http://svn.apache.org/viewvc?rev=952363view=rev Log: [UIMA-1806] add missing proj uima-assembly-single-project Modified: uima/build/trunk/parent-poms/pom.xml Modified: uima/build/trunk/parent-poms/pom.xml URL: http://svn.apache.org/viewvc/uima/build/trunk/parent-poms/pom.xml?rev=952363r1=952362r2=952363view=diff == --- uima/build/trunk/parent-poms/pom.xml (original) +++ uima/build/trunk/parent-poms/pom.xml Mon Jun 7 18:45:33 2010 @@ -73,6 +73,7 @@ !-- build single projects -- moduleparent-pom-annotator/module moduleparent-pom-single-project/module +module../uima-assembly-single-project/module module../uima-build-helper-maven-plugin/module !--module../uima-docbook-olink/module-- !-- not released -- module../uima-docbook-resource-bundle/module
svn commit: r952372 - /uima/build/trunk/parent-poms/pom.xml
Author: schor Date: Mon Jun 7 19:13:47 2010 New Revision: 952372 URL: http://svn.apache.org/viewvc?rev=952372view=rev Log: [UIMA-1806] omit the top, because this pom depends on it (release:prepare fails) Modified: uima/build/trunk/parent-poms/pom.xml Modified: uima/build/trunk/parent-poms/pom.xml URL: http://svn.apache.org/viewvc/uima/build/trunk/parent-poms/pom.xml?rev=952372r1=952371r2=952372view=diff == --- uima/build/trunk/parent-poms/pom.xml (original) +++ uima/build/trunk/parent-poms/pom.xml Mon Jun 7 19:13:47 2010 @@ -63,7 +63,8 @@ /properties modules -moduleparent-pom-top/module +!-- can't build the top, because this pom depends on it as a parent -- +!--moduleparent-pom-top/module-- moduleparent-pom-docbook/module moduleparent-pom-ibm-notice/module moduleparent-pom-eclipse-plugins/module
svn commit: r952373 - /uima/build/trunk/parent-poms/parent-pom-top/pom.xml
Author: schor
Date: Mon Jun 7 19:15:18 2010
New Revision: 952373
URL: http://svn.apache.org/viewvc?rev=952373view=rev
Log:
[maven-release-plugin] prepare release parent-pom-top-1
Modified:
uima/build/trunk/parent-poms/parent-pom-top/pom.xml
Modified: uima/build/trunk/parent-poms/parent-pom-top/pom.xml
URL:
http://svn.apache.org/viewvc/uima/build/trunk/parent-poms/parent-pom-top/pom.xml?rev=952373r1=952372r2=952373view=diff
==
--- uima/build/trunk/parent-poms/parent-pom-top/pom.xml (original)
+++ uima/build/trunk/parent-poms/parent-pom-top/pom.xml Mon Jun 7 19:15:18 2010
@@ -43,19 +43,19 @@
It contains one build step to set the build time stamp
--
-project xsi:schemaLocation=http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd;
xmlns=http://maven.apache.org/POM/4.0.0;
xmlns:xsi=http://www.w3.org/2001/XMLSchema-instance;
+project xmlns=http://maven.apache.org/POM/4.0.0;
xmlns:xsi=http://www.w3.org/2001/XMLSchema-instance;
xsi:schemaLocation=http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd;
modelVersion4.0.0/modelVersion
parent
artifactIdapache/artifactId
groupIdorg.apache/groupId
version7/version
-relativePath/
+relativePath /
/parent
groupIdorg.apache.uima/groupId
artifactIdparent-pom-top/artifactId
- version1-SNAPSHOT/version
+ version1/version
packagingpom/packaging
nameUIMA ${project.artifactId}/name
@@ -121,13 +121,13 @@
scm
connection
-
scm:svn:http://svn.apache.org/repos/asf/uima/${uimaScmRoot}/trunk/${uimaScmProject}
+ scm:svn:http://svn.apache.org/repos/asf/uima/build/tags/parent-pom-top-1
/connection
developerConnection
-
scm:svn:https://svn.apache.org/repos/asf/uima/${uimaScmRoot}/trunk/${uimaScmProject}
+ scm:svn:https://svn.apache.org/repos/asf/uima/build/tags/parent-pom-top-1
/developerConnection
url
- http://svn.apache.org/viewvc/uima/${uimaScmRoot}/trunk/${uimaScmProject}
+ http://svn.apache.org/viewvc/uima/build/tags/parent-pom-top-1
/url
/scm
@@ -141,8 +141,8 @@
!--ciManagement
systemHudson/system
-url/
-notifiers/
+url /
+notifiers /
/ciManagement--
!-- distribution management - is inherited from Apache pom
@@ -279,7 +279,7 @@
configuration
source1.5/source
target1.5/target
-!--encodingUTF-8/encoding this inherited from apache pom 7 --
+!--encodingUTF-8/encoding this inherited from apache pom 7 --
/configuration
/plugin
@@ -554,7 +554,7 @@
/execution
execution
idattach-sources/id
-phase/ !-- turn off the plan jar one --
+phase / !-- turn off the plan jar one --
/execution
/executions
/plugin
svn commit: r952375 - /uima/build/tags/
Author: schor Date: Mon Jun 7 19:17:20 2010 New Revision: 952375 URL: http://svn.apache.org/viewvc?rev=952375view=rev Log: [UIMA-1806] release prepare fails if tag folder not there Added: uima/build/tags/
svn commit: r952376 - /uima/build/trunk/parent-poms/parent-pom-top/pom.xml
Author: schor
Date: Mon Jun 7 19:17:51 2010
New Revision: 952376
URL: http://svn.apache.org/viewvc?rev=952376view=rev
Log:
[maven-release-plugin] rollback the release of parent-pom-top-1
Modified:
uima/build/trunk/parent-poms/parent-pom-top/pom.xml
Modified: uima/build/trunk/parent-poms/parent-pom-top/pom.xml
URL:
http://svn.apache.org/viewvc/uima/build/trunk/parent-poms/parent-pom-top/pom.xml?rev=952376r1=952375r2=952376view=diff
==
--- uima/build/trunk/parent-poms/parent-pom-top/pom.xml (original)
+++ uima/build/trunk/parent-poms/parent-pom-top/pom.xml Mon Jun 7 19:17:51 2010
@@ -43,19 +43,19 @@
It contains one build step to set the build time stamp
--
-project xmlns=http://maven.apache.org/POM/4.0.0;
xmlns:xsi=http://www.w3.org/2001/XMLSchema-instance;
xsi:schemaLocation=http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd;
+project xsi:schemaLocation=http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd;
xmlns=http://maven.apache.org/POM/4.0.0;
xmlns:xsi=http://www.w3.org/2001/XMLSchema-instance;
modelVersion4.0.0/modelVersion
parent
artifactIdapache/artifactId
groupIdorg.apache/groupId
version7/version
-relativePath /
+relativePath/
/parent
groupIdorg.apache.uima/groupId
artifactIdparent-pom-top/artifactId
- version1/version
+ version1-SNAPSHOT/version
packagingpom/packaging
nameUIMA ${project.artifactId}/name
@@ -121,13 +121,13 @@
scm
connection
- scm:svn:http://svn.apache.org/repos/asf/uima/build/tags/parent-pom-top-1
+
scm:svn:http://svn.apache.org/repos/asf/uima/${uimaScmRoot}/trunk/${uimaScmProject}
/connection
developerConnection
- scm:svn:https://svn.apache.org/repos/asf/uima/build/tags/parent-pom-top-1
+
scm:svn:https://svn.apache.org/repos/asf/uima/${uimaScmRoot}/trunk/${uimaScmProject}
/developerConnection
url
- http://svn.apache.org/viewvc/uima/build/tags/parent-pom-top-1
+ http://svn.apache.org/viewvc/uima/${uimaScmRoot}/trunk/${uimaScmProject}
/url
/scm
@@ -141,8 +141,8 @@
!--ciManagement
systemHudson/system
-url /
-notifiers /
+url/
+notifiers/
/ciManagement--
!-- distribution management - is inherited from Apache pom
@@ -279,7 +279,7 @@
configuration
source1.5/source
target1.5/target
-!--encodingUTF-8/encoding this inherited from apache pom 7 --
+!--encodingUTF-8/encoding this inherited from apache pom 7 --
/configuration
/plugin
@@ -554,7 +554,7 @@
/execution
execution
idattach-sources/id
-phase / !-- turn off the plan jar one --
+phase/ !-- turn off the plan jar one --
/execution
/executions
/plugin
svn commit: r952377 - /uima/build/trunk/parent-poms/parent-pom-top/pom.xml
Author: schor
Date: Mon Jun 7 19:18:41 2010
New Revision: 952377
URL: http://svn.apache.org/viewvc?rev=952377view=rev
Log:
[maven-release-plugin] prepare release parent-pom-top-1
Modified:
uima/build/trunk/parent-poms/parent-pom-top/pom.xml
Modified: uima/build/trunk/parent-poms/parent-pom-top/pom.xml
URL:
http://svn.apache.org/viewvc/uima/build/trunk/parent-poms/parent-pom-top/pom.xml?rev=952377r1=952376r2=952377view=diff
==
--- uima/build/trunk/parent-poms/parent-pom-top/pom.xml (original)
+++ uima/build/trunk/parent-poms/parent-pom-top/pom.xml Mon Jun 7 19:18:41 2010
@@ -43,19 +43,19 @@
It contains one build step to set the build time stamp
--
-project xsi:schemaLocation=http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd;
xmlns=http://maven.apache.org/POM/4.0.0;
xmlns:xsi=http://www.w3.org/2001/XMLSchema-instance;
+project xmlns=http://maven.apache.org/POM/4.0.0;
xmlns:xsi=http://www.w3.org/2001/XMLSchema-instance;
xsi:schemaLocation=http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd;
modelVersion4.0.0/modelVersion
parent
artifactIdapache/artifactId
groupIdorg.apache/groupId
version7/version
-relativePath/
+relativePath /
/parent
groupIdorg.apache.uima/groupId
artifactIdparent-pom-top/artifactId
- version1-SNAPSHOT/version
+ version1/version
packagingpom/packaging
nameUIMA ${project.artifactId}/name
@@ -121,13 +121,13 @@
scm
connection
-
scm:svn:http://svn.apache.org/repos/asf/uima/${uimaScmRoot}/trunk/${uimaScmProject}
+ scm:svn:http://svn.apache.org/repos/asf/uima/build/tags/parent-pom-top-1
/connection
developerConnection
-
scm:svn:https://svn.apache.org/repos/asf/uima/${uimaScmRoot}/trunk/${uimaScmProject}
+ scm:svn:https://svn.apache.org/repos/asf/uima/build/tags/parent-pom-top-1
/developerConnection
url
- http://svn.apache.org/viewvc/uima/${uimaScmRoot}/trunk/${uimaScmProject}
+ http://svn.apache.org/viewvc/uima/build/tags/parent-pom-top-1
/url
/scm
@@ -141,8 +141,8 @@
!--ciManagement
systemHudson/system
-url/
-notifiers/
+url /
+notifiers /
/ciManagement--
!-- distribution management - is inherited from Apache pom
@@ -279,7 +279,7 @@
configuration
source1.5/source
target1.5/target
-!--encodingUTF-8/encoding this inherited from apache pom 7 --
+!--encodingUTF-8/encoding this inherited from apache pom 7 --
/configuration
/plugin
@@ -554,7 +554,7 @@
/execution
execution
idattach-sources/id
-phase/ !-- turn off the plan jar one --
+phase / !-- turn off the plan jar one --
/execution
/executions
/plugin
svn commit: r952379 - /uima/build/trunk/parent-poms/parent-pom-top/pom.xml
Author: schor
Date: Mon Jun 7 19:18:55 2010
New Revision: 952379
URL: http://svn.apache.org/viewvc?rev=952379view=rev
Log:
[maven-release-plugin] prepare for next development iteration
Modified:
uima/build/trunk/parent-poms/parent-pom-top/pom.xml
Modified: uima/build/trunk/parent-poms/parent-pom-top/pom.xml
URL:
http://svn.apache.org/viewvc/uima/build/trunk/parent-poms/parent-pom-top/pom.xml?rev=952379r1=952378r2=952379view=diff
==
--- uima/build/trunk/parent-poms/parent-pom-top/pom.xml (original)
+++ uima/build/trunk/parent-poms/parent-pom-top/pom.xml Mon Jun 7 19:18:55 2010
@@ -55,7 +55,7 @@
groupIdorg.apache.uima/groupId
artifactIdparent-pom-top/artifactId
- version1/version
+ version2-SNAPSHOT/version
packagingpom/packaging
nameUIMA ${project.artifactId}/name
@@ -121,13 +121,13 @@
scm
connection
- scm:svn:http://svn.apache.org/repos/asf/uima/build/tags/parent-pom-top-1
+
scm:svn:http://svn.apache.org/repos/asf/uima/build/trunk/parent-poms/parent-pom-top
/connection
developerConnection
- scm:svn:https://svn.apache.org/repos/asf/uima/build/tags/parent-pom-top-1
+
scm:svn:https://svn.apache.org/repos/asf/uima/build/trunk/parent-poms/parent-pom-top
/developerConnection
url
- http://svn.apache.org/viewvc/uima/build/tags/parent-pom-top-1
+ http://svn.apache.org/viewvc/uima/build/trunk/parent-poms/parent-pom-top
/url
/scm
svn commit: r952494 - /uima/uima-as/trunk/uima-as-docbooks/src/docbook/async.overview.xml
Author: schor Date: Tue Jun 8 01:32:51 2010 New Revision: 952494 URL: http://svn.apache.org/viewvc?rev=952494view=rev Log: [UIMA-1794] add documentation for new parameters for JMS Service descriptor Modified: uima/uima-as/trunk/uima-as-docbooks/src/docbook/async.overview.xml Modified: uima/uima-as/trunk/uima-as-docbooks/src/docbook/async.overview.xml URL: http://svn.apache.org/viewvc/uima/uima-as/trunk/uima-as-docbooks/src/docbook/async.overview.xml?rev=952494r1=952493r2=952494view=diff == --- uima/uima-as/trunk/uima-as-docbooks/src/docbook/async.overview.xml (original) +++ uima/uima-as/trunk/uima-as-docbooks/src/docbook/async.overview.xml Tue Jun 8 01:32:51 2010 @@ -1049,6 +1049,28 @@ under the License. which processes one CAS at a time, so it will not take advantage of the scalability that UIMA AS provides. To process more than one CAS at a time, you must use the Asynchronous UIMA AS Client API xref linkend=ugr.ref.async.api/./para + +paraOther parameters may be specified: + variablelist +varlistentry + termbinary_serialization/term + listitem +paraSet to true to specify binary serialization (faster, but requires that the service + have exactly the same type system as the client). +/para + /listitem +/varlistentry +varlistentry + termignore_process_errors/term + listitem +paraSet to true to specify that any processing errors should be ignored. In order for this + to be reasonable, your calling environment must be able to continue somehow, + if the service fails. +/para + /listitem +/varlistentry + /variablelist + /para paraFor more information on the customResourceSpecifier see olink targetdoc=references targetptr=ugr.ref.xml.component_descriptor.custom_resource_specifiers/olink. /para /section
svn commit: r952498 - /uima/build/trunk/parent-poms/parent-pom-top/pom.xml
Author: schor
Date: Tue Jun 8 01:46:59 2010
New Revision: 952498
URL: http://svn.apache.org/viewvc?rev=952498view=rev
Log:
[UIMA-1809] roll back to version 1-SNAPSHOT and remove docbook olink version
dependencies on current project version - replace with 1-SNAPSHOT
Modified:
uima/build/trunk/parent-poms/parent-pom-top/pom.xml
Modified: uima/build/trunk/parent-poms/parent-pom-top/pom.xml
URL:
http://svn.apache.org/viewvc/uima/build/trunk/parent-poms/parent-pom-top/pom.xml?rev=952498r1=952497r2=952498view=diff
==
--- uima/build/trunk/parent-poms/parent-pom-top/pom.xml (original)
+++ uima/build/trunk/parent-poms/parent-pom-top/pom.xml Tue Jun 8 01:46:59 2010
@@ -55,7 +55,7 @@
groupIdorg.apache.uima/groupId
artifactIdparent-pom-top/artifactId
- version2-SNAPSHOT/version
+ version1-SNAPSHOT/version
packagingpom/packaging
nameUIMA ${project.artifactId}/name
@@ -167,11 +167,6 @@
uimaWebsiteDistributionUrlscp://people.apache.org/www/uima.apache.org//uimaWebsiteDistributionUrl
maven.build.timestamp.formatyyMMdd_HHmm/maven.build.timestamp.format
buildDateTime${maven.build.timestamp}/buildDateTime
-!-- next two properties used by other poms --
-localRepoProjVer
-
${settings.localRepository}/org/apache/uima/${project.artifactId}/${project.version}
-/localRepoProjVer
-artifactVersion${project.artifactId}-${project.version}/artifactVersion
!-- these properties are for docbook processing.
They are defined here to avoid circular dependencies between
@@ -181,8 +176,8 @@
!-- olink databases --
dolArtifactIduima-docbook-olink/dolArtifactId
dolClassifierolink/dolClassifier
-
dolRepo${settings.localRepository}/org/apache/uima/${dolArtifactId}/${project.version}/dolRepo
-dolZip${dolArtifactId}-${project.version}-${dolClassifier}.zip/dolZip
+
dolRepo${settings.localRepository}/org/apache/uima/${dolArtifactId}/1-SNAPSHOT/dolRepo
+dolZip${dolArtifactId}-1-SNAPSHOT-${dolClassifier}.zip/dolZip
dolUnzipped${dolRepo}/docbook-olink/dolUnzipped
dolBuiltFile${project.build.directory}//dolBuiltFile
dolBuiltArtifactFile${project.build.directory}/${dolZip}/dolBuiltArtifactFile
svn commit: r952503 - /uima/build/tags/1-rc2/
Author: schor Date: Tue Jun 8 01:52:22 2010 New Revision: 952503 URL: http://svn.apache.org/viewvc?rev=952503view=rev Log: [UIMA-1809] named the rc incorretly, try again Removed: uima/build/tags/1-rc2/
svn commit: r953314 - /uima/site/trunk/uima-website/docs/board-reports/2010-06.txt
Author: schor Date: Thu Jun 10 13:02:03 2010 New Revision: 953314 URL: http://svn.apache.org/viewvc?rev=953314view=rev Log: no Jira - June 2010 board status report Added: uima/site/trunk/uima-website/docs/board-reports/2010-06.txt Added: uima/site/trunk/uima-website/docs/board-reports/2010-06.txt URL: http://svn.apache.org/viewvc/uima/site/trunk/uima-website/docs/board-reports/2010-06.txt?rev=953314view=auto == --- uima/site/trunk/uima-website/docs/board-reports/2010-06.txt (added) +++ uima/site/trunk/uima-website/docs/board-reports/2010-06.txt Thu Jun 10 13:02:03 2010 @@ -0,0 +1,46 @@ +Status report for the Apache UIMA Project + +Apache UIMA's mission: the creation and maintenance of open-source +software related to the analysis of unstructured data, guided by the +UIMA Oasis Standard. + +Releases: + +none yet (as a TLP), we hope to do one in the next month or 2. + +2010-1-26 2.3.0 (Incubator - last release) release of Java SDK, Annotator +add-on package, UIMA-AS (Async scaleout), and UIMA-CPP +(C++ enablement) + +Development: + +Work continues in standardizing our build processes with Maven +conventions. Builds now generally work with the new maven alignement, +and we're starting to attempt releases with this new structure. + +We still have a significant number of issues remain in Jira, postponed +from the last release. More progress should get made on these after +our Maven re-alignment work is finished. + +Issues regarding large scale use of UIMA-AS continue to be reported +and fixed; these often have to do with corner cases involving very +large scaleouts and error situations. + +The project-wide POM used as a parent pom is the first artifact to be +released; it is currently in the staging area, and a vote is underway. +This represents the first time the project has used the maven release +plugin and Nexus repository for releasing. + +A new user is proposing some feature enhancements to two of the +annotators, and this is being looked at. + +The main committer on the CAS Editor tool is proposing some future +directions for this tooling that aims at providing a more componentized +approach for additional capabilities. + +We are planning to gradually move documentation updates to make more +use of maven's site capabilities. + +Community: No changes + +Issues: No Board level issues at this time \ No newline at end of file
svn commit: r954847 - /uima/site/trunk/uima-website/docs/one-time-setup.html
Author: schor Date: Tue Jun 15 12:13:53 2010 New Revision: 954847 URL: http://svn.apache.org/viewvc?rev=954847view=rev Log: no jira - fix one-time-setup html file - was some how missing one short code segment. The xdocs was fine. Modified: uima/site/trunk/uima-website/docs/one-time-setup.html Modified: uima/site/trunk/uima-website/docs/one-time-setup.html URL: http://svn.apache.org/viewvc/uima/site/trunk/uima-website/docs/one-time-setup.html?rev=954847r1=954846r2=954847view=diff == --- uima/site/trunk/uima-website/docs/one-time-setup.html (original) +++ uima/site/trunk/uima-website/docs/one-time-setup.html Tue Jun 15 12:13:53 2010 @@ -261,7 +261,7 @@ A patch is needed to get get the Docbkx plugin to work with Maven 3: olliuse m2Eclipse to checkout http://docbkx-tools.googlecode.com/svn/tags/docbkx-2.0.10/docbkx-maven-base project/li -liEdit line 472 of , where it says code...getResources(/catalog.xml)/code and +liEdit line 472 of codeAbstractTransformerMojo.java/code, where it says code...getResources(/catalog.xml)/code and remove the code//code in front of codecatalog.xml/code./li lido acode mvn install /code in the docbkx-maven-base directory, to install the fix to your local repo./li /ol
svn commit: r955109 - in /uima/build/trunk: parent-poms/ parent-poms/parent-pom-distr/ parent-poms/parent-pom-docbook/ uima-build-helper-maven-plugin/ uima-docbook-olink/ uima-docbook-resource-bundle/
Author: schor Date: Wed Jun 16 01:42:02 2010 New Revision: 955109 URL: http://svn.apache.org/viewvc?rev=955109view=rev Log: [UIMA-1812] update version of parent-pom-top to 1 Modified: uima/build/trunk/parent-poms/parent-pom-distr/pom.xml uima/build/trunk/parent-poms/parent-pom-docbook/pom.xml uima/build/trunk/parent-poms/pom.xml uima/build/trunk/uima-build-helper-maven-plugin/pom.xml uima/build/trunk/uima-docbook-olink/pom.xml uima/build/trunk/uima-docbook-resource-bundle/pom.xml uima/build/trunk/uima-jar-resource-bundle/pom.xml Modified: uima/build/trunk/parent-poms/parent-pom-distr/pom.xml URL: http://svn.apache.org/viewvc/uima/build/trunk/parent-poms/parent-pom-distr/pom.xml?rev=955109r1=955108r2=955109view=diff == --- uima/build/trunk/parent-poms/parent-pom-distr/pom.xml (original) +++ uima/build/trunk/parent-poms/parent-pom-distr/pom.xml Wed Jun 16 01:42:02 2010 @@ -29,7 +29,7 @@ parent groupIdorg.apache.uima/groupId artifactIdparent-pom-top/artifactId -version1-SNAPSHOT/version +version1/version relativePath/ /parent Modified: uima/build/trunk/parent-poms/parent-pom-docbook/pom.xml URL: http://svn.apache.org/viewvc/uima/build/trunk/parent-poms/parent-pom-docbook/pom.xml?rev=955109r1=955108r2=955109view=diff == --- uima/build/trunk/parent-poms/parent-pom-docbook/pom.xml (original) +++ uima/build/trunk/parent-poms/parent-pom-docbook/pom.xml Wed Jun 16 01:42:02 2010 @@ -30,7 +30,7 @@ parent groupIdorg.apache.uima/groupId artifactIdparent-pom-top/artifactId -version1-SNAPSHOT/version +version1/version relativePath/ /parent Modified: uima/build/trunk/parent-poms/pom.xml URL: http://svn.apache.org/viewvc/uima/build/trunk/parent-poms/pom.xml?rev=955109r1=955108r2=955109view=diff == --- uima/build/trunk/parent-poms/pom.xml (original) +++ uima/build/trunk/parent-poms/pom.xml Wed Jun 16 01:42:02 2010 @@ -26,7 +26,7 @@ parent groupIdorg.apache.uima/groupId artifactIdparent-pom-top/artifactId -version1-SNAPSHOT/version +version1/version relativePath/ /parent Modified: uima/build/trunk/uima-build-helper-maven-plugin/pom.xml URL: http://svn.apache.org/viewvc/uima/build/trunk/uima-build-helper-maven-plugin/pom.xml?rev=955109r1=955108r2=955109view=diff == --- uima/build/trunk/uima-build-helper-maven-plugin/pom.xml (original) +++ uima/build/trunk/uima-build-helper-maven-plugin/pom.xml Wed Jun 16 01:42:02 2010 @@ -24,7 +24,7 @@ parent artifactIdparent-pom-top/artifactId groupIdorg.apache.uima/groupId -version1-SNAPSHOT/version +version1/version /parent artifactIduima-build-helper-maven-plugin/artifactId Modified: uima/build/trunk/uima-docbook-olink/pom.xml URL: http://svn.apache.org/viewvc/uima/build/trunk/uima-docbook-olink/pom.xml?rev=955109r1=955108r2=955109view=diff == --- uima/build/trunk/uima-docbook-olink/pom.xml (original) +++ uima/build/trunk/uima-docbook-olink/pom.xml Wed Jun 16 01:42:02 2010 @@ -22,7 +22,7 @@ parent artifactIdparent-pom-top/artifactId groupIdorg.apache.uima/groupId -version1-SNAPSHOT/version +version1/version relativePath/ /parent Modified: uima/build/trunk/uima-docbook-resource-bundle/pom.xml URL: http://svn.apache.org/viewvc/uima/build/trunk/uima-docbook-resource-bundle/pom.xml?rev=955109r1=955108r2=955109view=diff == --- uima/build/trunk/uima-docbook-resource-bundle/pom.xml (original) +++ uima/build/trunk/uima-docbook-resource-bundle/pom.xml Wed Jun 16 01:42:02 2010 @@ -22,7 +22,7 @@ parent artifactIdparent-pom-top/artifactId groupIdorg.apache.uima/groupId -version1-SNAPSHOT/version +version1/version relativePath/ /parent Modified: uima/build/trunk/uima-jar-resource-bundle/pom.xml URL: http://svn.apache.org/viewvc/uima/build/trunk/uima-jar-resource-bundle/pom.xml?rev=955109r1=955108r2=955109view=diff == --- uima/build/trunk/uima-jar-resource-bundle/pom.xml (original) +++ uima/build/trunk/uima-jar-resource-bundle/pom.xml Wed Jun 16 01:42:02 2010 @@ -22,7 +22,7 @@ parent artifactIdparent-pom-top/artifactId groupIdorg.apache.uima/groupId -version1-SNAPSHOT/version +version1/version relativePath/ /parent
svn commit: r955110 - /uima/uimaj/trunk/uimaj-distr/pom.xml
Author: schor
Date: Wed Jun 16 01:49:29 2010
New Revision: 955110
URL: http://svn.apache.org/viewvc?rev=955110view=rev
Log:
[UIMA-1778] reduce javadoc output, move known tag list to parent-pom-top,
change id
Modified:
uima/uimaj/trunk/uimaj-distr/pom.xml
Modified: uima/uimaj/trunk/uimaj-distr/pom.xml
URL:
http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-distr/pom.xml?rev=955110r1=955109r2=955110view=diff
==
--- uima/uimaj/trunk/uimaj-distr/pom.xml (original)
+++ uima/uimaj/trunk/uimaj-distr/pom.xml Wed Jun 16 01:49:29 2010
@@ -149,14 +149,13 @@
artifactIdmaven-javadoc-plugin/artifactId
executions
execution
-idjavadoc/id
+idjavadoc-distr/id
phasepackage/phase
!--phasedeploy/phase-- !-- comment above and uncomment to
disable javadocs, for testing/experimentation, with assembly:assembly--
goals
goaljavadoc/goal
/goals
configuration
- quiettrue/quiet
groups
group
titlePackages/title
@@ -178,21 +177,6 @@
/additionalparam
doctitleApache UIMA Java SDK ${project.version} User-Level API
Documentation/doctitle
windowtitleApache UIMA Java SDK ${project.version} User-Level
API Documentation/windowtitle
- !-- putting the tags for JCasGen here avoids lots of warnings
--
- tags
-tag
- namegenerated/name
- placementX/placement
-/tag
-tag
- nameordered/name
- placementX/placement
-/tag
-tag
- namemodifiable/name
- placementX/placement
-/tag
- /tags
/configuration
/execution
/executions
svn commit: r955111 - in /uima/uimaj/trunk: aggregate-uimaj-docbooks/ aggregate-uimaj-eclipse-plugins/ aggregate-uimaj/ uimaj-bootstrap/ uimaj-component-test-util/ uimaj-eclipse-feature-runtime/ uimaj
Author: schor Date: Wed Jun 16 01:51:12 2010 New Revision: 955111 URL: http://svn.apache.org/viewvc?rev=955111view=rev Log: [UIMA-1812] update version of parent-pom-top to 1 Modified: uima/uimaj/trunk/aggregate-uimaj-docbooks/pom.xml uima/uimaj/trunk/aggregate-uimaj-eclipse-plugins/pom.xml uima/uimaj/trunk/aggregate-uimaj/pom.xml uima/uimaj/trunk/uimaj-bootstrap/pom.xml uima/uimaj/trunk/uimaj-component-test-util/pom.xml uima/uimaj/trunk/uimaj-eclipse-feature-runtime/pom.xml uima/uimaj/trunk/uimaj-eclipse-feature-tools/pom.xml uima/uimaj/trunk/uimaj-eclipse-update-site/pom.xml uima/uimaj/trunk/uimaj-internal-tools/pom.xml Modified: uima/uimaj/trunk/aggregate-uimaj-docbooks/pom.xml URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/aggregate-uimaj-docbooks/pom.xml?rev=955111r1=955110r2=955111view=diff == --- uima/uimaj/trunk/aggregate-uimaj-docbooks/pom.xml (original) +++ uima/uimaj/trunk/aggregate-uimaj-docbooks/pom.xml Wed Jun 16 01:51:12 2010 @@ -25,7 +25,7 @@ parent groupIdorg.apache.uima/groupId artifactIdparent-pom-top/artifactId -version1-SNAPSHOT/version +version1/version relativePath/ /parent Modified: uima/uimaj/trunk/aggregate-uimaj-eclipse-plugins/pom.xml URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/aggregate-uimaj-eclipse-plugins/pom.xml?rev=955111r1=955110r2=955111view=diff == --- uima/uimaj/trunk/aggregate-uimaj-eclipse-plugins/pom.xml (original) +++ uima/uimaj/trunk/aggregate-uimaj-eclipse-plugins/pom.xml Wed Jun 16 01:51:12 2010 @@ -25,7 +25,7 @@ parent groupIdorg.apache.uima/groupId artifactIdparent-pom-top/artifactId -version1-SNAPSHOT/version +version1/version relativePath/ /parent Modified: uima/uimaj/trunk/aggregate-uimaj/pom.xml URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/aggregate-uimaj/pom.xml?rev=955111r1=955110r2=955111view=diff == --- uima/uimaj/trunk/aggregate-uimaj/pom.xml (original) +++ uima/uimaj/trunk/aggregate-uimaj/pom.xml Wed Jun 16 01:51:12 2010 @@ -25,7 +25,7 @@ parent groupIdorg.apache.uima/groupId artifactIdparent-pom-top/artifactId -version1-SNAPSHOT/version +version1/version relativePath/ /parent Modified: uima/uimaj/trunk/uimaj-bootstrap/pom.xml URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-bootstrap/pom.xml?rev=955111r1=955110r2=955111view=diff == --- uima/uimaj/trunk/uimaj-bootstrap/pom.xml (original) +++ uima/uimaj/trunk/uimaj-bootstrap/pom.xml Wed Jun 16 01:51:12 2010 @@ -25,7 +25,7 @@ parent groupIdorg.apache.uima/groupId artifactIdparent-pom-top/artifactId -version1-SNAPSHOT/version +version1/version relativePath/ /parent Modified: uima/uimaj/trunk/uimaj-component-test-util/pom.xml URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-component-test-util/pom.xml?rev=955111r1=955110r2=955111view=diff == --- uima/uimaj/trunk/uimaj-component-test-util/pom.xml (original) +++ uima/uimaj/trunk/uimaj-component-test-util/pom.xml Wed Jun 16 01:51:12 2010 @@ -25,7 +25,7 @@ parent groupIdorg.apache.uima/groupId artifactIdparent-pom-top/artifactId -version1-SNAPSHOT/version +version1/version relativePath/ /parent Modified: uima/uimaj/trunk/uimaj-eclipse-feature-runtime/pom.xml URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-eclipse-feature-runtime/pom.xml?rev=955111r1=955110r2=955111view=diff == --- uima/uimaj/trunk/uimaj-eclipse-feature-runtime/pom.xml (original) +++ uima/uimaj/trunk/uimaj-eclipse-feature-runtime/pom.xml Wed Jun 16 01:51:12 2010 @@ -24,7 +24,7 @@ parent groupIdorg.apache.uima/groupId artifactIdparent-pom-top/artifactId -version1-SNAPSHOT/version +version1/version relativePath/ /parent Modified: uima/uimaj/trunk/uimaj-eclipse-feature-tools/pom.xml URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-eclipse-feature-tools/pom.xml?rev=955111r1=955110r2=955111view=diff == --- uima/uimaj/trunk/uimaj-eclipse-feature-tools/pom.xml (original) +++ uima/uimaj/trunk/uimaj-eclipse-feature-tools/pom.xml Wed Jun 16 01:51:12 2010 @@ -24,7 +24,7 @@ parent groupIdorg.apache.uima/groupId artifactIdparent-pom-top/artifactId -version1-SNAPSHOT/version +version1/version relativePath/ /parent Modified: uima/uimaj/trunk/uimaj-eclipse-update-site/pom.xml URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-eclipse-update-site/pom.xml
svn commit: r955375 - in /uima/site/trunk/uima-website/xdocs: building-uima.xml distribution.xml one-time-setup.xml svn.xml
Author: schor Date: Wed Jun 16 20:46:09 2010 New Revision: 955375 URL: http://svn.apache.org/viewvc?rev=955375view=rev Log: [UIMA-1810 UIMA-1811] web site updates for new build, update onetime setup instructions Modified: uima/site/trunk/uima-website/xdocs/building-uima.xml uima/site/trunk/uima-website/xdocs/distribution.xml uima/site/trunk/uima-website/xdocs/one-time-setup.xml uima/site/trunk/uima-website/xdocs/svn.xml Modified: uima/site/trunk/uima-website/xdocs/building-uima.xml URL: http://svn.apache.org/viewvc/uima/site/trunk/uima-website/xdocs/building-uima.xml?rev=955375r1=955374r2=955375view=diff == --- uima/site/trunk/uima-website/xdocs/building-uima.xml (original) +++ uima/site/trunk/uima-website/xdocs/building-uima.xml Wed Jun 16 20:46:09 2010 @@ -1,8 +1,4 @@ ?xml version=1.0 encoding=UTF-8? -!DOCTYPE document [ -!ENTITY rarr - -!ENTITY larr - -] !-- Licensed to the Apache Software Foundation (ASF) under one @@ -48,23 +44,23 @@ under the License. subsection name=One time initial setup ul li - a href=one-time-setup.html#svn-setupSVN: Click here to see the one-time SVN setup/a. + a href=one-time-setup.html#svn-setupSVN: Click here for the one-time SVN setup/a. /li li - a href=one-time-setup.html#maven-setupMaven: Click here to see the one-time Maven 3.0 setup/a. + a href=one-time-setup.html#maven-setupMaven: Click here for the one-time Maven 3.0 setup/a. /li li - a href=one-time-setup.html#eclipse-setupEclipse: Click here to see the one-time Eclipse setup/a. This includes + a href=one-time-setup.html#eclipse-setupEclipse: Click here for the one-time Eclipse setup/a. This includes setting up m2eclipse plugin (including a patch), and is only needed if you are using Eclipse as your IDE. /li li - a href=one-time-setup.html#docbkx-setupDocbkx: Click here to see the one-time Docbkx setup/a. This involves + a href=one-time-setup.html#docbkx-setupDocbkx: Click here for the one-time Docbkx setup/a. This involves applying a 1-line patch (required). /li /ul /subsection -subsection name=Building one project - using the command line +subsection name=Building one project - using the command line id=building.command.line.one ol lip Check out one project from SVN: for example, (Windows)br/ @@ -79,10 +75,16 @@ under the License. lipcodemvn install/code/p pThis will build that one project and install it to your local Maven repository./p /li - /ol + /ol + + p +This should build all of the jars, any docbooks, and run the unit tests. +The output artifacts (Jars, html and pdf documents, etc.) are placed in each project's target directory, and +also are put into your local Maven repository. Docbook output is placed in the target/site/d directory. + /p /subsection -subsection name=Building all the projects for a major component - using command line +subsection name=Building all the projects for a major component - using command line id=building.command.line.group pFor convenience, the build, uimaj, uima-as, and add-ons major components define aggregate projects which use Maven's lt;modules element to specify groups of individual projects that can be then built in one operation./p @@ -107,16 +109,59 @@ under the License. /ol /subsection -subsection name=Building using Eclipse, with the m2eclipse plugin +subsection name=Building using Eclipse, with the m2eclipse plugin id=building-from-eclipse ol liCheckout one or many projects, as above, into some location. Then use - Eclipse menu: File #x02192; import #x02192; Maven #x02192; Existing Maven projects + Eclipse menu: codeFile - Import - Maven - Existing Maven projects/code to import those projects into the Eclipse workspace and set them up for Maven building./li liTo run maven commands on a project, select the project, right click, and pick codeRun as/code and then select mvn install (or other choice as you wish)./li /ol -/subsection + + pIf your Maven build generates sources (e.g., you have some XMLBeans defined), +then after the initial import and project build, you'll need to use the m2eclipse command +codeUpdate Project Configuration/code found on the codeMaven/code context menu obtained by right-clicking the project folder./p + /subsection + +subsection name=Checking Out Code using Eclipse id=checkout.using.eclipse + +pTo access the SVN repository from Eclipse, use Maven's m2eclipse plugin + and the Subclipse plugin. +/p + +pThe individual projects can be checked out without worrying about relative path + dependencies, except for a few projects that refer to other projects using relative addresses. + Currently, the projects which do that are + ul +lithe aggregator projects - those
svn commit: r955376 - in /uima/site/trunk/uima-website/docs: building-uima.html distribution.html one-time-setup.html svn.html
Author: schor Date: Wed Jun 16 20:47:05 2010 New Revision: 955376 URL: http://svn.apache.org/viewvc?rev=955376view=rev Log: [UIMA-1810 UIMA-1811] web site updates for new build, update onetime setup instructions Modified: uima/site/trunk/uima-website/docs/building-uima.html uima/site/trunk/uima-website/docs/distribution.html uima/site/trunk/uima-website/docs/one-time-setup.html uima/site/trunk/uima-website/docs/svn.html Modified: uima/site/trunk/uima-website/docs/building-uima.html URL: http://svn.apache.org/viewvc/uima/site/trunk/uima-website/docs/building-uima.html?rev=955376r1=955375r2=955376view=diff == --- uima/site/trunk/uima-website/docs/building-uima.html (original) +++ uima/site/trunk/uima-website/docs/building-uima.html Wed Jun 16 20:47:05 2010 @@ -185,24 +185,24 @@ blockquote class=subsectionBody ul li - a href=one-time-setup.html#svn-setupSVN: Click here to see the one-time SVN setup/a. + a href=one-time-setup.html#svn-setupSVN: Click here for the one-time SVN setup/a. /li li - a href=one-time-setup.html#maven-setupMaven: Click here to see the one-time Maven 3.0 setup/a. + a href=one-time-setup.html#maven-setupMaven: Click here for the one-time Maven 3.0 setup/a. /li li - a href=one-time-setup.html#eclipse-setupEclipse: Click here to see the one-time Eclipse setup/a. This includes + a href=one-time-setup.html#eclipse-setupEclipse: Click here for the one-time Eclipse setup/a. This includes setting up m2eclipse plugin (including a patch), and is only needed if you are using Eclipse as your IDE. /li li - a href=one-time-setup.html#docbkx-setupDocbkx: Click here to see the one-time Docbkx setup/a. This involves + a href=one-time-setup.html#docbkx-setupDocbkx: Click here for the one-time Docbkx setup/a. This involves applying a 1-line patch (required). /li /ul /blockquote /td/tr /table - table class=subsectionTable + table class=subsectionTable id='building.command.line.one' trtd @@ -228,10 +228,15 @@ pThis will build that one project and install it to your local Maven repository./p /li /ol +p +This should build all of the jars, any docbooks, and run the unit tests. +The output artifacts (Jars, html and pdf documents, etc.) are placed in each project's target directory, and +also are put into your local Maven repository. Docbook output is placed in the target/site/d directory. + /p /blockquote /td/tr /table - table class=subsectionTable + table class=subsectionTable id='building.command.line.group' trtd @@ -268,7 +273,7 @@ /blockquote /td/tr /table - table class=subsectionTable + table class=subsectionTable id='building-from-eclipse' trtd @@ -282,12 +287,61 @@ blockquote class=subsectionBody ol liCheckout one or many projects, as above, into some location. Then use - Eclipse menu: File ? import ? Maven ? Existing Maven projects + Eclipse menu: codeFile -gt; Import -gt; Maven -gt; Existing Maven projects/code to import those projects into the Eclipse workspace and set them up for Maven building./li liTo run maven commands on a project, select the project, right click, and pick codeRun as/code and then select mvn install (or other choice as you wish)./li /ol +pIf your Maven build generates sources (e.g., you have some XMLBeans defined), +then after the initial import and project build, you'll need to use the m2eclipse command +codeUpdate Project Configuration/code found on the codeMaven/code context menu obtained by right-clicking the project folder./p +/blockquote +/td/tr +/table + table class=subsectionTable id='checkout.using.eclipse' +trtd + + + + a name=Checking Out Code using Eclipse +h2Checking Out Code using Eclipse +/h2 + /a + /td/tr + trtd +blockquote class=subsectionBody +pTo access the SVN repository from Eclipse, use Maven's m2eclipse plugin
svn commit: r955629 - /uima/build/trunk/aggregate-parent-poms/
Author: schor Date: Thu Jun 17 15:17:27 2010 New Revision: 955629 URL: http://svn.apache.org/viewvc?rev=955629view=rev Log: no Jira add .settings to svnignore Modified: uima/build/trunk/aggregate-parent-poms/ (props changed) Propchange: uima/build/trunk/aggregate-parent-poms/ -- --- svn:ignore (original) +++ svn:ignore Thu Jun 17 15:17:27 2010 @@ -1,2 +1,3 @@ target .project +.settings
svn commit: r955649 - /uima/build/trunk/aggregate-parent-poms/pom.xml
Author: schor Date: Thu Jun 17 15:56:46 2010 New Revision: 955649 URL: http://svn.apache.org/viewvc?rev=955649view=rev Log: No Jira - reformat to reflect nesting hierarchy of parent poms Modified: uima/build/trunk/aggregate-parent-poms/pom.xml Modified: uima/build/trunk/aggregate-parent-poms/pom.xml URL: http://svn.apache.org/viewvc/uima/build/trunk/aggregate-parent-poms/pom.xml?rev=955649r1=955648r2=955649view=diff == --- uima/build/trunk/aggregate-parent-poms/pom.xml (original) +++ uima/build/trunk/aggregate-parent-poms/pom.xml Thu Jun 17 15:56:46 2010 @@ -69,15 +69,16 @@ module../parent-poms/parent-pom-ibm-notice/module module../parent-poms/parent-pom-eclipse-plugins/module module../parent-poms/parent-pom-eclipse-plugins-ibm-notice/module -module../parent-poms/parent-pom-distr/module !-- build single projects -- module../parent-poms/parent-pom-annotator/module module../parent-poms/parent-pom-single-project/module -module../uima-assembly-single-project/module -module../uima-build-helper-maven-plugin/module -!--module../uima-docbook-olink/module-- !-- not released -- -module../uima-docbook-resource-bundle/module -module../uima-jar-resource-bundle/module + module../parent-poms/parent-pom-distr/module + + module../uima-assembly-single-project/module + module../uima-build-helper-maven-plugin/module + !--module../uima-docbook-olink/module-- !-- not released -- + module../uima-docbook-resource-bundle/module + module../uima-jar-resource-bundle/module /modules /project \ No newline at end of file
svn commit: r955716 - in /uima/build/trunk/parent-poms: parent-pom-annotator/pom.xml parent-pom-eclipse-plugins-ibm-notice/pom.xml parent-pom-eclipse-plugins/pom.xml parent-pom-ibm-notice/pom.xml pare
Author: schor Date: Thu Jun 17 19:58:32 2010 New Revision: 955716 URL: http://svn.apache.org/viewvc?rev=955716view=rev Log: [UIMA-1814] add in relative path to these poms Modified: uima/build/trunk/parent-poms/parent-pom-annotator/pom.xml uima/build/trunk/parent-poms/parent-pom-eclipse-plugins-ibm-notice/pom.xml uima/build/trunk/parent-poms/parent-pom-eclipse-plugins/pom.xml uima/build/trunk/parent-poms/parent-pom-ibm-notice/pom.xml uima/build/trunk/parent-poms/parent-pom-single-project/pom.xml Modified: uima/build/trunk/parent-poms/parent-pom-annotator/pom.xml URL: http://svn.apache.org/viewvc/uima/build/trunk/parent-poms/parent-pom-annotator/pom.xml?rev=955716r1=955715r2=955716view=diff == --- uima/build/trunk/parent-poms/parent-pom-annotator/pom.xml (original) +++ uima/build/trunk/parent-poms/parent-pom-annotator/pom.xml Thu Jun 17 19:58:32 2010 @@ -39,7 +39,7 @@ groupIdorg.apache.uima/groupId artifactIdparent-pom-docbook/artifactId version1-SNAPSHOT/version -relativePath/ +relativePath../parent-pom-docbook/relativePath /parent artifactIdparent-pom-annotator/artifactId Modified: uima/build/trunk/parent-poms/parent-pom-eclipse-plugins-ibm-notice/pom.xml URL: http://svn.apache.org/viewvc/uima/build/trunk/parent-poms/parent-pom-eclipse-plugins-ibm-notice/pom.xml?rev=955716r1=955715r2=955716view=diff == --- uima/build/trunk/parent-poms/parent-pom-eclipse-plugins-ibm-notice/pom.xml (original) +++ uima/build/trunk/parent-poms/parent-pom-eclipse-plugins-ibm-notice/pom.xml Thu Jun 17 19:58:32 2010 @@ -29,7 +29,7 @@ groupIdorg.apache.uima/groupId artifactIdparent-pom-eclipse-plugins/artifactId version1-SNAPSHOT/version -relativePath/ +relativePath../parent-pom-eclipse-plugins/relativePath /parent artifactIdparent-pom-eclipse-plugins-ibm-notice/artifactId Modified: uima/build/trunk/parent-poms/parent-pom-eclipse-plugins/pom.xml URL: http://svn.apache.org/viewvc/uima/build/trunk/parent-poms/parent-pom-eclipse-plugins/pom.xml?rev=955716r1=955715r2=955716view=diff == --- uima/build/trunk/parent-poms/parent-pom-eclipse-plugins/pom.xml (original) +++ uima/build/trunk/parent-poms/parent-pom-eclipse-plugins/pom.xml Thu Jun 17 19:58:32 2010 @@ -32,7 +32,7 @@ groupIdorg.apache.uima/groupId artifactIdparent-pom-docbook/artifactId version1-SNAPSHOT/version -relativePath/ +relativePath../parent-pom-docbook/relativePath /parent artifactIdparent-pom-eclipse-plugins/artifactId Modified: uima/build/trunk/parent-poms/parent-pom-ibm-notice/pom.xml URL: http://svn.apache.org/viewvc/uima/build/trunk/parent-poms/parent-pom-ibm-notice/pom.xml?rev=955716r1=955715r2=955716view=diff == --- uima/build/trunk/parent-poms/parent-pom-ibm-notice/pom.xml (original) +++ uima/build/trunk/parent-poms/parent-pom-ibm-notice/pom.xml Thu Jun 17 19:58:32 2010 @@ -29,7 +29,7 @@ groupIdorg.apache.uima/groupId artifactIdparent-pom-docbook/artifactId version1-SNAPSHOT/version -relativePath/ +relativePath../parent-pom-docbook/relativePath /parent artifactIdparent-pom-ibm-notice/artifactId Modified: uima/build/trunk/parent-poms/parent-pom-single-project/pom.xml URL: http://svn.apache.org/viewvc/uima/build/trunk/parent-poms/parent-pom-single-project/pom.xml?rev=955716r1=955715r2=955716view=diff == --- uima/build/trunk/parent-poms/parent-pom-single-project/pom.xml (original) +++ uima/build/trunk/parent-poms/parent-pom-single-project/pom.xml Thu Jun 17 19:58:32 2010 @@ -54,7 +54,7 @@ groupIdorg.apache.uima/groupId artifactIdparent-pom-docbook/artifactId version1-SNAPSHOT/version -relativePath/ +relativePath../parent-pom-docbook/relativePath /parent artifactIdparent-pom-single-project/artifactId
svn commit: r955720 - /uima/build/trunk/uima-assembly-single-project/pom.xml
Author: schor Date: Thu Jun 17 20:08:36 2010 New Revision: 955720 URL: http://svn.apache.org/viewvc?rev=955720view=rev Log: [UIMA-1814] uima-assembly-single-project should have the top parent pom as its parent, not the docbook one. Modified: uima/build/trunk/uima-assembly-single-project/pom.xml Modified: uima/build/trunk/uima-assembly-single-project/pom.xml URL: http://svn.apache.org/viewvc/uima/build/trunk/uima-assembly-single-project/pom.xml?rev=955720r1=955719r2=955720view=diff == --- uima/build/trunk/uima-assembly-single-project/pom.xml (original) +++ uima/build/trunk/uima-assembly-single-project/pom.xml Thu Jun 17 20:08:36 2010 @@ -53,8 +53,8 @@ parent groupIdorg.apache.uima/groupId -artifactIdparent-pom-docbook/artifactId -version1-SNAPSHOT/version +artifactIdparent-pom-top/artifactId +version1/version relativePath/ /parent
svn commit: r955722 - in /uima/build/trunk: aggregate-parent-poms/ parent-poms/parent-pom-annotator/ parent-poms/parent-pom-distr/ parent-poms/parent-pom-docbook/ parent-poms/parent-pom-eclipse-plugin
Author: schor
Date: Thu Jun 17 20:10:53 2010
New Revision: 955722
URL: http://svn.apache.org/viewvc?rev=955722view=rev
Log:
[maven-release-plugin] prepare release aggregate-parent-poms-1
Modified:
uima/build/trunk/aggregate-parent-poms/pom.xml
uima/build/trunk/parent-poms/parent-pom-annotator/pom.xml
uima/build/trunk/parent-poms/parent-pom-distr/pom.xml
uima/build/trunk/parent-poms/parent-pom-docbook/pom.xml
uima/build/trunk/parent-poms/parent-pom-eclipse-plugins-ibm-notice/pom.xml
uima/build/trunk/parent-poms/parent-pom-eclipse-plugins/pom.xml
uima/build/trunk/parent-poms/parent-pom-ibm-notice/pom.xml
uima/build/trunk/parent-poms/parent-pom-single-project/pom.xml
uima/build/trunk/uima-assembly-single-project/pom.xml
uima/build/trunk/uima-build-helper-maven-plugin/pom.xml
uima/build/trunk/uima-docbook-resource-bundle/pom.xml
uima/build/trunk/uima-jar-resource-bundle/pom.xml
Modified: uima/build/trunk/aggregate-parent-poms/pom.xml
URL:
http://svn.apache.org/viewvc/uima/build/trunk/aggregate-parent-poms/pom.xml?rev=955722r1=955721r2=955722view=diff
==
--- uima/build/trunk/aggregate-parent-poms/pom.xml (original)
+++ uima/build/trunk/aggregate-parent-poms/pom.xml Thu Jun 17 20:10:53 2010
@@ -18,21 +18,19 @@
under the License.
--
-project xmlns=http://maven.apache.org/POM/4.0.0;
- xmlns:xsi=http://www.w3.org/2001/XMLSchema-instance;
- xsi:schemaLocation=http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd;
+project xmlns=http://maven.apache.org/POM/4.0.0;
xmlns:xsi=http://www.w3.org/2001/XMLSchema-instance;
xsi:schemaLocation=http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd;
modelVersion4.0.0/modelVersion
parent
groupIdorg.apache.uima/groupId
artifactIdparent-pom-top/artifactId
version1/version
-relativePath/
+relativePath /
/parent
artifactIdaggregate-parent-poms/artifactId
packagingpom/packaging
- version1-SNAPSHOT/version
+ version1/version
nameUIMA Aggregate: ${project.artifactId}/name
descriptionThis aggregates all the parent poms for
convenience/description
url${uimaWebsiteUrl}/url
@@ -47,13 +45,13 @@
element, and just changing the following two properties --
scm
connection
-
scm:svn:http://svn.apache.org/repos/asf/uima/${uimaScmRoot}/trunk/${uimaScmProject}
+
scm:svn:http://svn.apache.org/repos/asf/uima/build/tags/aggregate-parent-poms-1
/connection
developerConnection
-
scm:svn:https://svn.apache.org/repos/asf/uima/${uimaScmRoot}/trunk/${uimaScmProject}
+
scm:svn:https://svn.apache.org/repos/asf/uima/build/tags/aggregate-parent-poms-1
/developerConnection
url
- http://svn.apache.org/viewvc/uima/${uimaScmRoot}/trunk/${uimaScmProject}
+ http://svn.apache.org/viewvc/uima/build/tags/aggregate-parent-poms-1
/url
/scm
Modified: uima/build/trunk/parent-poms/parent-pom-annotator/pom.xml
URL:
http://svn.apache.org/viewvc/uima/build/trunk/parent-poms/parent-pom-annotator/pom.xml?rev=955722r1=955721r2=955722view=diff
==
--- uima/build/trunk/parent-poms/parent-pom-annotator/pom.xml (original)
+++ uima/build/trunk/parent-poms/parent-pom-annotator/pom.xml Thu Jun 17
20:10:53 2010
@@ -30,20 +30,18 @@
Specified as scope compile or runtime causes these to be included
in Pear lib dir
--
-project xmlns=http://maven.apache.org/POM/4.0.0;
- xmlns:xsi=http://www.w3.org/2001/XMLSchema-instance;
- xsi:schemaLocation=http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd;
+project xmlns=http://maven.apache.org/POM/4.0.0;
xmlns:xsi=http://www.w3.org/2001/XMLSchema-instance;
xsi:schemaLocation=http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd;
modelVersion4.0.0/modelVersion
parent
groupIdorg.apache.uima/groupId
artifactIdparent-pom-docbook/artifactId
-version1-SNAPSHOT/version
+version1/version
relativePath../parent-pom-docbook/relativePath
/parent
artifactIdparent-pom-annotator/artifactId
- version1-SNAPSHOT/version
+ version1/version
packagingpom/packaging
nameUIMA ${project.artifactId}/name
descriptionHolds common, factored out settings for annotators/description
@@ -59,13 +57,13 @@
element, and just changing the following two properties --
scm
connection
-
scm:svn:http://svn.apache.org/repos/asf/uima/${uimaScmRoot}/trunk/${uimaScmProject}
+
scm:svn:http://svn.apache.org/repos/asf/uima/build/tags/aggregate-parent-poms-1
/connection
developerConnection
-
scm:svn:https://svn.apache.org/repos/asf/uima/${uimaScmRoot}/trunk/${uimaScmProject}
+
scm:svn:https://svn.apache.org/repos/asf/uima/build/tags/aggregate-parent
svn commit: r955723 - /uima/build/tags/aggregate-parent-poms-1/
Author: schor Date: Thu Jun 17 20:10:59 2010 New Revision: 955723 URL: http://svn.apache.org/viewvc?rev=955723view=rev Log: [maven-scm] copy for tag aggregate-parent-poms-1 Added: uima/build/tags/aggregate-parent-poms-1/ - copied from r955722, uima/build/trunk/aggregate-parent-poms/
svn commit: r955732 - in /uima/build/trunk: aggregate-parent-poms/ parent-poms/parent-pom-annotator/ parent-poms/parent-pom-distr/ parent-poms/parent-pom-docbook/ parent-poms/parent-pom-eclipse-plugin
Author: schor
Date: Thu Jun 17 20:39:02 2010
New Revision: 955732
URL: http://svn.apache.org/viewvc?rev=955732view=rev
Log:
[maven-release-plugin] rollback the release of aggregate-parent-poms-1
Modified:
uima/build/trunk/aggregate-parent-poms/pom.xml
uima/build/trunk/parent-poms/parent-pom-annotator/pom.xml
uima/build/trunk/parent-poms/parent-pom-distr/pom.xml
uima/build/trunk/parent-poms/parent-pom-docbook/pom.xml
uima/build/trunk/parent-poms/parent-pom-eclipse-plugins-ibm-notice/pom.xml
uima/build/trunk/parent-poms/parent-pom-eclipse-plugins/pom.xml
uima/build/trunk/parent-poms/parent-pom-ibm-notice/pom.xml
uima/build/trunk/parent-poms/parent-pom-single-project/pom.xml
uima/build/trunk/uima-assembly-single-project/pom.xml
uima/build/trunk/uima-build-helper-maven-plugin/pom.xml
uima/build/trunk/uima-docbook-resource-bundle/pom.xml
uima/build/trunk/uima-jar-resource-bundle/pom.xml
Modified: uima/build/trunk/aggregate-parent-poms/pom.xml
URL:
http://svn.apache.org/viewvc/uima/build/trunk/aggregate-parent-poms/pom.xml?rev=955732r1=955731r2=955732view=diff
==
--- uima/build/trunk/aggregate-parent-poms/pom.xml (original)
+++ uima/build/trunk/aggregate-parent-poms/pom.xml Thu Jun 17 20:39:02 2010
@@ -18,19 +18,21 @@
under the License.
--
-project xmlns=http://maven.apache.org/POM/4.0.0;
xmlns:xsi=http://www.w3.org/2001/XMLSchema-instance;
xsi:schemaLocation=http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd;
+project xmlns=http://maven.apache.org/POM/4.0.0;
+ xmlns:xsi=http://www.w3.org/2001/XMLSchema-instance;
+ xsi:schemaLocation=http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd;
modelVersion4.0.0/modelVersion
parent
groupIdorg.apache.uima/groupId
artifactIdparent-pom-top/artifactId
version1/version
-relativePath /
+relativePath/
/parent
artifactIdaggregate-parent-poms/artifactId
packagingpom/packaging
- version2-SNAPSHOT/version
+ version1-SNAPSHOT/version
nameUIMA Aggregate: ${project.artifactId}/name
descriptionThis aggregates all the parent poms for
convenience/description
url${uimaWebsiteUrl}/url
@@ -45,13 +47,13 @@
element, and just changing the following two properties --
scm
connection
-
scm:svn:http://svn.apache.org/repos/asf/uima/build/trunk/aggregate-parent-poms
+
scm:svn:http://svn.apache.org/repos/asf/uima/${uimaScmRoot}/trunk/${uimaScmProject}
/connection
developerConnection
-
scm:svn:https://svn.apache.org/repos/asf/uima/build/trunk/aggregate-parent-poms
+
scm:svn:https://svn.apache.org/repos/asf/uima/${uimaScmRoot}/trunk/${uimaScmProject}
/developerConnection
url
- http://svn.apache.org/viewvc/uima/build/trunk/aggregate-parent-poms
+ http://svn.apache.org/viewvc/uima/${uimaScmRoot}/trunk/${uimaScmProject}
/url
/scm
Modified: uima/build/trunk/parent-poms/parent-pom-annotator/pom.xml
URL:
http://svn.apache.org/viewvc/uima/build/trunk/parent-poms/parent-pom-annotator/pom.xml?rev=955732r1=955731r2=955732view=diff
==
--- uima/build/trunk/parent-poms/parent-pom-annotator/pom.xml (original)
+++ uima/build/trunk/parent-poms/parent-pom-annotator/pom.xml Thu Jun 17
20:39:02 2010
@@ -30,18 +30,20 @@
Specified as scope compile or runtime causes these to be included
in Pear lib dir
--
-project xmlns=http://maven.apache.org/POM/4.0.0;
xmlns:xsi=http://www.w3.org/2001/XMLSchema-instance;
xsi:schemaLocation=http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd;
+project xmlns=http://maven.apache.org/POM/4.0.0;
+ xmlns:xsi=http://www.w3.org/2001/XMLSchema-instance;
+ xsi:schemaLocation=http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd;
modelVersion4.0.0/modelVersion
parent
groupIdorg.apache.uima/groupId
artifactIdparent-pom-docbook/artifactId
-version2-SNAPSHOT/version
+version1-SNAPSHOT/version
relativePath../parent-pom-docbook/relativePath
/parent
artifactIdparent-pom-annotator/artifactId
- version2-SNAPSHOT/version
+ version1-SNAPSHOT/version
packagingpom/packaging
nameUIMA ${project.artifactId}/name
descriptionHolds common, factored out settings for annotators/description
@@ -57,13 +59,13 @@
element, and just changing the following two properties --
scm
connection
-
scm:svn:http://svn.apache.org/repos/asf/uima/build/trunk/parent-poms/parent-pom-annotator
+
scm:svn:http://svn.apache.org/repos/asf/uima/${uimaScmRoot}/trunk/${uimaScmProject}
/connection
developerConnection
-
scm:svn:https://svn.apache.org/repos/asf/uima/build/trunk/parent-poms/parent-pom-annotator
+
scm:svn:https
svn commit: r955995 - /uima/build/trunk/uima-assembly-single-project/pom.xml
Author: schor Date: Fri Jun 18 13:11:29 2010 New Revision: 955995 URL: http://svn.apache.org/viewvc?rev=955995view=rev Log: [UIMA-1815 UIMA-1814] add relativePath to top pom, and make top pom use 2.0 version of release plugin, and set pom dependency versions for top pom to 2-SNAPSHOT in prep for release Modified: uima/build/trunk/uima-assembly-single-project/pom.xml Modified: uima/build/trunk/uima-assembly-single-project/pom.xml URL: http://svn.apache.org/viewvc/uima/build/trunk/uima-assembly-single-project/pom.xml?rev=955995r1=955994r2=955995view=diff == --- uima/build/trunk/uima-assembly-single-project/pom.xml (original) +++ uima/build/trunk/uima-assembly-single-project/pom.xml Fri Jun 18 13:11:29 2010 @@ -54,8 +54,8 @@ parent groupIdorg.apache.uima/groupId artifactIdparent-pom-top/artifactId -version1/version -relativePath/ +version2-SNAPSHOT/version +relativePath../parent-pom-top/relativePath /parent artifactIduima-assembly-single-project/artifactId
svn commit: r956002 - /uima/build/trunk/parent-poms/parent-pom-top/pom.xml
Author: schor
Date: Fri Jun 18 13:43:14 2010
New Revision: 956002
URL: http://svn.apache.org/viewvc?rev=956002view=rev
Log:
[maven-release-plugin] prepare release parent-pom-top-2
Modified:
uima/build/trunk/parent-poms/parent-pom-top/pom.xml
Modified: uima/build/trunk/parent-poms/parent-pom-top/pom.xml
URL:
http://svn.apache.org/viewvc/uima/build/trunk/parent-poms/parent-pom-top/pom.xml?rev=956002r1=956001r2=956002view=diff
==
--- uima/build/trunk/parent-poms/parent-pom-top/pom.xml (original)
+++ uima/build/trunk/parent-poms/parent-pom-top/pom.xml Fri Jun 18 13:43:14 2010
@@ -55,7 +55,7 @@
groupIdorg.apache.uima/groupId
artifactIdparent-pom-top/artifactId
- version2-SNAPSHOT/version
+ version2/version
packagingpom/packaging
nameUIMA ${project.artifactId}/name
@@ -121,13 +121,13 @@
scm
connection
-
scm:svn:http://svn.apache.org/repos/asf/uima/build/trunk/parent-poms/parent-pom-top
+ scm:svn:http://svn.apache.org/repos/asf/uima/build/tags/parent-pom-top-2
/connection
developerConnection
-
scm:svn:https://svn.apache.org/repos/asf/uima/build/trunk/parent-poms/parent-pom-top
+ scm:svn:https://svn.apache.org/repos/asf/uima/build/tags/parent-pom-top-2
/developerConnection
url
- http://svn.apache.org/viewvc/uima/build/trunk/parent-poms/parent-pom-top
+ http://svn.apache.org/viewvc/uima/build/tags/parent-pom-top-2
/url
/scm
svn commit: r956003 - /uima/build/tags/parent-pom-top-2/
Author: schor Date: Fri Jun 18 13:43:35 2010 New Revision: 956003 URL: http://svn.apache.org/viewvc?rev=956003view=rev Log: [maven-release-plugin] copy for tag parent-pom-top-2 Added: uima/build/tags/parent-pom-top-2/ - copied from r956002, uima/build/trunk/parent-poms/parent-pom-top/
svn commit: r956004 - /uima/build/trunk/parent-poms/parent-pom-top/pom.xml
Author: schor
Date: Fri Jun 18 13:43:43 2010
New Revision: 956004
URL: http://svn.apache.org/viewvc?rev=956004view=rev
Log:
[maven-release-plugin] prepare for next development iteration
Modified:
uima/build/trunk/parent-poms/parent-pom-top/pom.xml
Modified: uima/build/trunk/parent-poms/parent-pom-top/pom.xml
URL:
http://svn.apache.org/viewvc/uima/build/trunk/parent-poms/parent-pom-top/pom.xml?rev=956004r1=956003r2=956004view=diff
==
--- uima/build/trunk/parent-poms/parent-pom-top/pom.xml (original)
+++ uima/build/trunk/parent-poms/parent-pom-top/pom.xml Fri Jun 18 13:43:43 2010
@@ -55,7 +55,7 @@
groupIdorg.apache.uima/groupId
artifactIdparent-pom-top/artifactId
- version2/version
+ version3-SNAPSHOT/version
packagingpom/packaging
nameUIMA ${project.artifactId}/name
@@ -121,13 +121,13 @@
scm
connection
- scm:svn:http://svn.apache.org/repos/asf/uima/build/tags/parent-pom-top-2
+
scm:svn:http://svn.apache.org/repos/asf/uima/build/trunk/parent-poms/parent-pom-top
/connection
developerConnection
- scm:svn:https://svn.apache.org/repos/asf/uima/build/tags/parent-pom-top-2
+
scm:svn:https://svn.apache.org/repos/asf/uima/build/trunk/parent-poms/parent-pom-top
/developerConnection
url
- http://svn.apache.org/viewvc/uima/build/tags/parent-pom-top-2
+ http://svn.apache.org/viewvc/uima/build/trunk/parent-poms/parent-pom-top
/url
/scm
svn commit: r956008 - /uima/build/trunk/aggregate-parent-poms/pom.xml
Author: schor Date: Fri Jun 18 14:14:55 2010 New Revision: 956008 URL: http://svn.apache.org/viewvc?rev=956008view=rev Log: No Jira - take out parent-pom-top (again) from modules - can't be built during release. Modified: uima/build/trunk/aggregate-parent-poms/pom.xml Modified: uima/build/trunk/aggregate-parent-poms/pom.xml URL: http://svn.apache.org/viewvc/uima/build/trunk/aggregate-parent-poms/pom.xml?rev=956008r1=956007r2=956008view=diff == --- uima/build/trunk/aggregate-parent-poms/pom.xml (original) +++ uima/build/trunk/aggregate-parent-poms/pom.xml Fri Jun 18 14:14:55 2010 @@ -64,7 +64,7 @@ modules !-- can't build the top, because this pom depends on it as a parent -- -module../parent-poms/parent-pom-top/module +!--module../parent-poms/parent-pom-top/module-- module../parent-poms/parent-pom-docbook/module module../parent-poms/parent-pom-ibm-notice/module module../parent-poms/parent-pom-eclipse-plugins/module
svn commit: r956231 - /uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/ui/wizards/DocumentImportStructureProvider.java
Author: schor
Date: Sat Jun 19 14:46:12 2010
New Revision: 956231
URL: http://svn.apache.org/viewvc?rev=956231view=rev
Log:
[UIMA-1808] make compile with Java 5
Modified:
uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/ui/wizards/DocumentImportStructureProvider.java
Modified:
uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/ui/wizards/DocumentImportStructureProvider.java
URL:
http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/ui/wizards/DocumentImportStructureProvider.java?rev=956231r1=956230r2=956231view=diff
==
---
uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/ui/wizards/DocumentImportStructureProvider.java
(original)
+++
uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/ui/wizards/DocumentImportStructureProvider.java
Sat Jun 19 14:46:12 2010
@@ -53,7 +53,7 @@ import org.xml.sax.SAXException;
*/
final class DocumentImportStructureProvider implements
IImportStructureProvider {
- private final Charset importEncoding;
+ private final String importEncoding; //
https://issues.apache.org/jira/browse/UIMA-1808
private final DocumentFormat casFormat;
/**
@@ -63,7 +63,7 @@ final class DocumentImportStructureProvi
*/
public DocumentImportStructureProvider(String importEncoding,
DocumentFormat casFormat) {
- this.importEncoding = Charset.forName(importEncoding);
+ this.importEncoding = importEncoding; //
https://issues.apache.org/jira/browse/UIMA-1808
this.casFormat = casFormat;
}
svn commit: r956987 - in /uima/uimaj/trunk: aggregate-uimaj-docbooks/ aggregate-uimaj-eclipse-plugins/ aggregate-uimaj/ uimaj-bootstrap/ uimaj-component-test-util/ uimaj-eclipse-feature-runtime/ uimaj
Author: schor Date: Tue Jun 22 19:26:56 2010 New Revision: 956987 URL: http://svn.apache.org/viewvc?rev=956987view=rev Log: [UIMA-1816] update parent-pom-top version to 2 Modified: uima/uimaj/trunk/aggregate-uimaj-docbooks/pom.xml uima/uimaj/trunk/aggregate-uimaj-eclipse-plugins/pom.xml uima/uimaj/trunk/aggregate-uimaj/pom.xml uima/uimaj/trunk/uimaj-bootstrap/pom.xml uima/uimaj/trunk/uimaj-component-test-util/pom.xml uima/uimaj/trunk/uimaj-eclipse-feature-runtime/pom.xml uima/uimaj/trunk/uimaj-eclipse-feature-tools/pom.xml uima/uimaj/trunk/uimaj-eclipse-update-site/pom.xml uima/uimaj/trunk/uimaj-internal-tools/pom.xml Modified: uima/uimaj/trunk/aggregate-uimaj-docbooks/pom.xml URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/aggregate-uimaj-docbooks/pom.xml?rev=956987r1=956986r2=956987view=diff == --- uima/uimaj/trunk/aggregate-uimaj-docbooks/pom.xml (original) +++ uima/uimaj/trunk/aggregate-uimaj-docbooks/pom.xml Tue Jun 22 19:26:56 2010 @@ -25,7 +25,7 @@ parent groupIdorg.apache.uima/groupId artifactIdparent-pom-top/artifactId -version1/version +version2/version relativePath/ /parent Modified: uima/uimaj/trunk/aggregate-uimaj-eclipse-plugins/pom.xml URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/aggregate-uimaj-eclipse-plugins/pom.xml?rev=956987r1=956986r2=956987view=diff == --- uima/uimaj/trunk/aggregate-uimaj-eclipse-plugins/pom.xml (original) +++ uima/uimaj/trunk/aggregate-uimaj-eclipse-plugins/pom.xml Tue Jun 22 19:26:56 2010 @@ -25,7 +25,7 @@ parent groupIdorg.apache.uima/groupId artifactIdparent-pom-top/artifactId -version1/version +version2/version relativePath/ /parent Modified: uima/uimaj/trunk/aggregate-uimaj/pom.xml URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/aggregate-uimaj/pom.xml?rev=956987r1=956986r2=956987view=diff == --- uima/uimaj/trunk/aggregate-uimaj/pom.xml (original) +++ uima/uimaj/trunk/aggregate-uimaj/pom.xml Tue Jun 22 19:26:56 2010 @@ -25,7 +25,7 @@ parent groupIdorg.apache.uima/groupId artifactIdparent-pom-top/artifactId -version1/version +version2/version relativePath/ /parent Modified: uima/uimaj/trunk/uimaj-bootstrap/pom.xml URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-bootstrap/pom.xml?rev=956987r1=956986r2=956987view=diff == --- uima/uimaj/trunk/uimaj-bootstrap/pom.xml (original) +++ uima/uimaj/trunk/uimaj-bootstrap/pom.xml Tue Jun 22 19:26:56 2010 @@ -25,7 +25,7 @@ parent groupIdorg.apache.uima/groupId artifactIdparent-pom-top/artifactId -version1/version +version2/version relativePath/ /parent Modified: uima/uimaj/trunk/uimaj-component-test-util/pom.xml URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-component-test-util/pom.xml?rev=956987r1=956986r2=956987view=diff == --- uima/uimaj/trunk/uimaj-component-test-util/pom.xml (original) +++ uima/uimaj/trunk/uimaj-component-test-util/pom.xml Tue Jun 22 19:26:56 2010 @@ -25,7 +25,7 @@ parent groupIdorg.apache.uima/groupId artifactIdparent-pom-top/artifactId -version1/version +version2/version relativePath/ /parent Modified: uima/uimaj/trunk/uimaj-eclipse-feature-runtime/pom.xml URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-eclipse-feature-runtime/pom.xml?rev=956987r1=956986r2=956987view=diff == --- uima/uimaj/trunk/uimaj-eclipse-feature-runtime/pom.xml (original) +++ uima/uimaj/trunk/uimaj-eclipse-feature-runtime/pom.xml Tue Jun 22 19:26:56 2010 @@ -24,7 +24,7 @@ parent groupIdorg.apache.uima/groupId artifactIdparent-pom-top/artifactId -version1/version +version2/version relativePath/ /parent Modified: uima/uimaj/trunk/uimaj-eclipse-feature-tools/pom.xml URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-eclipse-feature-tools/pom.xml?rev=956987r1=956986r2=956987view=diff == --- uima/uimaj/trunk/uimaj-eclipse-feature-tools/pom.xml (original) +++ uima/uimaj/trunk/uimaj-eclipse-feature-tools/pom.xml Tue Jun 22 19:26:56 2010 @@ -24,7 +24,7 @@ parent groupIdorg.apache.uima/groupId artifactIdparent-pom-top/artifactId -version1/version +version2/version relativePath/ /parent Modified: uima/uimaj/trunk/uimaj-eclipse-update-site/pom.xml URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-eclipse-update-site/pom.xml?rev=956987r1=956986r2=956987view=diff
svn commit: r957002 - /uima/sandbox/trunk/aggregate-addons/pom.xml
Author: schor Date: Tue Jun 22 19:48:12 2010 New Revision: 957002 URL: http://svn.apache.org/viewvc?rev=957002view=rev Log: [UIMA-1816] update parent-pom-top version to 2 Modified: uima/sandbox/trunk/aggregate-addons/pom.xml Modified: uima/sandbox/trunk/aggregate-addons/pom.xml URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/aggregate-addons/pom.xml?rev=957002r1=957001r2=957002view=diff == --- uima/sandbox/trunk/aggregate-addons/pom.xml (original) +++ uima/sandbox/trunk/aggregate-addons/pom.xml Tue Jun 22 19:48:12 2010 @@ -25,7 +25,7 @@ parent groupIdorg.apache.uima/groupId artifactIdparent-pom-top/artifactId -version1/version +version2/version relativePath/ /parent
svn commit: r957195 - in /uima/build/trunk: aggregate-parent-poms/ parent-poms/parent-pom-annotator/ parent-poms/parent-pom-distr/ parent-poms/parent-pom-docbook/ parent-poms/parent-pom-eclipse-plugin
Author: schor
Date: Wed Jun 23 13:40:40 2010
New Revision: 957195
URL: http://svn.apache.org/viewvc?rev=957195view=rev
Log:
[maven-release-plugin] prepare release aggregate-parent-poms-1
Modified:
uima/build/trunk/aggregate-parent-poms/pom.xml
uima/build/trunk/parent-poms/parent-pom-annotator/pom.xml
uima/build/trunk/parent-poms/parent-pom-distr/pom.xml
uima/build/trunk/parent-poms/parent-pom-docbook/pom.xml
uima/build/trunk/parent-poms/parent-pom-eclipse-plugins-ibm-notice/pom.xml
uima/build/trunk/parent-poms/parent-pom-eclipse-plugins/pom.xml
uima/build/trunk/parent-poms/parent-pom-ibm-notice/pom.xml
uima/build/trunk/parent-poms/parent-pom-single-project/pom.xml
uima/build/trunk/uima-assembly-single-project/pom.xml
uima/build/trunk/uima-build-helper-maven-plugin/pom.xml
uima/build/trunk/uima-docbook-resource-bundle/pom.xml
uima/build/trunk/uima-jar-resource-bundle/pom.xml
Modified: uima/build/trunk/aggregate-parent-poms/pom.xml
URL:
http://svn.apache.org/viewvc/uima/build/trunk/aggregate-parent-poms/pom.xml?rev=957195r1=957194r2=957195view=diff
==
--- uima/build/trunk/aggregate-parent-poms/pom.xml (original)
+++ uima/build/trunk/aggregate-parent-poms/pom.xml Wed Jun 23 13:40:40 2010
@@ -18,9 +18,7 @@
under the License.
--
-project xmlns=http://maven.apache.org/POM/4.0.0;
- xmlns:xsi=http://www.w3.org/2001/XMLSchema-instance;
- xsi:schemaLocation=http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd;
+project xmlns=http://maven.apache.org/POM/4.0.0;
xmlns:xsi=http://www.w3.org/2001/XMLSchema-instance;
xsi:schemaLocation=http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd;
modelVersion4.0.0/modelVersion
parent
@@ -32,7 +30,7 @@
artifactIdaggregate-parent-poms/artifactId
packagingpom/packaging
- version1-SNAPSHOT/version
+ version1/version
nameUIMA Aggregate: ${project.artifactId}/name
descriptionThis aggregates all the parent poms for
convenience/description
url${uimaWebsiteUrl}/url
@@ -47,13 +45,13 @@
element, and just changing the following two properties --
scm
connection
-
scm:svn:http://svn.apache.org/repos/asf/uima/${uimaScmRoot}/trunk/${uimaScmProject}
+
scm:svn:http://svn.apache.org/repos/asf/uima/build/tags/aggregate-parent-poms-1/aggregate-parent-poms
/connection
developerConnection
-
scm:svn:https://svn.apache.org/repos/asf/uima/${uimaScmRoot}/trunk/${uimaScmProject}
+
scm:svn:https://svn.apache.org/repos/asf/uima/build/tags/aggregate-parent-poms-1/aggregate-parent-poms
/developerConnection
url
- http://svn.apache.org/viewvc/uima/${uimaScmRoot}/trunk/${uimaScmProject}
+
http://svn.apache.org/viewvc/uima/build/tags/aggregate-parent-poms-1/aggregate-parent-poms
/url
/scm
Modified: uima/build/trunk/parent-poms/parent-pom-annotator/pom.xml
URL:
http://svn.apache.org/viewvc/uima/build/trunk/parent-poms/parent-pom-annotator/pom.xml?rev=957195r1=957194r2=957195view=diff
==
--- uima/build/trunk/parent-poms/parent-pom-annotator/pom.xml (original)
+++ uima/build/trunk/parent-poms/parent-pom-annotator/pom.xml Wed Jun 23
13:40:40 2010
@@ -30,20 +30,18 @@
Specified as scope compile or runtime causes these to be included
in Pear lib dir
--
-project xmlns=http://maven.apache.org/POM/4.0.0;
- xmlns:xsi=http://www.w3.org/2001/XMLSchema-instance;
- xsi:schemaLocation=http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd;
+project xmlns=http://maven.apache.org/POM/4.0.0;
xmlns:xsi=http://www.w3.org/2001/XMLSchema-instance;
xsi:schemaLocation=http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd;
modelVersion4.0.0/modelVersion
parent
groupIdorg.apache.uima/groupId
artifactIdparent-pom-docbook/artifactId
-version1-SNAPSHOT/version
+version1/version
relativePath../parent-pom-docbook/relativePath
/parent
artifactIdparent-pom-annotator/artifactId
- version1-SNAPSHOT/version
+ version1/version
packagingpom/packaging
nameUIMA ${project.artifactId}/name
descriptionHolds common, factored out settings for annotators/description
@@ -59,13 +57,13 @@
element, and just changing the following two properties --
scm
connection
-
scm:svn:http://svn.apache.org/repos/asf/uima/${uimaScmRoot}/trunk/${uimaScmProject}
+
scm:svn:http://svn.apache.org/repos/asf/uima/build/tags/aggregate-parent-poms-1/parent-poms/parent-pom-annotator
/connection
developerConnection
-
scm:svn:https://svn.apache.org/repos/asf/uima/${uimaScmRoot}/trunk/${uimaScmProject}
+
scm:svn:https://svn.apache.org/repos/asf/uima/build/tags/aggregate-parent-poms-1/parent-poms/parent-pom
svn commit: r957196 - /uima/build/tags/aggregate-parent-poms-1/trunk/
Author: schor Date: Wed Jun 23 13:40:49 2010 New Revision: 957196 URL: http://svn.apache.org/viewvc?rev=957196view=rev Log: [maven-release-plugin] copy for tag aggregate-parent-poms-1 Added: uima/build/tags/aggregate-parent-poms-1/trunk/ - copied from r957195, uima/build/trunk/
svn commit: r957197 - in /uima/build/trunk: aggregate-parent-poms/ parent-poms/parent-pom-annotator/ parent-poms/parent-pom-distr/ parent-poms/parent-pom-docbook/ parent-poms/parent-pom-eclipse-plugin
Author: schor
Date: Wed Jun 23 13:40:55 2010
New Revision: 957197
URL: http://svn.apache.org/viewvc?rev=957197view=rev
Log:
[maven-release-plugin] prepare for next development iteration
Modified:
uima/build/trunk/aggregate-parent-poms/pom.xml
uima/build/trunk/parent-poms/parent-pom-annotator/pom.xml
uima/build/trunk/parent-poms/parent-pom-distr/pom.xml
uima/build/trunk/parent-poms/parent-pom-docbook/pom.xml
uima/build/trunk/parent-poms/parent-pom-eclipse-plugins-ibm-notice/pom.xml
uima/build/trunk/parent-poms/parent-pom-eclipse-plugins/pom.xml
uima/build/trunk/parent-poms/parent-pom-ibm-notice/pom.xml
uima/build/trunk/parent-poms/parent-pom-single-project/pom.xml
uima/build/trunk/uima-assembly-single-project/pom.xml
uima/build/trunk/uima-build-helper-maven-plugin/pom.xml
uima/build/trunk/uima-docbook-resource-bundle/pom.xml
uima/build/trunk/uima-jar-resource-bundle/pom.xml
Modified: uima/build/trunk/aggregate-parent-poms/pom.xml
URL:
http://svn.apache.org/viewvc/uima/build/trunk/aggregate-parent-poms/pom.xml?rev=957197r1=957196r2=957197view=diff
==
--- uima/build/trunk/aggregate-parent-poms/pom.xml (original)
+++ uima/build/trunk/aggregate-parent-poms/pom.xml Wed Jun 23 13:40:55 2010
@@ -30,7 +30,7 @@
artifactIdaggregate-parent-poms/artifactId
packagingpom/packaging
- version1/version
+ version2-SNAPSHOT/version
nameUIMA Aggregate: ${project.artifactId}/name
descriptionThis aggregates all the parent poms for
convenience/description
url${uimaWebsiteUrl}/url
@@ -45,13 +45,13 @@
element, and just changing the following two properties --
scm
connection
-
scm:svn:http://svn.apache.org/repos/asf/uima/build/tags/aggregate-parent-poms-1/aggregate-parent-poms
+
scm:svn:http://svn.apache.org/repos/asf/uima/build/trunk/aggregate-parent-poms
/connection
developerConnection
-
scm:svn:https://svn.apache.org/repos/asf/uima/build/tags/aggregate-parent-poms-1/aggregate-parent-poms
+
scm:svn:https://svn.apache.org/repos/asf/uima/build/trunk/aggregate-parent-poms
/developerConnection
url
-
http://svn.apache.org/viewvc/uima/build/tags/aggregate-parent-poms-1/aggregate-parent-poms
+ http://svn.apache.org/viewvc/uima/build/trunk/aggregate-parent-poms
/url
/scm
Modified: uima/build/trunk/parent-poms/parent-pom-annotator/pom.xml
URL:
http://svn.apache.org/viewvc/uima/build/trunk/parent-poms/parent-pom-annotator/pom.xml?rev=957197r1=957196r2=957197view=diff
==
--- uima/build/trunk/parent-poms/parent-pom-annotator/pom.xml (original)
+++ uima/build/trunk/parent-poms/parent-pom-annotator/pom.xml Wed Jun 23
13:40:55 2010
@@ -36,12 +36,12 @@
parent
groupIdorg.apache.uima/groupId
artifactIdparent-pom-docbook/artifactId
-version1/version
+version2-SNAPSHOT/version
relativePath../parent-pom-docbook/relativePath
/parent
artifactIdparent-pom-annotator/artifactId
- version1/version
+ version2-SNAPSHOT/version
packagingpom/packaging
nameUIMA ${project.artifactId}/name
descriptionHolds common, factored out settings for annotators/description
@@ -57,13 +57,13 @@
element, and just changing the following two properties --
scm
connection
-
scm:svn:http://svn.apache.org/repos/asf/uima/build/tags/aggregate-parent-poms-1/parent-poms/parent-pom-annotator
+
scm:svn:http://svn.apache.org/repos/asf/uima/build/trunk/parent-poms/parent-pom-annotator
/connection
developerConnection
-
scm:svn:https://svn.apache.org/repos/asf/uima/build/tags/aggregate-parent-poms-1/parent-poms/parent-pom-annotator
+
scm:svn:https://svn.apache.org/repos/asf/uima/build/trunk/parent-poms/parent-pom-annotator
/developerConnection
url
-
http://svn.apache.org/viewvc/uima/build/tags/aggregate-parent-poms-1/parent-poms/parent-pom-annotator
+
http://svn.apache.org/viewvc/uima/build/trunk/parent-poms/parent-pom-annotator
/url
/scm
Modified: uima/build/trunk/parent-poms/parent-pom-distr/pom.xml
URL:
http://svn.apache.org/viewvc/uima/build/trunk/parent-poms/parent-pom-distr/pom.xml?rev=957197r1=957196r2=957197view=diff
==
--- uima/build/trunk/parent-poms/parent-pom-distr/pom.xml (original)
+++ uima/build/trunk/parent-poms/parent-pom-distr/pom.xml Wed Jun 23 13:40:55
2010
@@ -33,7 +33,7 @@
artifactIdparent-pom-distr/artifactId
packagingpom/packaging
- version1/version
+ version2-SNAPSHOT/version
nameUIMA ${project.artifactId}/name
descriptionUIMA Parent Pom for Release distributions/description
@@ -49,13 +49,13 @@
element, and just changing the following two properties --
scm
connection
-
scm:svn:http
svn commit: r957207 - /uima/build/tags/aggregate-parent-poms-1/pom.xml
Author: schor Date: Wed Jun 23 13:58:36 2010 New Revision: 957207 URL: http://svn.apache.org/viewvc?rev=957207view=rev Log: [UIMA-1755] remove left over artifact from first try at release:prepare with wrong version of the release plugin Removed: uima/build/tags/aggregate-parent-poms-1/pom.xml
svn commit: r957311 - in /uima/build/tags/aggregate-parent-poms-1: ./ aggregate-parent-poms/ parent-poms/ trunk/ trunk/aggregate-parent-poms/ trunk/parent-poms/ trunk/uima-assembly-single-project/ tru
Author: schor Date: Wed Jun 23 19:07:36 2010 New Revision: 957311 URL: http://svn.apache.org/viewvc?rev=957311view=rev Log: no Jira - fix release:prepare error in putting the files underneath extra dir trunk by moving them and deleting extra dir Added: uima/build/tags/aggregate-parent-poms-1/LICENSE - copied unchanged from r957310, uima/build/tags/aggregate-parent-poms-1/trunk/LICENSE uima/build/tags/aggregate-parent-poms-1/NOTICE - copied unchanged from r957310, uima/build/tags/aggregate-parent-poms-1/trunk/NOTICE uima/build/tags/aggregate-parent-poms-1/aggregate-parent-poms/ - copied from r957310, uima/build/tags/aggregate-parent-poms-1/trunk/aggregate-parent-poms/ uima/build/tags/aggregate-parent-poms-1/parent-poms/ - copied from r957310, uima/build/tags/aggregate-parent-poms-1/trunk/parent-poms/ uima/build/tags/aggregate-parent-poms-1/uima-assembly-single-project/ - copied from r957310, uima/build/tags/aggregate-parent-poms-1/trunk/uima-assembly-single-project/ uima/build/tags/aggregate-parent-poms-1/uima-build-helper-maven-plugin/ - copied from r957310, uima/build/tags/aggregate-parent-poms-1/trunk/uima-build-helper-maven-plugin/ uima/build/tags/aggregate-parent-poms-1/uima-docbook-olink/ - copied from r957310, uima/build/tags/aggregate-parent-poms-1/trunk/uima-docbook-olink/ uima/build/tags/aggregate-parent-poms-1/uima-docbook-resource-bundle/ - copied from r957310, uima/build/tags/aggregate-parent-poms-1/trunk/uima-docbook-resource-bundle/ uima/build/tags/aggregate-parent-poms-1/uima-jar-resource-bundle/ - copied from r957310, uima/build/tags/aggregate-parent-poms-1/trunk/uima-jar-resource-bundle/ Removed: uima/build/tags/aggregate-parent-poms-1/trunk/LICENSE uima/build/tags/aggregate-parent-poms-1/trunk/NOTICE uima/build/tags/aggregate-parent-poms-1/trunk/aggregate-parent-poms/ uima/build/tags/aggregate-parent-poms-1/trunk/parent-poms/ uima/build/tags/aggregate-parent-poms-1/trunk/uima-assembly-single-project/ uima/build/tags/aggregate-parent-poms-1/trunk/uima-build-helper-maven-plugin/ uima/build/tags/aggregate-parent-poms-1/trunk/uima-docbook-olink/ uima/build/tags/aggregate-parent-poms-1/trunk/uima-docbook-resource-bundle/ uima/build/tags/aggregate-parent-poms-1/trunk/uima-jar-resource-bundle/
svn commit: r957312 - /uima/build/tags/aggregate-parent-poms-1/trunk/
Author: schor Date: Wed Jun 23 19:08:14 2010 New Revision: 957312 URL: http://svn.apache.org/viewvc?rev=957312view=rev Log: no Jira - fix release:prepare error in putting the files underneath extra dir trunk by moving them and deleting extra dir Removed: uima/build/tags/aggregate-parent-poms-1/trunk/
svn commit: r959771 - /uima/build/trunk/uima-jar-resource-bundle/pom.xml
Author: schor Date: Thu Jul 1 20:21:05 2010 New Revision: 959771 URL: http://svn.apache.org/viewvc?rev=959771view=rev Log: [maven-release-plugin] prepare for next development iteration Modified: uima/build/trunk/uima-jar-resource-bundle/pom.xml Modified: uima/build/trunk/uima-jar-resource-bundle/pom.xml URL: http://svn.apache.org/viewvc/uima/build/trunk/uima-jar-resource-bundle/pom.xml?rev=959771r1=959770r2=959771view=diff == --- uima/build/trunk/uima-jar-resource-bundle/pom.xml (original) +++ uima/build/trunk/uima-jar-resource-bundle/pom.xml Thu Jul 1 20:21:05 2010 @@ -27,7 +27,7 @@ /parent artifactIduima-jar-resource-bundle/artifactId - version2/version + version3-SNAPSHOT/version nameUIMA Jar shared resources/name descriptionAn archive which contains templates for generating the necessary license files and notices for all Apache releases. @@ -45,13 +45,13 @@ element, and just changing the following two properties -- scm connection - scm:svn:http://svn.apache.org/repos/asf/uima/build/tags/uima-jar-resource-bundle-2 + scm:svn:http://svn.apache.org/repos/asf/uima/build/trunk/uima-jar-resource-bundle /connection developerConnection - scm:svn:https://svn.apache.org/repos/asf/uima/build/tags/uima-jar-resource-bundle-2 + scm:svn:https://svn.apache.org/repos/asf/uima/build/trunk/uima-jar-resource-bundle /developerConnection url - http://svn.apache.org/viewvc/uima/build/tags/uima-jar-resource-bundle-2 + http://svn.apache.org/viewvc/uima/build/trunk/uima-jar-resource-bundle /url /scm
svn commit: r959769 - /uima/build/trunk/uima-jar-resource-bundle/pom.xml
Author: schor Date: Thu Jul 1 20:20:55 2010 New Revision: 959769 URL: http://svn.apache.org/viewvc?rev=959769view=rev Log: [maven-release-plugin] prepare release uima-jar-resource-bundle-2 Modified: uima/build/trunk/uima-jar-resource-bundle/pom.xml Modified: uima/build/trunk/uima-jar-resource-bundle/pom.xml URL: http://svn.apache.org/viewvc/uima/build/trunk/uima-jar-resource-bundle/pom.xml?rev=959769r1=959768r2=959769view=diff == --- uima/build/trunk/uima-jar-resource-bundle/pom.xml (original) +++ uima/build/trunk/uima-jar-resource-bundle/pom.xml Thu Jul 1 20:20:55 2010 @@ -27,7 +27,7 @@ /parent artifactIduima-jar-resource-bundle/artifactId - version2-SNAPSHOT/version + version2/version nameUIMA Jar shared resources/name descriptionAn archive which contains templates for generating the necessary license files and notices for all Apache releases. @@ -45,13 +45,13 @@ element, and just changing the following two properties -- scm connection - scm:svn:http://svn.apache.org/repos/asf/uima/build/trunk/uima-jar-resource-bundle + scm:svn:http://svn.apache.org/repos/asf/uima/build/tags/uima-jar-resource-bundle-2 /connection developerConnection - scm:svn:https://svn.apache.org/repos/asf/uima/build/trunk/uima-jar-resource-bundle + scm:svn:https://svn.apache.org/repos/asf/uima/build/tags/uima-jar-resource-bundle-2 /developerConnection url - http://svn.apache.org/viewvc/uima/build/trunk/uima-jar-resource-bundle + http://svn.apache.org/viewvc/uima/build/tags/uima-jar-resource-bundle-2 /url /scm
svn commit: r960110 - /uima/build/trunk/parent-poms/parent-pom-top/pom.xml
Author: schor Date: Fri Jul 2 21:27:49 2010 New Revision: 960110 URL: http://svn.apache.org/viewvc?rev=960110view=rev Log: [UIMA-1825] remove snapshot dependencies, also fix spelling in comment Modified: uima/build/trunk/parent-poms/parent-pom-top/pom.xml Modified: uima/build/trunk/parent-poms/parent-pom-top/pom.xml URL: http://svn.apache.org/viewvc/uima/build/trunk/parent-poms/parent-pom-top/pom.xml?rev=960110r1=960109r2=960110view=diff == --- uima/build/trunk/parent-poms/parent-pom-top/pom.xml (original) +++ uima/build/trunk/parent-poms/parent-pom-top/pom.xml Fri Jul 2 21:27:49 2010 @@ -468,7 +468,7 @@ goalsgoalprocess/goal/goals configuration resourceBundles - resourceBundleorg.apache.uima:uima-jar-resource-bundle:1-SNAPSHOT/resourceBundle + resourceBundleorg.apache.uima:uima-jar-resource-bundle:2/resourceBundle /resourceBundles /configuration /execution @@ -546,7 +546,7 @@ dependency groupIdorg.apache.uima/groupId artifactIduima-jar-resource-bundle/artifactId -version1-SNAPSHOT/version +version2/version /dependency /dependencies /plugin @@ -562,7 +562,7 @@ /execution execution idattach-sources/id -phase / !-- turn off the plan jar one -- +phase / !-- turn off the plain jar one -- /execution /executions /plugin
svn commit: r960112 - /uima/build/trunk/parent-poms/parent-pom-top/pom.xml
Author: schor
Date: Fri Jul 2 21:30:25 2010
New Revision: 960112
URL: http://svn.apache.org/viewvc?rev=960112view=rev
Log:
[maven-release-plugin] prepare release parent-pom-top-3
Modified:
uima/build/trunk/parent-poms/parent-pom-top/pom.xml
Modified: uima/build/trunk/parent-poms/parent-pom-top/pom.xml
URL:
http://svn.apache.org/viewvc/uima/build/trunk/parent-poms/parent-pom-top/pom.xml?rev=960112r1=960111r2=960112view=diff
==
--- uima/build/trunk/parent-poms/parent-pom-top/pom.xml (original)
+++ uima/build/trunk/parent-poms/parent-pom-top/pom.xml Fri Jul 2 21:30:25 2010
@@ -55,7 +55,7 @@
groupIdorg.apache.uima/groupId
artifactIdparent-pom-top/artifactId
- version3-SNAPSHOT/version
+ version3/version
packagingpom/packaging
nameUIMA ${project.artifactId}/name
@@ -121,13 +121,13 @@
scm
connection
-
scm:svn:http://svn.apache.org/repos/asf/uima/build/trunk/parent-poms/parent-pom-top
+ scm:svn:http://svn.apache.org/repos/asf/uima/build/tags/parent-pom-top-3
/connection
developerConnection
-
scm:svn:https://svn.apache.org/repos/asf/uima/build/trunk/parent-poms/parent-pom-top
+ scm:svn:https://svn.apache.org/repos/asf/uima/build/tags/parent-pom-top-3
/developerConnection
url
- http://svn.apache.org/viewvc/uima/build/trunk/parent-poms/parent-pom-top
+ http://svn.apache.org/viewvc/uima/build/tags/parent-pom-top-3
/url
/scm
svn commit: r960114 - /uima/build/trunk/parent-poms/parent-pom-top/pom.xml
Author: schor
Date: Fri Jul 2 21:30:33 2010
New Revision: 960114
URL: http://svn.apache.org/viewvc?rev=960114view=rev
Log:
[maven-release-plugin] prepare for next development iteration
Modified:
uima/build/trunk/parent-poms/parent-pom-top/pom.xml
Modified: uima/build/trunk/parent-poms/parent-pom-top/pom.xml
URL:
http://svn.apache.org/viewvc/uima/build/trunk/parent-poms/parent-pom-top/pom.xml?rev=960114r1=960113r2=960114view=diff
==
--- uima/build/trunk/parent-poms/parent-pom-top/pom.xml (original)
+++ uima/build/trunk/parent-poms/parent-pom-top/pom.xml Fri Jul 2 21:30:33 2010
@@ -55,7 +55,7 @@
groupIdorg.apache.uima/groupId
artifactIdparent-pom-top/artifactId
- version3/version
+ version4-SNAPSHOT/version
packagingpom/packaging
nameUIMA ${project.artifactId}/name
@@ -121,13 +121,13 @@
scm
connection
- scm:svn:http://svn.apache.org/repos/asf/uima/build/tags/parent-pom-top-3
+
scm:svn:http://svn.apache.org/repos/asf/uima/build/trunk/parent-poms/parent-pom-top
/connection
developerConnection
- scm:svn:https://svn.apache.org/repos/asf/uima/build/tags/parent-pom-top-3
+
scm:svn:https://svn.apache.org/repos/asf/uima/build/trunk/parent-poms/parent-pom-top
/developerConnection
url
- http://svn.apache.org/viewvc/uima/build/tags/parent-pom-top-3
+ http://svn.apache.org/viewvc/uima/build/trunk/parent-poms/parent-pom-top
/url
/scm
svn commit: r960113 - /uima/build/tags/parent-pom-top-3/
Author: schor Date: Fri Jul 2 21:30:30 2010 New Revision: 960113 URL: http://svn.apache.org/viewvc?rev=960113view=rev Log: [maven-release-plugin] copy for tag parent-pom-top-3 Added: uima/build/tags/parent-pom-top-3/ - copied from r960112, uima/build/trunk/parent-poms/parent-pom-top/
svn commit: r960958 - /uima/build/trunk/aggregate-parent-poms/pom.xml
Author: schor Date: Tue Jul 6 17:46:24 2010 New Revision: 960958 URL: http://svn.apache.org/viewvc?rev=960958view=rev Log: [UIMA-1822] override normal source-release.zip build to include special extra dir for some modules, so result will build. Also fix mistake in relativePath Modified: uima/build/trunk/aggregate-parent-poms/pom.xml Modified: uima/build/trunk/aggregate-parent-poms/pom.xml URL: http://svn.apache.org/viewvc/uima/build/trunk/aggregate-parent-poms/pom.xml?rev=960958r1=960957r2=960958view=diff == --- uima/build/trunk/aggregate-parent-poms/pom.xml (original) +++ uima/build/trunk/aggregate-parent-poms/pom.xml Tue Jul 6 17:46:24 2010 @@ -24,8 +24,8 @@ parent groupIdorg.apache.uima/groupId artifactIdparent-pom-top/artifactId -version2/version -relativePath../parent-pom-top/relativePath +version4-SNAPSHOT/version +relativePath../parent-poms/parent-pom-top/relativePath /parent artifactIdaggregate-parent-poms/artifactId @@ -79,4 +79,45 @@ module../uima-docbook-resource-bundle/module module../uima-jar-resource-bundle/module /modules + + !-- Override the default assembly for source-release to build with the + extra parent-poms directory -- + build +plugins + plugin + artifactIdmaven-assembly-plugin/artifactId + version2.2-beta-5/version + executions + execution + idsource-release-assembly/id + phasepackage/phase + goals + goalsingle/goal + /goals + configuration + runOnlyAtExecutionRoottrue/runOnlyAtExecutionRoot + tarLongFileFormatgnu/tarLongFileFormat + descriptors + descriptorsrc/main/assembly/multimodule-source-release.xml/descriptor + /descriptors + /configuration + /execution + /executions + dependencies + dependency + groupIdorg.apache.uima/groupId + artifactIduima-jar-resource-bundle/artifactId + version2/version + scopecompile/scope + /dependency + dependency + groupIdorg.apache.apache.resources/groupId + artifactIdapache-source-release-assembly-descriptor/artifactId + version1.0.2/version + scopecompile/scope + /dependency + /dependencies + /plugin +/plugins + /build /project \ No newline at end of file
svn commit: r960959 - in /uima/build/trunk/aggregate-parent-poms/src: ./ main/ main/assembly/ main/assembly/multimodule-source-release.xml
Author: schor
Date: Tue Jul 6 17:47:12 2010
New Revision: 960959
URL: http://svn.apache.org/viewvc?rev=960959view=rev
Log:
[UIMA-1822] override normal source-release.zip build to include special extra
dir for some modules, so result will build.
Added:
uima/build/trunk/aggregate-parent-poms/src/
uima/build/trunk/aggregate-parent-poms/src/main/
uima/build/trunk/aggregate-parent-poms/src/main/assembly/
uima/build/trunk/aggregate-parent-poms/src/main/assembly/multimodule-source-release.xml
Added:
uima/build/trunk/aggregate-parent-poms/src/main/assembly/multimodule-source-release.xml
URL:
http://svn.apache.org/viewvc/uima/build/trunk/aggregate-parent-poms/src/main/assembly/multimodule-source-release.xml?rev=960959view=auto
==
---
uima/build/trunk/aggregate-parent-poms/src/main/assembly/multimodule-source-release.xml
(added)
+++
uima/build/trunk/aggregate-parent-poms/src/main/assembly/multimodule-source-release.xml
Tue Jul 6 17:47:12 2010
@@ -0,0 +1,194 @@
+?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.
+--
+
+!-- create a source assembly for multi-module projects
+ Runs only at the top level
+
+ Special version for aggregate-parent-poms project
+ --
+
+assembly
+ idsource-release/id
+ formats
+formatzip/format
+ /formats
+ moduleSets
+!-- module set for submodules of parent-poms directory --
+moduleSet
+ includes
+includeorg.apache.uima:parent-pom-annotator/include
+includeorg.apache.uima:parent-pom-distr/include
+includeorg.apache.uima:parent-pom-docbook/include
+includeorg.apache.uima:parent-pom-eclipse-plugins/include
+
includeorg.apache.uima:parent-pom-eclipse-plugins-ibm-notice/include
+includeorg.apache.uima:parent-pom-ibm-notice/include
+includeorg.apache.uima:parent-pom-single-project/include
+ /includes
+ sources
+!-- this is the magic that inserts the extra directory, so the zip
file
+ has the same layout as SVN --
+
outputDirectoryMappingparent-poms/${module.artifactId}/outputDirectoryMapping
+fileSets
+ fileSet
+outputDirectory//outputDirectory
+useDefaultExcludestrue/useDefaultExcludes
+excludes
+ !-- build output --
+
exclude%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/).*${project.build.directory}.*]/exclude
+
+ !-- NOTE: Most of the following excludes should not be required
+ if the standard release process is followed. This is
because the
+ release plugin checks out project sources into a location
like
+ target/checkout, then runs the build from there. The result
is
+ a source-release archive that comes from a pretty clean
directory
+ structure.
+
+ HOWEVER, if the release plugin is configured to run extra
goals
+ or generate a project website, it's definitely possible
that some
+ of these files will be present. So, it's safer to exclude
them.
+ --
+
+ !-- IDEs --
+
exclude%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?maven-eclipse\.xml]/exclude
+
exclude%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?\.project]/exclude
+
exclude%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?\.classpath]/exclude
+
exclude%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?[^/]*\.iws]/exclude
+
exclude%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?[^/]*\.ipr]/exclude
+
exclude%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?[^/]*\.iml]/exclude
+
exclude%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?\.settings(/.*)?]/exclude
+
exclude%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?\.externalToolBuilders(/.*)?]/exclude
+
exclude%regex[(?!((?!${project.build.directory}/)[^/]+/)*src
svn commit: r960961 - in /uima/build/trunk: parent-poms/parent-pom-distr/ parent-poms/parent-pom-docbook/ parent-poms/parent-pom-single-project/ uima-assembly-single-project/ uima-build-helper-maven-p
Author: schor
Date: Tue Jul 6 17:50:04 2010
New Revision: 960961
URL: http://svn.apache.org/viewvc?rev=960961view=rev
Log:
[UIMA-1829] depend on current snapshot levels, also fix relative path for some
to include extra parent-poms dir. Also make order of sub elements in parent
standard - groupId before artifactId
Modified:
uima/build/trunk/parent-poms/parent-pom-distr/pom.xml
uima/build/trunk/parent-poms/parent-pom-docbook/pom.xml
uima/build/trunk/parent-poms/parent-pom-single-project/pom.xml
uima/build/trunk/uima-assembly-single-project/pom.xml
uima/build/trunk/uima-build-helper-maven-plugin/pom.xml
uima/build/trunk/uima-docbook-resource-bundle/pom.xml
uima/build/trunk/uima-jar-resource-bundle/pom.xml
Modified: uima/build/trunk/parent-poms/parent-pom-distr/pom.xml
URL:
http://svn.apache.org/viewvc/uima/build/trunk/parent-poms/parent-pom-distr/pom.xml?rev=960961r1=960960r2=960961view=diff
==
--- uima/build/trunk/parent-poms/parent-pom-distr/pom.xml (original)
+++ uima/build/trunk/parent-poms/parent-pom-distr/pom.xml Tue Jul 6 17:50:04
2010
@@ -27,7 +27,7 @@
parent
groupIdorg.apache.uima/groupId
artifactIdparent-pom-top/artifactId
-version2/version
+version4-SNAPSHOT/version
relativePath../parent-pom-top/relativePath
/parent
Modified: uima/build/trunk/parent-poms/parent-pom-docbook/pom.xml
URL:
http://svn.apache.org/viewvc/uima/build/trunk/parent-poms/parent-pom-docbook/pom.xml?rev=960961r1=960960r2=960961view=diff
==
--- uima/build/trunk/parent-poms/parent-pom-docbook/pom.xml (original)
+++ uima/build/trunk/parent-poms/parent-pom-docbook/pom.xml Tue Jul 6 17:50:04
2010
@@ -28,7 +28,7 @@
parent
groupIdorg.apache.uima/groupId
artifactIdparent-pom-top/artifactId
-version2/version
+version4-SNAPSHOT/version
relativePath../parent-pom-top/relativePath
/parent
@@ -129,7 +129,7 @@
plugin
groupIdorg.apache.uima/groupId
artifactIduima-build-helper-maven-plugin/artifactId
-version1-SNAPSHOT/version
+version2-SNAPSHOT/version
executions
execution
idset buildYear and buildMonth/id
@@ -179,7 +179,7 @@
artifactItem
groupIdorg.apache.uima/groupId
artifactIduima-docbook-resource-bundle/artifactId
- version1-SNAPSHOT/version
+ version2-SNAPSHOT/version
excludesMETA-INF/**/excludes
outputDirectory${project.build.directory}/outputDirectory
/artifactItem
@@ -202,7 +202,7 @@
artifactItem
groupIdorg.apache.uima/groupId
artifactIduima-docbook-resource-bundle/artifactId
- version1-SNAPSHOT/version
+ version2-SNAPSHOT/version
excludesMETA-INF/**/excludes
outputDirectory${dolRepo}/outputDirectory
/artifactItem
Modified: uima/build/trunk/parent-poms/parent-pom-single-project/pom.xml
URL:
http://svn.apache.org/viewvc/uima/build/trunk/parent-poms/parent-pom-single-project/pom.xml?rev=960961r1=960960r2=960961view=diff
==
--- uima/build/trunk/parent-poms/parent-pom-single-project/pom.xml (original)
+++ uima/build/trunk/parent-poms/parent-pom-single-project/pom.xml Tue Jul 6
17:50:04 2010
@@ -126,7 +126,7 @@
dependency
groupIdorg.apache.uima/groupId
artifactIduima-assembly-single-project/artifactId
-version1-SNAPSHOT/version
+version2-SNAPSHOT/version
/dependency
/dependencies
/plugin
Modified: uima/build/trunk/uima-assembly-single-project/pom.xml
URL:
http://svn.apache.org/viewvc/uima/build/trunk/uima-assembly-single-project/pom.xml?rev=960961r1=960960r2=960961view=diff
==
--- uima/build/trunk/uima-assembly-single-project/pom.xml (original)
+++ uima/build/trunk/uima-assembly-single-project/pom.xml Tue Jul 6 17:50:04
2010
@@ -52,8 +52,8 @@
parent
groupIdorg.apache.uima/groupId
artifactIdparent-pom-top/artifactId
-version2/version
-relativePath../parent-pom-top/relativePath
+version4-SNAPSHOT/version
+relativePath../parent-poms/parent-pom-top/relativePath
/parent
artifactIduima-assembly-single-project/artifactId
Modified: uima/build/trunk/uima-build-helper-maven-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/uima/build/trunk/uima-build-helper-maven-plugin/pom.xml?rev=960961r1=960960r2=960961view=diff
svn commit: r960962 - in /uima/uimaj/trunk: PearPackagingMavenPlugin/ aggregate-uimaj-docbooks/ aggregate-uimaj-eclipse-plugins/ aggregate-uimaj/ jVinci/ uima-docbook-overview-and-setup/ uima-docbook-
Author: schor Date: Tue Jul 6 17:52:26 2010 New Revision: 960962 URL: http://svn.apache.org/viewvc?rev=960962view=rev Log: [UIMA-1829] depend on current snapshot levels Modified: uima/uimaj/trunk/PearPackagingMavenPlugin/pom.xml uima/uimaj/trunk/aggregate-uimaj-docbooks/pom.xml uima/uimaj/trunk/aggregate-uimaj-eclipse-plugins/pom.xml uima/uimaj/trunk/aggregate-uimaj/pom.xml uima/uimaj/trunk/jVinci/pom.xml uima/uimaj/trunk/uima-docbook-overview-and-setup/pom.xml uima/uimaj/trunk/uima-docbook-references/pom.xml uima/uimaj/trunk/uima-docbook-tools/pom.xml uima/uimaj/trunk/uima-docbook-tutorials-and-users-guides/pom.xml uima/uimaj/trunk/uimaj-adapter-soap/pom.xml uima/uimaj/trunk/uimaj-adapter-vinci/pom.xml uima/uimaj/trunk/uimaj-bootstrap/pom.xml uima/uimaj/trunk/uimaj-component-test-util/pom.xml uima/uimaj/trunk/uimaj-core/pom.xml uima/uimaj/trunk/uimaj-cpe/pom.xml uima/uimaj/trunk/uimaj-distr/pom.xml uima/uimaj/trunk/uimaj-document-annotation/pom.xml uima/uimaj/trunk/uimaj-eclipse-feature-runtime/pom.xml uima/uimaj/trunk/uimaj-eclipse-feature-tools/pom.xml uima/uimaj/trunk/uimaj-eclipse-update-site/pom.xml uima/uimaj/trunk/uimaj-ep-cas-editor/pom.xml uima/uimaj/trunk/uimaj-ep-configurator/pom.xml uima/uimaj/trunk/uimaj-ep-debug/pom.xml uima/uimaj/trunk/uimaj-ep-jcasgen/pom.xml uima/uimaj/trunk/uimaj-ep-pear-packager/pom.xml uima/uimaj/trunk/uimaj-ep-runtime/pom.xml uima/uimaj/trunk/uimaj-examples/pom.xml uima/uimaj/trunk/uimaj-internal-tools/pom.xml uima/uimaj/trunk/uimaj-test-util/pom.xml uima/uimaj/trunk/uimaj-tools/pom.xml Modified: uima/uimaj/trunk/PearPackagingMavenPlugin/pom.xml URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/PearPackagingMavenPlugin/pom.xml?rev=960962r1=960961r2=960962view=diff == --- uima/uimaj/trunk/PearPackagingMavenPlugin/pom.xml (original) +++ uima/uimaj/trunk/PearPackagingMavenPlugin/pom.xml Tue Jul 6 17:52:26 2010 @@ -25,7 +25,7 @@ parent groupIdorg.apache.uima/groupId artifactIdparent-pom-docbook/artifactId -version1-SNAPSHOT/version +version2-SNAPSHOT/version relativePath/ /parent Modified: uima/uimaj/trunk/aggregate-uimaj-docbooks/pom.xml URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/aggregate-uimaj-docbooks/pom.xml?rev=960962r1=960961r2=960962view=diff == --- uima/uimaj/trunk/aggregate-uimaj-docbooks/pom.xml (original) +++ uima/uimaj/trunk/aggregate-uimaj-docbooks/pom.xml Tue Jul 6 17:52:26 2010 @@ -25,7 +25,7 @@ parent groupIdorg.apache.uima/groupId artifactIdparent-pom-top/artifactId -version2/version +version4-SNAPSHOT/version relativePath/ /parent Modified: uima/uimaj/trunk/aggregate-uimaj-eclipse-plugins/pom.xml URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/aggregate-uimaj-eclipse-plugins/pom.xml?rev=960962r1=960961r2=960962view=diff == --- uima/uimaj/trunk/aggregate-uimaj-eclipse-plugins/pom.xml (original) +++ uima/uimaj/trunk/aggregate-uimaj-eclipse-plugins/pom.xml Tue Jul 6 17:52:26 2010 @@ -25,7 +25,7 @@ parent groupIdorg.apache.uima/groupId artifactIdparent-pom-top/artifactId -version2/version +version4-SNAPSHOT/version relativePath/ /parent Modified: uima/uimaj/trunk/aggregate-uimaj/pom.xml URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/aggregate-uimaj/pom.xml?rev=960962r1=960961r2=960962view=diff == --- uima/uimaj/trunk/aggregate-uimaj/pom.xml (original) +++ uima/uimaj/trunk/aggregate-uimaj/pom.xml Tue Jul 6 17:52:26 2010 @@ -25,7 +25,7 @@ parent groupIdorg.apache.uima/groupId artifactIdparent-pom-top/artifactId -version2/version +version4-SNAPSHOT/version relativePath/ /parent Modified: uima/uimaj/trunk/jVinci/pom.xml URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/jVinci/pom.xml?rev=960962r1=960961r2=960962view=diff == --- uima/uimaj/trunk/jVinci/pom.xml (original) +++ uima/uimaj/trunk/jVinci/pom.xml Tue Jul 6 17:52:26 2010 @@ -25,7 +25,7 @@ parent groupIdorg.apache.uima/groupId artifactIdparent-pom-ibm-notice/artifactId -version1-SNAPSHOT/version +version2-SNAPSHOT/version relativePath/ /parent Modified: uima/uimaj/trunk/uima-docbook-overview-and-setup/pom.xml URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uima-docbook-overview-and-setup/pom.xml?rev=960962r1=960961r2=960962view=diff == --- uima/uimaj/trunk/uima-docbook-overview-and-setup/pom.xml (original) +++ uima/uimaj/trunk/uima-docbook
svn commit: r960963 - in /uima/sandbox/trunk: AlchemyAPIAnnotator/ BSFAnnotator/ ConceptMapper/ ConfigurableFeatureExtractor/ DictionaryAnnotator/ FsVariables/ Lucas/ OpenCalaisAnnotator/ PearPackagin
Author: schor Date: Tue Jul 6 17:53:28 2010 New Revision: 960963 URL: http://svn.apache.org/viewvc?rev=960963view=rev Log: [UIMA-1829] depend on current snapshot levels Modified: uima/sandbox/trunk/AlchemyAPIAnnotator/pom.xml uima/sandbox/trunk/BSFAnnotator/pom.xml uima/sandbox/trunk/ConceptMapper/pom.xml uima/sandbox/trunk/ConfigurableFeatureExtractor/pom.xml uima/sandbox/trunk/DictionaryAnnotator/pom.xml uima/sandbox/trunk/FsVariables/pom.xml uima/sandbox/trunk/Lucas/pom.xml uima/sandbox/trunk/OpenCalaisAnnotator/pom.xml uima/sandbox/trunk/PearPackagingAntTask/pom.xml uima/sandbox/trunk/RegularExpressionAnnotator/pom.xml uima/sandbox/trunk/SimpleServer/pom.xml uima/sandbox/trunk/SnowballAnnotator/pom.xml uima/sandbox/trunk/Tagger/pom.xml uima/sandbox/trunk/TikaAnnotator/pom.xml uima/sandbox/trunk/WhitespaceTokenizer/pom.xml uima/sandbox/trunk/aggregate-addons/pom.xml Modified: uima/sandbox/trunk/AlchemyAPIAnnotator/pom.xml URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/AlchemyAPIAnnotator/pom.xml?rev=960963r1=960962r2=960963view=diff == --- uima/sandbox/trunk/AlchemyAPIAnnotator/pom.xml (original) +++ uima/sandbox/trunk/AlchemyAPIAnnotator/pom.xml Tue Jul 6 17:53:28 2010 @@ -24,7 +24,7 @@ parent groupIdorg.apache.uima/groupId artifactIdparent-pom-annotator/artifactId -version1-SNAPSHOT/version +version2-SNAPSHOT/version relativePath/ /parent Modified: uima/sandbox/trunk/BSFAnnotator/pom.xml URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/BSFAnnotator/pom.xml?rev=960963r1=960962r2=960963view=diff == --- uima/sandbox/trunk/BSFAnnotator/pom.xml (original) +++ uima/sandbox/trunk/BSFAnnotator/pom.xml Tue Jul 6 17:53:28 2010 @@ -30,7 +30,7 @@ parent groupIdorg.apache.uima/groupId artifactIdparent-pom-single-project/artifactId -version1-SNAPSHOT/version +version2-SNAPSHOT/version relativePath/ /parent Modified: uima/sandbox/trunk/ConceptMapper/pom.xml URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/ConceptMapper/pom.xml?rev=960963r1=960962r2=960963view=diff == --- uima/sandbox/trunk/ConceptMapper/pom.xml (original) +++ uima/sandbox/trunk/ConceptMapper/pom.xml Tue Jul 6 17:53:28 2010 @@ -24,7 +24,7 @@ parent groupIdorg.apache.uima/groupId artifactIdparent-pom-annotator/artifactId -version1-SNAPSHOT/version +version2-SNAPSHOT/version relativePath/ /parent Modified: uima/sandbox/trunk/ConfigurableFeatureExtractor/pom.xml URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/ConfigurableFeatureExtractor/pom.xml?rev=960963r1=960962r2=960963view=diff == --- uima/sandbox/trunk/ConfigurableFeatureExtractor/pom.xml (original) +++ uima/sandbox/trunk/ConfigurableFeatureExtractor/pom.xml Tue Jul 6 17:53:28 2010 @@ -25,7 +25,7 @@ parent groupIdorg.apache.uima/groupId artifactIdparent-pom-annotator/artifactId -version1-SNAPSHOT/version +version2-SNAPSHOT/version relativePath/ /parent Modified: uima/sandbox/trunk/DictionaryAnnotator/pom.xml URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/DictionaryAnnotator/pom.xml?rev=960963r1=960962r2=960963view=diff == --- uima/sandbox/trunk/DictionaryAnnotator/pom.xml (original) +++ uima/sandbox/trunk/DictionaryAnnotator/pom.xml Tue Jul 6 17:53:28 2010 @@ -25,7 +25,7 @@ parent groupIdorg.apache.uima/groupId artifactIdparent-pom-annotator/artifactId -version1-SNAPSHOT/version +version2-SNAPSHOT/version relativePath/ /parent Modified: uima/sandbox/trunk/FsVariables/pom.xml URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/FsVariables/pom.xml?rev=960963r1=960962r2=960963view=diff == --- uima/sandbox/trunk/FsVariables/pom.xml (original) +++ uima/sandbox/trunk/FsVariables/pom.xml Tue Jul 6 17:53:28 2010 @@ -25,7 +25,7 @@ parent groupIdorg.apache.uima/groupId artifactIdparent-pom-single-project/artifactId -version1-SNAPSHOT/version +version2-SNAPSHOT/version relativePath/ /parent Modified: uima/sandbox/trunk/Lucas/pom.xml URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/Lucas/pom.xml?rev=960963r1=960962r2=960963view=diff == --- uima/sandbox/trunk/Lucas/pom.xml (original) +++ uima/sandbox/trunk/Lucas/pom.xml Tue Jul 6 17:53:28 2010 @@ -24,7 +24,7 @@ parent groupIdorg.apache.uima/groupId artifactIdparent-pom-annotator/artifactId -version1-SNAPSHOT
svn commit: r960967 - /uima/build/trunk/parent-poms/parent-pom-top/pom.xml
Author: schor
Date: Tue Jul 6 18:02:57 2010
New Revision: 960967
URL: http://svn.apache.org/viewvc?rev=960967view=rev
Log:
[maven-release-plugin] prepare for next development iteration
Modified:
uima/build/trunk/parent-poms/parent-pom-top/pom.xml
Modified: uima/build/trunk/parent-poms/parent-pom-top/pom.xml
URL:
http://svn.apache.org/viewvc/uima/build/trunk/parent-poms/parent-pom-top/pom.xml?rev=960967r1=960966r2=960967view=diff
==
--- uima/build/trunk/parent-poms/parent-pom-top/pom.xml (original)
+++ uima/build/trunk/parent-poms/parent-pom-top/pom.xml Tue Jul 6 18:02:57 2010
@@ -55,7 +55,7 @@
groupIdorg.apache.uima/groupId
artifactIdparent-pom-top/artifactId
- version4/version
+ version5-SNAPSHOT/version
packagingpom/packaging
nameUIMA ${project.artifactId}/name
@@ -122,13 +122,13 @@
scm
connection
- scm:svn:http://svn.apache.org/repos/asf/uima/build/tags/parent-pom-top-4
+
scm:svn:http://svn.apache.org/repos/asf/uima/build/trunk/parent-poms/parent-pom-top
/connection
developerConnection
- scm:svn:https://svn.apache.org/repos/asf/uima/build/tags/parent-pom-top-4
+
scm:svn:https://svn.apache.org/repos/asf/uima/build/trunk/parent-poms/parent-pom-top
/developerConnection
url
- http://svn.apache.org/viewvc/uima/build/tags/parent-pom-top-4
+ http://svn.apache.org/viewvc/uima/build/trunk/parent-poms/parent-pom-top
/url
/scm
svn commit: r960965 - /uima/build/trunk/parent-poms/parent-pom-top/pom.xml
Author: schor
Date: Tue Jul 6 18:02:48 2010
New Revision: 960965
URL: http://svn.apache.org/viewvc?rev=960965view=rev
Log:
[maven-release-plugin] prepare release parent-pom-top-4
Modified:
uima/build/trunk/parent-poms/parent-pom-top/pom.xml
Modified: uima/build/trunk/parent-poms/parent-pom-top/pom.xml
URL:
http://svn.apache.org/viewvc/uima/build/trunk/parent-poms/parent-pom-top/pom.xml?rev=960965r1=960964r2=960965view=diff
==
--- uima/build/trunk/parent-poms/parent-pom-top/pom.xml (original)
+++ uima/build/trunk/parent-poms/parent-pom-top/pom.xml Tue Jul 6 18:02:48 2010
@@ -55,7 +55,7 @@
groupIdorg.apache.uima/groupId
artifactIdparent-pom-top/artifactId
- version4-SNAPSHOT/version
+ version4/version
packagingpom/packaging
nameUIMA ${project.artifactId}/name
@@ -122,13 +122,13 @@
scm
connection
-
scm:svn:http://svn.apache.org/repos/asf/uima/build/trunk/parent-poms/parent-pom-top
+ scm:svn:http://svn.apache.org/repos/asf/uima/build/tags/parent-pom-top-4
/connection
developerConnection
-
scm:svn:https://svn.apache.org/repos/asf/uima/build/trunk/parent-poms/parent-pom-top
+ scm:svn:https://svn.apache.org/repos/asf/uima/build/tags/parent-pom-top-4
/developerConnection
url
- http://svn.apache.org/viewvc/uima/build/trunk/parent-poms/parent-pom-top
+ http://svn.apache.org/viewvc/uima/build/tags/parent-pom-top-4
/url
/scm
svn commit: r960966 - /uima/build/tags/parent-pom-top-4/
Author: schor Date: Tue Jul 6 18:02:54 2010 New Revision: 960966 URL: http://svn.apache.org/viewvc?rev=960966view=rev Log: [maven-release-plugin] copy for tag parent-pom-top-4 Added: uima/build/tags/parent-pom-top-4/ - copied from r960965, uima/build/trunk/parent-poms/parent-pom-top/
svn commit: r961325 - /uima/build/branches/
Author: schor Date: Wed Jul 7 09:55:35 2010 New Revision: 961325 URL: http://svn.apache.org/viewvc?rev=961325view=rev Log: [UIMA-1830] Added: uima/build/branches/
svn commit: r961327 - /uima/build/branches/depend-on-parent-pom-4/
Author: schor Date: Wed Jul 7 09:57:32 2010 New Revision: 961327 URL: http://svn.apache.org/viewvc?rev=961327view=rev Log: [UIMA-1830] Added: uima/build/branches/depend-on-parent-pom-4/ - copied from r961326, uima/build/trunk/
svn commit: r961328 - in /uima/build/branches/depend-on-parent-pom-4: aggregate-parent-poms/ parent-poms/parent-pom-distr/ parent-poms/parent-pom-docbook/ uima-assembly-single-project/ uima-build-help
Author: schor Date: Wed Jul 7 09:59:42 2010 New Revision: 961328 URL: http://svn.apache.org/viewvc?rev=961328view=rev Log: [UIMA-1830] depend on version 4 Modified: uima/build/branches/depend-on-parent-pom-4/aggregate-parent-poms/pom.xml uima/build/branches/depend-on-parent-pom-4/parent-poms/parent-pom-distr/pom.xml uima/build/branches/depend-on-parent-pom-4/parent-poms/parent-pom-docbook/pom.xml uima/build/branches/depend-on-parent-pom-4/uima-assembly-single-project/pom.xml uima/build/branches/depend-on-parent-pom-4/uima-build-helper-maven-plugin/pom.xml uima/build/branches/depend-on-parent-pom-4/uima-docbook-resource-bundle/pom.xml uima/build/branches/depend-on-parent-pom-4/uima-jar-resource-bundle/pom.xml Modified: uima/build/branches/depend-on-parent-pom-4/aggregate-parent-poms/pom.xml URL: http://svn.apache.org/viewvc/uima/build/branches/depend-on-parent-pom-4/aggregate-parent-poms/pom.xml?rev=961328r1=961327r2=961328view=diff == --- uima/build/branches/depend-on-parent-pom-4/aggregate-parent-poms/pom.xml (original) +++ uima/build/branches/depend-on-parent-pom-4/aggregate-parent-poms/pom.xml Wed Jul 7 09:59:42 2010 @@ -24,7 +24,7 @@ parent groupIdorg.apache.uima/groupId artifactIdparent-pom-top/artifactId -version4-SNAPSHOT/version +version4/version relativePath../parent-poms/parent-pom-top/relativePath /parent Modified: uima/build/branches/depend-on-parent-pom-4/parent-poms/parent-pom-distr/pom.xml URL: http://svn.apache.org/viewvc/uima/build/branches/depend-on-parent-pom-4/parent-poms/parent-pom-distr/pom.xml?rev=961328r1=961327r2=961328view=diff == --- uima/build/branches/depend-on-parent-pom-4/parent-poms/parent-pom-distr/pom.xml (original) +++ uima/build/branches/depend-on-parent-pom-4/parent-poms/parent-pom-distr/pom.xml Wed Jul 7 09:59:42 2010 @@ -27,7 +27,7 @@ parent groupIdorg.apache.uima/groupId artifactIdparent-pom-top/artifactId -version4-SNAPSHOT/version +version4/version relativePath../parent-pom-top/relativePath /parent Modified: uima/build/branches/depend-on-parent-pom-4/parent-poms/parent-pom-docbook/pom.xml URL: http://svn.apache.org/viewvc/uima/build/branches/depend-on-parent-pom-4/parent-poms/parent-pom-docbook/pom.xml?rev=961328r1=961327r2=961328view=diff == --- uima/build/branches/depend-on-parent-pom-4/parent-poms/parent-pom-docbook/pom.xml (original) +++ uima/build/branches/depend-on-parent-pom-4/parent-poms/parent-pom-docbook/pom.xml Wed Jul 7 09:59:42 2010 @@ -28,7 +28,7 @@ parent groupIdorg.apache.uima/groupId artifactIdparent-pom-top/artifactId -version4-SNAPSHOT/version +version4/version relativePath../parent-pom-top/relativePath /parent Modified: uima/build/branches/depend-on-parent-pom-4/uima-assembly-single-project/pom.xml URL: http://svn.apache.org/viewvc/uima/build/branches/depend-on-parent-pom-4/uima-assembly-single-project/pom.xml?rev=961328r1=961327r2=961328view=diff == --- uima/build/branches/depend-on-parent-pom-4/uima-assembly-single-project/pom.xml (original) +++ uima/build/branches/depend-on-parent-pom-4/uima-assembly-single-project/pom.xml Wed Jul 7 09:59:42 2010 @@ -52,7 +52,7 @@ parent groupIdorg.apache.uima/groupId artifactIdparent-pom-top/artifactId -version4-SNAPSHOT/version +version4/version relativePath../parent-poms/parent-pom-top/relativePath /parent Modified: uima/build/branches/depend-on-parent-pom-4/uima-build-helper-maven-plugin/pom.xml URL: http://svn.apache.org/viewvc/uima/build/branches/depend-on-parent-pom-4/uima-build-helper-maven-plugin/pom.xml?rev=961328r1=961327r2=961328view=diff == --- uima/build/branches/depend-on-parent-pom-4/uima-build-helper-maven-plugin/pom.xml (original) +++ uima/build/branches/depend-on-parent-pom-4/uima-build-helper-maven-plugin/pom.xml Wed Jul 7 09:59:42 2010 @@ -23,7 +23,7 @@ parent groupIdorg.apache.uima/groupId artifactIdparent-pom-top/artifactId -version4-SNAPSHOT/version +version4/version relativePath../parent-poms/parent-pom-top/relativePath /parent Modified: uima/build/branches/depend-on-parent-pom-4/uima-docbook-resource-bundle/pom.xml URL: http://svn.apache.org/viewvc/uima/build/branches/depend-on-parent-pom-4/uima-docbook-resource-bundle/pom.xml?rev=961328r1=961327r2=961328view=diff == --- uima/build/branches/depend-on-parent-pom-4/uima-docbook-resource-bundle/pom.xml (original) +++ uima/build/branches/depend-on-parent
svn commit: r961329 - /uima/uimaj/branches/depend-on-parent-pom-4/
Author: schor Date: Wed Jul 7 10:01:33 2010 New Revision: 961329 URL: http://svn.apache.org/viewvc?rev=961329view=rev Log: [UIMA-1830] Added: uima/uimaj/branches/depend-on-parent-pom-4/ - copied from r961328, uima/uimaj/trunk/
svn commit: r961332 - in /uima/uimaj/branches/depend-on-parent-pom-4: aggregate-uimaj-docbooks/ aggregate-uimaj-eclipse-plugins/ aggregate-uimaj/ uimaj-bootstrap/ uimaj-component-test-util/ uimaj-ecli
Author: schor Date: Wed Jul 7 10:07:36 2010 New Revision: 961332 URL: http://svn.apache.org/viewvc?rev=961332view=rev Log: [UIMA-1830] depend on version 4 Modified: uima/uimaj/branches/depend-on-parent-pom-4/aggregate-uimaj-docbooks/pom.xml uima/uimaj/branches/depend-on-parent-pom-4/aggregate-uimaj-eclipse-plugins/pom.xml uima/uimaj/branches/depend-on-parent-pom-4/aggregate-uimaj/pom.xml uima/uimaj/branches/depend-on-parent-pom-4/uimaj-bootstrap/pom.xml uima/uimaj/branches/depend-on-parent-pom-4/uimaj-component-test-util/pom.xml uima/uimaj/branches/depend-on-parent-pom-4/uimaj-eclipse-feature-runtime/pom.xml uima/uimaj/branches/depend-on-parent-pom-4/uimaj-eclipse-feature-tools/pom.xml uima/uimaj/branches/depend-on-parent-pom-4/uimaj-eclipse-update-site/pom.xml uima/uimaj/branches/depend-on-parent-pom-4/uimaj-internal-tools/pom.xml Modified: uima/uimaj/branches/depend-on-parent-pom-4/aggregate-uimaj-docbooks/pom.xml URL: http://svn.apache.org/viewvc/uima/uimaj/branches/depend-on-parent-pom-4/aggregate-uimaj-docbooks/pom.xml?rev=961332r1=961331r2=961332view=diff == --- uima/uimaj/branches/depend-on-parent-pom-4/aggregate-uimaj-docbooks/pom.xml (original) +++ uima/uimaj/branches/depend-on-parent-pom-4/aggregate-uimaj-docbooks/pom.xml Wed Jul 7 10:07:36 2010 @@ -25,7 +25,7 @@ parent groupIdorg.apache.uima/groupId artifactIdparent-pom-top/artifactId -version4-SNAPSHOT/version +version4/version relativePath/ /parent Modified: uima/uimaj/branches/depend-on-parent-pom-4/aggregate-uimaj-eclipse-plugins/pom.xml URL: http://svn.apache.org/viewvc/uima/uimaj/branches/depend-on-parent-pom-4/aggregate-uimaj-eclipse-plugins/pom.xml?rev=961332r1=961331r2=961332view=diff == --- uima/uimaj/branches/depend-on-parent-pom-4/aggregate-uimaj-eclipse-plugins/pom.xml (original) +++ uima/uimaj/branches/depend-on-parent-pom-4/aggregate-uimaj-eclipse-plugins/pom.xml Wed Jul 7 10:07:36 2010 @@ -25,7 +25,7 @@ parent groupIdorg.apache.uima/groupId artifactIdparent-pom-top/artifactId -version4-SNAPSHOT/version +version4/version relativePath/ /parent Modified: uima/uimaj/branches/depend-on-parent-pom-4/aggregate-uimaj/pom.xml URL: http://svn.apache.org/viewvc/uima/uimaj/branches/depend-on-parent-pom-4/aggregate-uimaj/pom.xml?rev=961332r1=961331r2=961332view=diff == --- uima/uimaj/branches/depend-on-parent-pom-4/aggregate-uimaj/pom.xml (original) +++ uima/uimaj/branches/depend-on-parent-pom-4/aggregate-uimaj/pom.xml Wed Jul 7 10:07:36 2010 @@ -25,7 +25,7 @@ parent groupIdorg.apache.uima/groupId artifactIdparent-pom-top/artifactId -version4-SNAPSHOT/version +version4/version relativePath/ /parent Modified: uima/uimaj/branches/depend-on-parent-pom-4/uimaj-bootstrap/pom.xml URL: http://svn.apache.org/viewvc/uima/uimaj/branches/depend-on-parent-pom-4/uimaj-bootstrap/pom.xml?rev=961332r1=961331r2=961332view=diff == --- uima/uimaj/branches/depend-on-parent-pom-4/uimaj-bootstrap/pom.xml (original) +++ uima/uimaj/branches/depend-on-parent-pom-4/uimaj-bootstrap/pom.xml Wed Jul 7 10:07:36 2010 @@ -25,7 +25,7 @@ parent groupIdorg.apache.uima/groupId artifactIdparent-pom-top/artifactId -version4-SNAPSHOT/version +version4/version relativePath/ /parent Modified: uima/uimaj/branches/depend-on-parent-pom-4/uimaj-component-test-util/pom.xml URL: http://svn.apache.org/viewvc/uima/uimaj/branches/depend-on-parent-pom-4/uimaj-component-test-util/pom.xml?rev=961332r1=961331r2=961332view=diff == --- uima/uimaj/branches/depend-on-parent-pom-4/uimaj-component-test-util/pom.xml (original) +++ uima/uimaj/branches/depend-on-parent-pom-4/uimaj-component-test-util/pom.xml Wed Jul 7 10:07:36 2010 @@ -25,7 +25,7 @@ parent groupIdorg.apache.uima/groupId artifactIdparent-pom-top/artifactId -version4-SNAPSHOT/version +version4/version relativePath/ /parent Modified: uima/uimaj/branches/depend-on-parent-pom-4/uimaj-eclipse-feature-runtime/pom.xml URL: http://svn.apache.org/viewvc/uima/uimaj/branches/depend-on-parent-pom-4/uimaj-eclipse-feature-runtime/pom.xml?rev=961332r1=961331r2=961332view=diff == --- uima/uimaj/branches/depend-on-parent-pom-4/uimaj-eclipse-feature-runtime/pom.xml (original) +++ uima/uimaj/branches/depend-on-parent-pom-4/uimaj-eclipse-feature-runtime/pom.xml Wed Jul 7 10:07:36 2010 @@ -24,7 +24,7 @@ parent groupIdorg.apache.uima/groupId artifactIdparent-pom
svn commit: r961333 - in /uima/uima-as/trunk: uima-as-distr/ uima-as-docbooks/ uimaj-as-activemq/ uimaj-as-camel/ uimaj-as-core/ uimaj-as-jms/ uimaj-as-osgi-runtime/ uimaj-ep-deployeditor/ uimaj-ep-ru
Author: schor Date: Wed Jul 7 10:11:29 2010 New Revision: 961333 URL: http://svn.apache.org/viewvc?rev=961333view=rev Log: [UIMA-1829] depend on current snapshot levels Modified: uima/uima-as/trunk/uima-as-distr/pom.xml uima/uima-as/trunk/uima-as-docbooks/pom.xml uima/uima-as/trunk/uimaj-as-activemq/pom.xml uima/uima-as/trunk/uimaj-as-camel/pom.xml uima/uima-as/trunk/uimaj-as-core/pom.xml uima/uima-as/trunk/uimaj-as-jms/pom.xml uima/uima-as/trunk/uimaj-as-osgi-runtime/pom.xml uima/uima-as/trunk/uimaj-ep-deployeditor/pom.xml uima/uima-as/trunk/uimaj-ep-runtime-deployeditor/pom.xml Modified: uima/uima-as/trunk/uima-as-distr/pom.xml URL: http://svn.apache.org/viewvc/uima/uima-as/trunk/uima-as-distr/pom.xml?rev=961333r1=961332r2=961333view=diff == --- uima/uima-as/trunk/uima-as-distr/pom.xml (original) +++ uima/uima-as/trunk/uima-as-distr/pom.xml Wed Jul 7 10:11:29 2010 @@ -25,7 +25,7 @@ parent groupIdorg.apache.uima/groupId artifactIdparent-pom-ibm-notice/artifactId -version1-SNAPSHOT/version +version2-SNAPSHOT/version relativePath/ /parent Modified: uima/uima-as/trunk/uima-as-docbooks/pom.xml URL: http://svn.apache.org/viewvc/uima/uima-as/trunk/uima-as-docbooks/pom.xml?rev=961333r1=961332r2=961333view=diff == --- uima/uima-as/trunk/uima-as-docbooks/pom.xml (original) +++ uima/uima-as/trunk/uima-as-docbooks/pom.xml Wed Jul 7 10:11:29 2010 @@ -26,7 +26,7 @@ parent groupIdorg.apache.uima/groupId artifactIdparent-pom-docbook/artifactId -version1-SNAPSHOT/version +version2-SNAPSHOT/version relativePath/ /parent 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=961333r1=961332r2=961333view=diff == --- uima/uima-as/trunk/uimaj-as-activemq/pom.xml (original) +++ uima/uima-as/trunk/uimaj-as-activemq/pom.xml Wed Jul 7 10:11:29 2010 @@ -25,7 +25,7 @@ parent groupIdorg.apache.uima/groupId artifactIdparent-pom-ibm-notice/artifactId -version1-SNAPSHOT/version +version2-SNAPSHOT/version relativePath/ /parent Modified: uima/uima-as/trunk/uimaj-as-camel/pom.xml URL: http://svn.apache.org/viewvc/uima/uima-as/trunk/uimaj-as-camel/pom.xml?rev=961333r1=961332r2=961333view=diff == --- uima/uima-as/trunk/uimaj-as-camel/pom.xml (original) +++ uima/uima-as/trunk/uimaj-as-camel/pom.xml Wed Jul 7 10:11:29 2010 @@ -24,7 +24,7 @@ parent groupIdorg.apache.uima/groupId artifactIdparent-pom-eclipse-plugins/artifactId -version1-SNAPSHOT/version +version2-SNAPSHOT/version relativePath/ /parent 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=961333r1=961332r2=961333view=diff == --- uima/uima-as/trunk/uimaj-as-core/pom.xml (original) +++ uima/uima-as/trunk/uimaj-as-core/pom.xml Wed Jul 7 10:11:29 2010 @@ -25,7 +25,7 @@ parent groupIdorg.apache.uima/groupId artifactIdparent-pom-ibm-notice/artifactId -version1-SNAPSHOT/version +version2-SNAPSHOT/version relativePath/ /parent 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=961333r1=961332r2=961333view=diff == --- uima/uima-as/trunk/uimaj-as-jms/pom.xml (original) +++ uima/uima-as/trunk/uimaj-as-jms/pom.xml Wed Jul 7 10:11:29 2010 @@ -25,7 +25,7 @@ parent groupIdorg.apache.uima/groupId artifactIdparent-pom-ibm-notice/artifactId -version1-SNAPSHOT/version +version2-SNAPSHOT/version relativePath/ /parent Modified: uima/uima-as/trunk/uimaj-as-osgi-runtime/pom.xml URL: http://svn.apache.org/viewvc/uima/uima-as/trunk/uimaj-as-osgi-runtime/pom.xml?rev=961333r1=961332r2=961333view=diff == --- uima/uima-as/trunk/uimaj-as-osgi-runtime/pom.xml (original) +++ uima/uima-as/trunk/uimaj-as-osgi-runtime/pom.xml Wed Jul 7 10:11:29 2010 @@ -25,7 +25,7 @@ parent groupIdorg.apache.uima/groupId artifactIdparent-pom-eclipse-plugins-ibm-notice/artifactId -version1-SNAPSHOT/version +version2-SNAPSHOT/version relativePath/ /parent Modified: uima/uima-as/trunk/uimaj-ep-deployeditor/pom.xml URL: http://svn.apache.org/viewvc/uima/uima-as/trunk/uimaj-ep-deployeditor/pom.xml?rev=961333r1=961332r2=961333view=diff
svn commit: r961335 - /uima/uima-as/branches/depend-on-parent-pom-4/
Author: schor Date: Wed Jul 7 10:14:24 2010 New Revision: 961335 URL: http://svn.apache.org/viewvc?rev=961335view=rev Log: [UIMA-1830] Added: uima/uima-as/branches/depend-on-parent-pom-4/ - copied from r961334, uima/uima-as/trunk/
svn commit: r961337 - in /uima/uima-as/branches/depend-on-parent-pom-4: aggregate-uima-as-eclipse-plugins/pom.xml aggregate-uima-as/pom.xml
Author: schor Date: Wed Jul 7 10:16:09 2010 New Revision: 961337 URL: http://svn.apache.org/viewvc?rev=961337view=rev Log: [UIMA-1830] depend on parent-pom-top version 4 Modified: uima/uima-as/branches/depend-on-parent-pom-4/aggregate-uima-as-eclipse-plugins/pom.xml uima/uima-as/branches/depend-on-parent-pom-4/aggregate-uima-as/pom.xml Modified: uima/uima-as/branches/depend-on-parent-pom-4/aggregate-uima-as-eclipse-plugins/pom.xml URL: http://svn.apache.org/viewvc/uima/uima-as/branches/depend-on-parent-pom-4/aggregate-uima-as-eclipse-plugins/pom.xml?rev=961337r1=961336r2=961337view=diff == --- uima/uima-as/branches/depend-on-parent-pom-4/aggregate-uima-as-eclipse-plugins/pom.xml (original) +++ uima/uima-as/branches/depend-on-parent-pom-4/aggregate-uima-as-eclipse-plugins/pom.xml Wed Jul 7 10:16:09 2010 @@ -25,7 +25,7 @@ parent groupIdorg.apache.uima/groupId artifactIdparent-pom-top/artifactId -version2/version +version4/version relativePath/ /parent Modified: uima/uima-as/branches/depend-on-parent-pom-4/aggregate-uima-as/pom.xml URL: http://svn.apache.org/viewvc/uima/uima-as/branches/depend-on-parent-pom-4/aggregate-uima-as/pom.xml?rev=961337r1=961336r2=961337view=diff == --- uima/uima-as/branches/depend-on-parent-pom-4/aggregate-uima-as/pom.xml (original) +++ uima/uima-as/branches/depend-on-parent-pom-4/aggregate-uima-as/pom.xml Wed Jul 7 10:16:09 2010 @@ -26,7 +26,7 @@ parent groupIdorg.apache.uima/groupId artifactIdparent-pom-top/artifactId -version2/version +version4/version relativePath/ /parent
