Author: rec
Date: Thu May 30 17:17:20 2013
New Revision: 1487938

URL: http://svn.apache.org/r1487938
Log:
[UIMA-2471] add a jcasgen-maven-plugin (and m2e connector)
- Moved XML preable to the initial position where necessary
- Replaced fixed reference to uima artifact verions with @project.version@
- All tests work atm except the m2e integration test. This is going to be the 
tricky one.

Modified:
    uima/uimaj/trunk/jcasgen-maven-plugin/src/it/classpath/pom.xml
    
uima/uimaj/trunk/jcasgen-maven-plugin/src/it/classpath/src/main/resources/TypeSystem.xml
    
uima/uimaj/trunk/jcasgen-maven-plugin/src/it/classpath/src/main/resources/type/Dependency.xml
    
uima/uimaj/trunk/jcasgen-maven-plugin/src/it/classpath/src/main/resources/type/Sentence.xml
    
uima/uimaj/trunk/jcasgen-maven-plugin/src/it/classpath/src/main/resources/type/Token.xml
    uima/uimaj/trunk/jcasgen-maven-plugin/src/it/multimodule/crossref1/pom.xml
    
uima/uimaj/trunk/jcasgen-maven-plugin/src/it/multimodule/crossref1/src/main/resources/type/Token.xml
    uima/uimaj/trunk/jcasgen-maven-plugin/src/it/multimodule/crossref2/pom.xml
    
uima/uimaj/trunk/jcasgen-maven-plugin/src/it/multimodule/crossref2/src/main/resources/TypeSystem.xml
    uima/uimaj/trunk/jcasgen-maven-plugin/src/it/settings.xml
    uima/uimaj/trunk/jcasgen-maven-plugin/src/it/simple/pom.xml
    
uima/uimaj/trunk/jcasgen-maven-plugin/src/it/simple/src/main/resources/TypeSystem.xml
    
uima/uimaj/trunk/jcasgen-maven-plugin/src/test/resources/classpath/src/main/resources/TypeSystem.xml
    
uima/uimaj/trunk/jcasgen-maven-plugin/src/test/resources/classpath/src/main/resources/type/Token.xml

Modified: uima/uimaj/trunk/jcasgen-maven-plugin/src/it/classpath/pom.xml
URL: 
http://svn.apache.org/viewvc/uima/uimaj/trunk/jcasgen-maven-plugin/src/it/classpath/pom.xml?rev=1487938&r1=1487937&r2=1487938&view=diff
==============================================================================
--- uima/uimaj/trunk/jcasgen-maven-plugin/src/it/classpath/pom.xml (original)
+++ uima/uimaj/trunk/jcasgen-maven-plugin/src/it/classpath/pom.xml Thu May 30 
17:17:20 2013
@@ -1,20 +1,20 @@
 <!--
-   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
+       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
+       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.
+       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/xsd/maven-4.0.0.xsd";>
@@ -45,7 +45,7 @@
                <dependency>
                        <groupId>org.apache.uima</groupId>
                        <artifactId>uimaj-core</artifactId>
-                       <version>2.4.0</version>
+                       <version>@project.version@</version>
                </dependency>
        </dependencies>
 </project>
\ No newline at end of file

Modified: 
uima/uimaj/trunk/jcasgen-maven-plugin/src/it/classpath/src/main/resources/TypeSystem.xml
URL: 
http://svn.apache.org/viewvc/uima/uimaj/trunk/jcasgen-maven-plugin/src/it/classpath/src/main/resources/TypeSystem.xml?rev=1487938&r1=1487937&r2=1487938&view=diff
==============================================================================
--- 
uima/uimaj/trunk/jcasgen-maven-plugin/src/it/classpath/src/main/resources/TypeSystem.xml
 (original)
+++ 
uima/uimaj/trunk/jcasgen-maven-plugin/src/it/classpath/src/main/resources/TypeSystem.xml
 Thu May 30 17:17:20 2013
@@ -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.
 -->
