OPENNLP-1301: Updating dependency versions. (#373)

apache · Mar 17, 2020 · f454a8d · f454a8d
1 parent 74530a1
commit f454a8d
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 35 deletions.
diff --git a/opennlp-brat-annotator/pom.xml b/opennlp-brat-annotator/pom.xml
@@ -1,14 +1,14 @@
 <?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 
+<!-- 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">
@@ -34,13 +34,13 @@
 		<dependency>
 			<groupId>org.glassfish.jersey.containers</groupId>
 			<artifactId>jersey-container-grizzly2-http</artifactId>
-			<version>2.25</version>
+			<version>${glassfish.version}</version>
 		</dependency>
 
 		<dependency>
 			<groupId>org.glassfish.jersey.media</groupId>
 			<artifactId>jersey-media-json-jackson</artifactId>
-			<version>2.25</version>
+			<version>${glassfish.version}</version>
 		</dependency>
 
 		<dependency>

diff --git a/opennlp-morfologik-addon/pom.xml b/opennlp-morfologik-addon/pom.xml
@@ -16,7 +16,7 @@
    "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.    
+   under the License.
 -->
 
 	<modelVersion>4.0.0</modelVersion>
@@ -34,11 +34,6 @@
 
 	<url>http://maven.apache.org</url>
 
-	<properties>
-		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<morfologik.version>2.1.3</morfologik.version>
-	</properties>
-
 	<dependencies>
 		<dependency>
 			<groupId>org.carrot2</groupId>

diff --git a/opennlp-tools/pom.xml b/opennlp-tools/pom.xml
@@ -16,19 +16,19 @@
    "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.    
+   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>
-	
+
   <parent>
     <groupId>org.apache.opennlp</groupId>
     <artifactId>opennlp</artifactId>
     <version>1.9.3-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
-    
+
   <artifactId>opennlp-tools</artifactId>
   <packaging>bundle</packaging>
   <name>Apache OpenNLP Tools</name>
@@ -37,15 +37,15 @@
     <dependency>
       <groupId>org.osgi</groupId>
       <artifactId>org.osgi.core</artifactId>
-      <version>4.2.0</version>
+      <version>${osgi.version}</version>
       <scope>provided</scope>
       <optional>true</optional>
     </dependency>
 
     <dependency>
       <groupId>org.osgi</groupId>
       <artifactId>org.osgi.compendium</artifactId>
-      <version>4.2.0</version>
+      <version>${osgi.version}</version>
       <scope>provided</scope>
       <optional>true</optional>
     </dependency>
@@ -59,7 +59,7 @@
     <dependency>
       <groupId>commons-io</groupId>
       <artifactId>commons-io</artifactId>
-      <version>2.4</version>
+      <version>${commons.io.version}</version>
       <scope>test</scope>
     </dependency>
 
@@ -96,7 +96,7 @@
           </execution>
         </executions>
       </plugin>
-            
+
       <plugin>
         <artifactId>maven-javadoc-plugin</artifactId>
         <configuration>
@@ -108,7 +108,7 @@
           </execution>
         </executions>
       </plugin>
-			
+
       <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>

diff --git a/pom.xml b/pom.xml
@@ -105,7 +105,7 @@
 				<groupId>${project.groupId}</groupId>
 				<version>${project.version}</version>
 			</dependency>
-			
+
 			<dependency>
 				<artifactId>opennlp-tools</artifactId>
 				<groupId>${project.groupId}</groupId>
@@ -118,7 +118,7 @@
 				<groupId>${project.groupId}</groupId>
 				<version>${project.version}</version>
 			</dependency>
-			
+
 			<dependency>
                 <artifactId>opennlp-brat-annotator</artifactId>
                 <groupId>${project.groupId}</groupId>
@@ -139,13 +139,17 @@
 		<java.version>1.8</java.version>
 		<maven.compiler.target>1.8</maven.compiler.target>
 		<maven.version>3.3.9</maven.version>
+		<commons.io.version>2.6</commons.io.version>
 		<enforcer.plugin.version>3.0.0-M2</enforcer.plugin.version>
-		<junit.version>4.12</junit.version>
+		<glassfish.version>2.30.1</glassfish.version>
+		<junit.version>4.13</junit.version>
+		<morfologik.version>2.1.7</morfologik.version>
+		<osgi.version>4.2.0</osgi.version>
 		<checkstyle.plugin.version>2.17</checkstyle.plugin.version>
 		<opennlp.forkCount>1.0C</opennlp.forkCount>
 		<coveralls.maven.plugin>4.3.0</coveralls.maven.plugin>
 		<jacoco.maven.plugin>0.7.9</jacoco.maven.plugin>
-		<maven.surefire.plugin>2.19.1</maven.surefire.plugin>
+		<maven.surefire.plugin>2.22.2</maven.surefire.plugin>
 	</properties>
 
 	<build>
@@ -165,13 +169,13 @@
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-assembly-plugin</artifactId>
-					<version>3.1.0</version>
+					<version>3.2.0</version>
 				</plugin>
 
 				<plugin>
 					<groupId>org.apache.felix</groupId>
 					<artifactId>maven-bundle-plugin</artifactId>
-					<version>3.2.0</version>
+					<version>4.2.1</version>
 				</plugin>
 
 				<plugin>
@@ -264,7 +268,7 @@
 				<plugin>
 					<groupId>de.thetaphi</groupId>
 					<artifactId>forbiddenapis</artifactId>
-					<version>2.2</version>
+					<version>2.7</version>
 					<configuration>
 						<failOnUnsupportedJava>false</failOnUnsupportedJava>
 						<bundledSignatures>
@@ -289,7 +293,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-compiler-plugin</artifactId>
-				<version>3.3</version>
+				<version>3.8.1</version>
 				<configuration>
 					<source>${java.version}</source>
 					<target>${java.version}</target>
@@ -321,7 +325,7 @@
 
 			<plugin>
 				<artifactId>maven-javadoc-plugin</artifactId>
-				<version>3.0.1</version>
+				<version>3.1.1</version>
 				<configuration>
 					<additionalparam>-Xdoclint:none</additionalparam>
 				</configuration>
@@ -358,7 +362,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-eclipse-plugin</artifactId>
-				<version>2.8</version>
+				<version>2.10</version>
 				<configuration>
 					<workspace>../</workspace>
 					<workspaceCodeStylesURL>http://opennlp.apache.org/code-formatter/OpenNLP-Eclipse-Formatter.xml</workspaceCodeStylesURL>