Merge pull request #326 from apache/refactoring/325-Update-dependencies
Issue #325: Update dependencies
diff --git a/jcasgen-maven-plugin/src/it/classpath/pom.xml b/jcasgen-maven-plugin/src/it/classpath/pom.xml
index a76f930..5511cdb 100644
--- a/jcasgen-maven-plugin/src/it/classpath/pom.xml
+++ b/jcasgen-maven-plugin/src/it/classpath/pom.xml
@@ -23,20 +23,11 @@
<groupId>test</groupId>
<artifactId>classpath</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>
<build>
- <!-- https://issues.apache.org/jira/browse/UIMA-5368 -->
- <pluginManagement>
- <plugins>
- <plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>3.1</version>
- <configuration>
- <source>1.7</source>
- <target>1.7</target>
- </configuration>
- </plugin>
- </plugins>
- </pluginManagement>
<plugins>
<plugin>
<groupId>org.apache.uima</groupId>
diff --git a/jcasgen-maven-plugin/src/it/m2e/pom.xml b/jcasgen-maven-plugin/src/it/m2e/pom.xml
index 7157517..000d403 100644
--- a/jcasgen-maven-plugin/src/it/m2e/pom.xml
+++ b/jcasgen-maven-plugin/src/it/m2e/pom.xml
@@ -44,21 +44,14 @@
<tycho-version>0.15.0</tycho-version>
<main.project.version>@project.version@</main.project.version>
<main.localRepositoryUrl>@localRepositoryUrl@</main.localRepositoryUrl>
+ <maven.compiler.target>1.8</maven.compiler.target>
+ <maven.compiler.source>1.8</maven.compiler.source>
</properties>
<build>
<!-- https://issues.apache.org/jira/browse/UIMA-5368 -->
<pluginManagement>
<plugins>
<plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>3.1</version>
- <configuration>
- <source>1.7</source>
- <target>1.7</target>
- </configuration>
- </plugin>
-
- <plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-surefire-plugin</artifactId>
<version>${tycho-version}</version>
diff --git a/jcasgen-maven-plugin/src/it/multimodule/crossref1/pom.xml b/jcasgen-maven-plugin/src/it/multimodule/crossref1/pom.xml
index 016706c..92942c8 100644
--- a/jcasgen-maven-plugin/src/it/multimodule/crossref1/pom.xml
+++ b/jcasgen-maven-plugin/src/it/multimodule/crossref1/pom.xml
@@ -23,20 +23,11 @@
<groupId>test</groupId>
<artifactId>crossref1</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>
<build>
- <!-- https://issues.apache.org/jira/browse/UIMA-5368 -->
- <pluginManagement>
- <plugins>
- <plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>3.1</version>
- <configuration>
- <source>1.7</source>
- <target>1.7</target>
- </configuration>
- </plugin>
- </plugins>
- </pluginManagement>
<plugins>
<plugin>
<groupId>org.apache.uima</groupId>
diff --git a/jcasgen-maven-plugin/src/it/multimodule/crossref2/pom.xml b/jcasgen-maven-plugin/src/it/multimodule/crossref2/pom.xml
index 1d22424..a48827f 100644
--- a/jcasgen-maven-plugin/src/it/multimodule/crossref2/pom.xml
+++ b/jcasgen-maven-plugin/src/it/multimodule/crossref2/pom.xml
@@ -23,20 +23,11 @@
<groupId>test</groupId>
<artifactId>crossref2</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>
<build>
- <!-- https://issues.apache.org/jira/browse/UIMA-5368 -->
- <pluginManagement>
- <plugins>
- <plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>3.1</version>
- <configuration>
- <source>1.7</source>
- <target>1.7</target>
- </configuration>
- </plugin>
- </plugins>
- </pluginManagement>
<plugins>
<plugin>
<groupId>org.apache.uima</groupId>
diff --git a/jcasgen-maven-plugin/src/it/simple/pom.xml b/jcasgen-maven-plugin/src/it/simple/pom.xml
index aeb2455..6395e39 100644
--- a/jcasgen-maven-plugin/src/it/simple/pom.xml
+++ b/jcasgen-maven-plugin/src/it/simple/pom.xml
@@ -23,20 +23,11 @@
<groupId>test</groupId>
<artifactId>simple</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>
<build>
- <!-- https://issues.apache.org/jira/browse/UIMA-5368 -->
- <pluginManagement>
- <plugins>
- <plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>3.1</version>
- <configuration>
- <source>1.7</source>
- <target>1.7</target>
- </configuration>
- </plugin>
- </plugins>
- </pluginManagement>
<plugins>
<plugin>
<groupId>org.apache.uima</groupId>
diff --git a/uimaj-parent/pom.xml b/uimaj-parent/pom.xml
index e17458b..0cd9709 100644
--- a/uimaj-parent/pom.xml
+++ b/uimaj-parent/pom.xml
@@ -32,7 +32,7 @@
<groupId>org.apache.uima</groupId>
<artifactId>parent-pom</artifactId>
<relativePath />
- <version>16</version>
+ <version>17-SNAPSHOT</version>
</parent>
<artifactId>uimaj-parent</artifactId>
@@ -86,6 +86,7 @@
- The Eclipse Plugin modules use version ranges for their dependencies. These could resolve to
- SNAPSHOT versions if we have a SNAPSHOT repo declaration here. Thus, this repo should only
- be enabled when really needed.
+ -->
<repository>
<id>apache.snapshots</id>
<name>Apache Snapshot Repository</name>
@@ -97,7 +98,6 @@
<enabled>true</enabled>
</snapshots>
</repository>
- -->
<repository>
<id>${eclipseP2RepoId}</id>