-<?xml version="1.0" encoding="UTF-8"?>
 <typeSystemDescription xmlns="http://uima.apache.org/resourceSpecifier";>
   <name>TypeSystem</name>
   <description/>

Modified: 
uima/uimaj/trunk/jcasgen-maven-plugin/src/it/classpath/src/main/resources/type/Dependency.xml
URL: 
http://svn.apache.org/viewvc/uima/uimaj/trunk/jcasgen-maven-plugin/src/it/classpath/src/main/resources/type/Dependency.xml?rev=1487938&r1=1487937&r2=1487938&view=diff
==============================================================================
--- 
uima/uimaj/trunk/jcasgen-maven-plugin/src/it/classpath/src/main/resources/type/Dependency.xml
 (original)
+++ 
uima/uimaj/trunk/jcasgen-maven-plugin/src/it/classpath/src/main/resources/type/Dependency.xml
 Thu May 30 17:17:20 2013
@@ -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.
 -->
-<?xml version="1.0" encoding="UTF-8"?>
 <typeSystemDescription xmlns="http://uima.apache.org/resourceSpecifier";>
   <name>Dependency</name>
   <description/>

Modified: 
uima/uimaj/trunk/jcasgen-maven-plugin/src/it/classpath/src/main/resources/type/Sentence.xml
URL: 
http://svn.apache.org/viewvc/uima/uimaj/trunk/jcasgen-maven-plugin/src/it/classpath/src/main/resources/type/Sentence.xml?rev=1487938&r1=1487937&r2=1487938&view=diff
==============================================================================
--- 
uima/uimaj/trunk/jcasgen-maven-plugin/src/it/classpath/src/main/resources/type/Sentence.xml
 (original)
+++ 
uima/uimaj/trunk/jcasgen-maven-plugin/src/it/classpath/src/main/resources/type/Sentence.xml
 Thu May 30 17:17:20 2013
@@ -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.
 -->
-<?xml version="1.0" encoding="UTF-8"?>
 <typeSystemDescription xmlns="http://uima.apache.org/resourceSpecifier";>
   <name>Sentence</name>
   <description/>

Modified: 
uima/uimaj/trunk/jcasgen-maven-plugin/src/it/classpath/src/main/resources/type/Token.xml
URL: 
http://svn.apache.org/viewvc/uima/uimaj/trunk/jcasgen-maven-plugin/src/it/classpath/src/main/resources/type/Token.xml?rev=1487938&r1=1487937&r2=1487938&view=diff
==============================================================================
--- 
uima/uimaj/trunk/jcasgen-maven-plugin/src/it/classpath/src/main/resources/type/Token.xml
 (original)
+++ 
uima/uimaj/trunk/jcasgen-maven-plugin/src/it/classpath/src/main/resources/type/Token.xml
 Thu May 30 17:17:20 2013
@@ -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.
 -->
-<?xml version="1.0" encoding="UTF-8"?>
 <typeSystemDescription xmlns="http://uima.apache.org/resourceSpecifier";>
   <name>Token</name>
   <description/>

Modified: 
uima/uimaj/trunk/jcasgen-maven-plugin/src/it/multimodule/crossref1/pom.xml
URL: 
http://svn.apache.org/viewvc/uima/uimaj/trunk/jcasgen-maven-plugin/src/it/multimodule/crossref1/pom.xml?rev=1487938&r1=1487937&r2=1487938&view=diff
==============================================================================
--- uima/uimaj/trunk/jcasgen-maven-plugin/src/it/multimodule/crossref1/pom.xml 
(original)
+++ uima/uimaj/trunk/jcasgen-maven-plugin/src/it/multimodule/crossref1/pom.xml 
Thu May 30 17:17:20 2013
@@ -1,20 +1,20 @@
 <!--
-   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
+       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
+       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.
+       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/xsd/maven-4.0.0.xsd";>
@@ -45,7 +45,7 @@
                <dependency>
                        <groupId>org.apache.uima</groupId>
                        <artifactId>uimaj-core</artifactId>
