Author: pkluegl
Date: Wed Nov 6 10:08:39 2019
New Revision: 1869453
URL: http://svn.apache.org/viewvc?rev=1869453&view=rev
Log:
UIMA-5997: fix java version in integration test maven project
Modified:
uima/ruta/trunk/ruta-maven-plugin/src/it/multimodule/additional/pom.xml
uima/ruta/trunk/ruta-maven-plugin/src/it/multimodule/main/pom.xml
Modified:
uima/ruta/trunk/ruta-maven-plugin/src/it/multimodule/additional/pom.xml
URL:
http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-maven-plugin/src/it/multimodule/additional/pom.xml?rev=1869453&r1=1869452&r2=1869453&view=diff
==============================================================================
--- uima/ruta/trunk/ruta-maven-plugin/src/it/multimodule/additional/pom.xml
(original)
+++ uima/ruta/trunk/ruta-maven-plugin/src/it/multimodule/additional/pom.xml Wed
Nov 6 10:08:39 2019
@@ -1,82 +1,81 @@
-<!--
- 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";
+<!-- 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/xsd/maven-4.0.0.xsd";>
<modelVersion>4.0.0</modelVersion>
<groupId>test</groupId>
<artifactId>additional</artifactId>
<version>1.0.0-SNAPSHOT</version>
+
+ <properties>
+ <maven.compiler.target>1.8</maven.compiler.target>
+ <maven.compiler.source>1.8</maven.compiler.source>
+ </properties>
+
<dependencies>
- <dependency>
- <groupId>org.apache.uima</groupId>
- <artifactId>ruta-core</artifactId>
- <version>@project.version@</version>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.5</version>
- <scope>test</scope>
- </dependency>
+ <dependency>
+ <groupId>org.apache.uima</groupId>
+ <artifactId>ruta-core</artifactId>
+ <version>@project.version@</version>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.5</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<build>
- <resources>
- <resource>
- <directory>src/main/ruta</directory>
- </resource>
- <resource>
-
<directory>${project.build.directory}/generated-sources/ruta/descriptor</directory>
- </resource>
- </resources>
+ <resources>
+ <resource>
+ <directory>src/main/ruta</directory>
+ </resource>
+ <resource>
+
<directory>${project.build.directory}/generated-sources/ruta/descriptor</directory>
+ </resource>
+ </resources>
<plugins>
- <plugin>
- <groupId>org.apache.uima</groupId>
- <artifactId>ruta-maven-plugin</artifactId>
- <version>@project.version@</version>
- <configuration>
- <scriptFiles>
- <directory>${basedir}/src/main/ruta</directory>
- <includes>
- <include>**/*.ruta</include>
- </includes>
- </scriptFiles>
-
<typeSystemOutputDirectory>${project.build.directory}/generated-sources/ruta/descriptor</typeSystemOutputDirectory>
-
<analysisEngineOutputDirectory>${project.build.directory}/generated-sources/ruta/descriptor</analysisEngineOutputDirectory>
- <descriptorPaths>
-
<descriptorPath>${project.build.directory}/generated-sources/ruta/descriptor</descriptorPath>
- </descriptorPaths>
- <analysisEngineSuffix>Engine</analysisEngineSuffix>
- <typeSystemSuffix>TypeSystem</typeSystemSuffix>
- <encoding>UTF-8</encoding>
- <importByName>true</importByName>
- <addRutaNature>false</addRutaNature>
- </configuration>
- <executions>
- <execution>
- <id>descriptors</id>
- <phase>generate-resources</phase>
- <goals>
- <goal>generate</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
+ <plugin>
+ <groupId>org.apache.uima</groupId>
+ <artifactId>ruta-maven-plugin</artifactId>
+ <version>@project.version@</version>
+ <configuration>
+ <scriptFiles>
+
<directory>${basedir}/src/main/ruta</directory>
+ <includes>
+
<include>**/*.ruta</include>
+ </includes>
+ </scriptFiles>
+
<typeSystemOutputDirectory>${project.build.directory}/generated-sources/ruta/descriptor</typeSystemOutputDirectory>
+
<analysisEngineOutputDirectory>${project.build.directory}/generated-sources/ruta/descriptor</analysisEngineOutputDirectory>
+ <descriptorPaths>
+
<descriptorPath>${project.build.directory}/generated-sources/ruta/descriptor</descriptorPath>
+ </descriptorPaths>
+
<analysisEngineSuffix>Engine</analysisEngineSuffix>
+
<typeSystemSuffix>TypeSystem</typeSystemSuffix>
+ <encoding>UTF-8</encoding>
+ <importByName>true</importByName>
+ <addRutaNature>false</addRutaNature>
+ </configuration>
+ <executions>
+ <execution>
+ <id>descriptors</id>
+
<phase>generate-resources</phase>
+ <goals>
+ <goal>generate</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
</build>
</project>
\ No newline at end of file
Modified: uima/ruta/trunk/ruta-maven-plugin/src/it/multimodule/main/pom.xml
URL:
http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-maven-plugin/src/it/multimodule/main/pom.xml?rev=1869453&r1=1869452&r2=1869453&view=diff
==============================================================================
--- uima/ruta/trunk/ruta-maven-plugin/src/it/multimodule/main/pom.xml (original)
+++ uima/ruta/trunk/ruta-maven-plugin/src/it/multimodule/main/pom.xml Wed Nov
6 10:08:39 2019
@@ -1,87 +1,86 @@
-<!--
- 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";
+<!-- 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/xsd/maven-4.0.0.xsd";>
<modelVersion>4.0.0</modelVersion>
<groupId>test</groupId>
<artifactId>main</artifactId>
<version>1.0.0-SNAPSHOT</version>
+
+ <properties>
+ <maven.compiler.target>1.8</maven.compiler.target>
+ <maven.compiler.source>1.8</maven.compiler.source>
+ </properties>
+
<dependencies>
- <dependency>
- <groupId>test</groupId>
- <artifactId>additional</artifactId>
- <version>1.0.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.uima</groupId>
- <artifactId>ruta-core</artifactId>
- <version>@project.version@</version>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.5</version>
- <scope>test</scope>
- </dependency>
+ <dependency>
+ <groupId>test</groupId>
+ <artifactId>additional</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.uima</groupId>
+ <artifactId>ruta-core</artifactId>
+ <version>@project.version@</version>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.5</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<build>
- <resources>
- <resource>
- <directory>src/main/ruta</directory>
- </resource>
- <resource>
-
<directory>${project.build.directory}/generated-sources/ruta/descriptor</directory>
- </resource>
- </resources>
+ <resources>
+ <resource>
+ <directory>src/main/ruta</directory>
+ </resource>
+ <resource>
+
<directory>${project.build.directory}/generated-sources/ruta/descriptor</directory>
+ </resource>
+ </resources>
<plugins>
- <plugin>
- <groupId>org.apache.uima</groupId>
- <artifactId>ruta-maven-plugin</artifactId>
- <version>@project.version@</version>
- <configuration>
- <scriptFiles>
- <directory>${basedir}/src/main/ruta</directory>
- <includes>
- <include>**/*.ruta</include>
- </includes>
- </scriptFiles>
-
<typeSystemOutputDirectory>${project.build.directory}/generated-sources/ruta/descriptor</typeSystemOutputDirectory>
-
<analysisEngineOutputDirectory>${project.build.directory}/generated-sources/ruta/descriptor</analysisEngineOutputDirectory>
- <descriptorPaths>
-
<descriptorPath>${project.build.directory}/generated-sources/ruta/descriptor</descriptorPath>
- </descriptorPaths>
- <analysisEngineSuffix>Engine</analysisEngineSuffix>
- <typeSystemSuffix>TypeSystem</typeSystemSuffix>
- <encoding>UTF-8</encoding>
- <importByName>true</importByName>
- <addRutaNature>false</addRutaNature>
- </configuration>
- <executions>
- <execution>
- <id>descriptors</id>
- <phase>generate-resources</phase>
- <goals>
- <goal>generate</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
+ <plugin>
+ <groupId>org.apache.uima</groupId>
+ <artifactId>ruta-maven-plugin</artifactId>
+ <version>@project.version@</version>
+ <configuration>
+ <scriptFiles>
+
<directory>${basedir}/src/main/ruta</directory>
+ <includes>
+
<include>**/*.ruta</include>
+ </includes>
+ </scriptFiles>
+
<typeSystemOutputDirectory>${project.build.directory}/generated-sources/ruta/descriptor</typeSystemOutputDirectory>
+
<analysisEngineOutputDirectory>${project.build.directory}/generated-sources/ruta/descriptor</analysisEngineOutputDirectory>
+ <descriptorPaths>
+
<descriptorPath>${project.build.directory}/generated-sources/ruta/descriptor</descriptorPath>
+ </descriptorPaths>
+
<analysisEngineSuffix>Engine</analysisEngineSuffix>
+
<typeSystemSuffix>TypeSystem</typeSystemSuffix>
+ <encoding>UTF-8</encoding>
+ <importByName>true</importByName>
+ <addRutaNature>false</addRutaNature>
+ </configuration>
+ <executions>
+ <execution>
+ <id>descriptors</id>
+
<phase>generate-resources</phase>
+ <goals>
+ <goal>generate</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
</build>
</project>
\ No newline at end of file