-                       <version>2.4.0</version>
+                       <version>@project.version@</version>
                </dependency>
        </dependencies>
 </project>
\ No newline at end of file

Modified: 
uima/uimaj/trunk/jcasgen-maven-plugin/src/it/multimodule/crossref1/src/main/resources/type/Token.xml
URL: 
http://svn.apache.org/viewvc/uima/uimaj/trunk/jcasgen-maven-plugin/src/it/multimodule/crossref1/src/main/resources/type/Token.xml?rev=1487938&r1=1487937&r2=1487938&view=diff
==============================================================================
--- 
uima/uimaj/trunk/jcasgen-maven-plugin/src/it/multimodule/crossref1/src/main/resources/type/Token.xml
 (original)
+++ 
uima/uimaj/trunk/jcasgen-maven-plugin/src/it/multimodule/crossref1/src/main/resources/type/Token.xml
 Thu May 30 17:17:20 2013
@@ -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.
 -->
-<?xml version="1.0" encoding="UTF-8"?>
 <typeSystemDescription xmlns="http://uima.apache.org/resourceSpecifier";>
   <name>Token</name>
   <description/>

Modified: 
uima/uimaj/trunk/jcasgen-maven-plugin/src/it/multimodule/crossref2/pom.xml
URL: 
http://svn.apache.org/viewvc/uima/uimaj/trunk/jcasgen-maven-plugin/src/it/multimodule/crossref2/pom.xml?rev=1487938&r1=1487937&r2=1487938&view=diff
==============================================================================
--- uima/uimaj/trunk/jcasgen-maven-plugin/src/it/multimodule/crossref2/pom.xml 
(original)
+++ uima/uimaj/trunk/jcasgen-maven-plugin/src/it/multimodule/crossref2/pom.xml 
Thu May 30 17:17:20 2013
@@ -1,20 +1,20 @@
 <!--
-   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
+       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
+       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.
+       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/xsd/maven-4.0.0.xsd";>
@@ -50,7 +50,7 @@
                <dependency>
                        <groupId>org.apache.uima</groupId>
                        <artifactId>uimaj-core</artifactId>
-                       <version>2.4.0</version>
+                       <version>@project.version@</version>
                </dependency>
        </dependencies>
 </project>
\ No newline at end of file

Modified: 
uima/uimaj/trunk/jcasgen-maven-plugin/src/it/multimodule/crossref2/src/main/resources/TypeSystem.xml
URL: 
http://svn.apache.org/viewvc/uima/uimaj/trunk/jcasgen-maven-plugin/src/it/multimodule/crossref2/src/main/resources/TypeSystem.xml?rev=1487938&r1=1487937&r2=1487938&view=diff
==============================================================================
--- 
uima/uimaj/trunk/jcasgen-maven-plugin/src/it/multimodule/crossref2/src/main/resources/TypeSystem.xml
 (original)
+++ 
uima/uimaj/trunk/jcasgen-maven-plugin/src/it/multimodule/crossref2/src/main/resources/TypeSystem.xml
 Thu May 30 17:17:20 2013
@@ -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.
 -->
-<?xml version="1.0" encoding="UTF-8"?>
 <typeSystemDescription xmlns="http://uima.apache.org/resourceSpecifier";>
   <name>TypeSystem</name>
   <description/>

Modified: uima/uimaj/trunk/jcasgen-maven-plugin/src/it/settings.xml
URL: 
http://svn.apache.org/viewvc/uima/uimaj/trunk/jcasgen-maven-plugin/src/it/settings.xml?rev=1487938&r1=1487937&r2=1487938&view=diff
==============================================================================
--- uima/uimaj/trunk/jcasgen-maven-plugin/src/it/settings.xml (original)
+++ uima/uimaj/trunk/jcasgen-maven-plugin/src/it/settings.xml Thu May 30 
17:17:20 2013
@@ -1,3 +1,4 @@
+<?xml version="1.0"?>
 <!--
    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.
 -->
-<?xml version="1.0"?>
 <settings>
        <profiles>
                <profile>

Modified: uima/uimaj/trunk/jcasgen-maven-plugin/src/it/simple/pom.xml
URL: 
http://svn.apache.org/viewvc/uima/uimaj/trunk/jcasgen-maven-plugin/src/it/simple/pom.xml?rev=1487938&r1=1487937&r2=1487938&view=diff
==============================================================================
--- uima/uimaj/trunk/jcasgen-maven-plugin/src/it/simple/pom.xml (original)
+++ uima/uimaj/trunk/jcasgen-maven-plugin/src/it/simple/pom.xml Thu May 30 
17:17:20 2013
@@ -1,20 +1,20 @@
 <!--
-   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
+       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
+       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.
+       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/xsd/maven-4.0.0.xsd";>
@@ -45,7 +45,7 @@
                <dependency>
                        <groupId>org.apache.uima</groupId>
                        <artifactId>uimaj-core</artifactId>
-                       <version>2.4.0</version>
+                       <version>@project.version@</version>
                </dependency>
        </dependencies>
 </project>
\ No newline at end of file

Modified: 
uima/uimaj/trunk/jcasgen-maven-plugin/src/it/simple/src/main/resources/TypeSystem.xml
URL: 
http://svn.apache.org/viewvc/uima/uimaj/trunk/jcasgen-maven-plugin/src/it/simple/src/main/resources/TypeSystem.xml?rev=1487938&r1=1487937&r2=1487938&view=diff
==============================================================================
--- 
uima/uimaj/trunk/jcasgen-maven-plugin/src/it/simple/src/main/resources/TypeSystem.xml
 (original)
+++ 
uima/uimaj/trunk/jcasgen-maven-plugin/src/it/simple/src/main/resources/TypeSystem.xml
 Thu May 30 17:17:20 2013
@@ -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.
 -->
-<?xml version="1.0" encoding="UTF-8"?>
 <typeSystemDescription xmlns="http://uima.apache.org/resourceSpecifier";>
   <name>TypeSystem</name>
   <description/>

Modified: 
uima/uimaj/trunk/jcasgen-maven-plugin/src/test/resources/classpath/src/main/resources/TypeSystem.xml
URL: 
http://svn.apache.org/viewvc/uima/uimaj/trunk/jcasgen-maven-plugin/src/test/resources/classpath/src/main/resources/TypeSystem.xml?rev=1487938&r1=1487937&r2=1487938&view=diff
==============================================================================
--- 
uima/uimaj/trunk/jcasgen-maven-plugin/src/test/resources/classpath/src/main/resources/TypeSystem.xml
 (original)
+++ 
uima/uimaj/trunk/jcasgen-maven-plugin/src/test/resources/classpath/src/main/resources/TypeSystem.xml
 Thu May 30 17:17:20 2013
@@ -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.
 -->
-<?xml version="1.0" encoding="UTF-8"?>
 <typeSystemDescription xmlns="http://uima.apache.org/resourceSpecifier";>
   <name>TypeSystem</name>
   <description/>

Modified: 
uima/uimaj/trunk/jcasgen-maven-plugin/src/test/resources/classpath/src/main/resources/type/Token.xml
URL: 
http://svn.apache.org/viewvc/uima/uimaj/trunk/jcasgen-maven-plugin/src/test/resources/classpath/src/main/resources/type/Token.xml?rev=1487938&r1=1487937&r2=1487938&view=diff
==============================================================================
--- 
uima/uimaj/trunk/jcasgen-maven-plugin/src/test/resources/classpath/src/main/resources/type/Token.xml
 (original)
+++ 
uima/uimaj/trunk/jcasgen-maven-plugin/src/test/resources/classpath/src/main/resources/type/Token.xml
 Thu May 30 17:17:20 2013
@@ -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.
 -->
-<?xml version="1.0" encoding="UTF-8"?>
 <typeSystemDescription xmlns="http://uima.apache.org/resourceSpecifier";>
   <name>TypeSystem</name>
   <description/>


Reply via email to