From 548770743dff4dae6a26ae40c8d1abaf613a9daf Mon Sep 17 00:00:00 2001
From: ajs6f <ajs6f@apache.org>
Date: Sat, 4 Nov 2017 10:49:41 -0400
Subject: [PATCH 1/8] Upgrading commons-io and commons-codec

---
 jena-project/pom.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/jena-project/pom.xml b/jena-project/pom.xml
index f7c55a3ac2f..629429bc66f 100644
--- a/jena-project/pom.xml
+++ b/jena-project/pom.xml
@@ -60,11 +60,12 @@
     <ver.jsonldjava>0.11.1</ver.jsonldjava>
     <ver.jackson>2.9.0</ver.jackson>
 
-    <ver.commonsio>2.5</ver.commonsio>
+    <ver.commonsio>2.6</ver.commonsio>
     <ver.commonscli>1.4</ver.commonscli>
-    
+    <ver.commons-codec>1.11</ver.commons-codec>
     <ver.commonslang3>3.4</ver.commonslang3>
     <ver.commonscsv>1.4</ver.commonscsv>
+    
     <ver.dexxcollection>0.7</ver.dexxcollection>
 
     <ver.httpclient>4.5.3</ver.httpclient>
@@ -75,7 +76,6 @@
     <ver.httpcore-osgi>${ver.httpcore}</ver.httpcore-osgi>
     <ver.httpclient-osgi>${ver.httpclient}</ver.httpclient-osgi>
 
-    <ver.commons-codec>1.10</ver.commons-codec>
     <ver.lucene>6.4.1</ver.lucene>
 
     <ver.elasticsearch>5.2.2</ver.elasticsearch>

From 75d17cdbb2b788e5fc270226863cb0dd0a911c83 Mon Sep 17 00:00:00 2001
From: ajs6f <ajs6f@apache.org>
Date: Sat, 4 Nov 2017 10:53:20 -0400
Subject: [PATCH 2/8] Upgrading commons-csv

---
 jena-project/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/jena-project/pom.xml b/jena-project/pom.xml
index 629429bc66f..cc0aa75f2c4 100644
--- a/jena-project/pom.xml
+++ b/jena-project/pom.xml
@@ -64,7 +64,7 @@
     <ver.commonscli>1.4</ver.commonscli>
     <ver.commons-codec>1.11</ver.commons-codec>
     <ver.commonslang3>3.4</ver.commonslang3>
-    <ver.commonscsv>1.4</ver.commonscsv>
+    <ver.commonscsv>1.5</ver.commonscsv>
     
     <ver.dexxcollection>0.7</ver.dexxcollection>
 

From 589fe44ada8a78985af5389efc2593017b51eb61 Mon Sep 17 00:00:00 2001
From: ajs6f <ajs6f@apache.org>
Date: Sat, 4 Nov 2017 11:00:18 -0400
Subject: [PATCH 3/8] Upgrading Log4j2

---
 jena-project/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/jena-project/pom.xml b/jena-project/pom.xml
index cc0aa75f2c4..f8d1839d808 100644
--- a/jena-project/pom.xml
+++ b/jena-project/pom.xml
@@ -80,7 +80,7 @@
 
     <ver.elasticsearch>5.2.2</ver.elasticsearch>
     <!-- elasticsearch uses this by reflection -->
-    <ver.log4j2>2.7</ver.log4j2>
+    <ver.log4j2>2.9.1</ver.log4j2>
 
     <ver.spatial4j>0.6</ver.spatial4j>
 

From dd5996150add112587d4a31fd56dd062be21f160 Mon Sep 17 00:00:00 2001
From: ajs6f <ajs6f@apache.org>
Date: Sat, 4 Nov 2017 11:05:17 -0400
Subject: [PATCH 4/8] Upgrading contract test dependencies

---
 jena-project/pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/jena-project/pom.xml b/jena-project/pom.xml
index f8d1839d808..801776602da 100644
--- a/jena-project/pom.xml
+++ b/jena-project/pom.xml
@@ -92,7 +92,7 @@
 
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <maven.build.timestamp.format>yyyy-MM-dd'T'HH:mm:ssZ</maven.build.timestamp.format>
-    <ver.contract.tests>0.1.5</ver.contract.tests>
+    <ver.contract.tests>0.1.7</ver.contract.tests>
   </properties>
 
   <profiles>
@@ -642,7 +642,7 @@
                   <pluginExecutionFilter>
                     <groupId>org.xenei</groupId>
                     <artifactId>contract-test-maven-plugin</artifactId>
-                    <versionRange>[0.1.5,)</versionRange>
+                    <versionRange>[${ver.contract.tests}},)</versionRange>
                     <goals>
                       <goal>contract-test</goal>
                     </goals>

From 9f93514b78099076257836e754a63253ab71a3e0 Mon Sep 17 00:00:00 2001
From: ajs6f <ajs6f@apache.org>
Date: Sat, 4 Nov 2017 11:22:30 -0400
Subject: [PATCH 5/8] Maven plugin updates

---
 apache-jena-osgi/jena-osgi-features/pom.xml |  9 -------
 jena-fuseki2/jena-fuseki-war/pom.xml        |  2 --
 jena-jdbc/jena-jdbc-driver-bundle/pom.xml   |  2 --
 jena-jdbc/pom.xml                           |  3 ---
 jena-permissions/pom.xml                    |  3 ---
 jena-project/pom.xml                        | 30 ++++++++++++---------
 6 files changed, 17 insertions(+), 32 deletions(-)

diff --git a/apache-jena-osgi/jena-osgi-features/pom.xml b/apache-jena-osgi/jena-osgi-features/pom.xml
index f495f8853bf..d9e0f90c24b 100644
--- a/apache-jena-osgi/jena-osgi-features/pom.xml
+++ b/apache-jena-osgi/jena-osgi-features/pom.xml
@@ -29,15 +29,6 @@
   <name>Apache Jena - OSGi Karaf features</name>  
   <description>Apache Karaf features (deplyoment configurations) for easy installation and integration testing.</description>
   <build>
-    <pluginManagement>
-      <plugins>
-        <plugin>
-          <groupId>org.codehaus.mojo</groupId>
-          <artifactId>build-helper-maven-plugin</artifactId>
-          <version>1.8</version>
-        </plugin>
-      </plugins>
-    </pluginManagement>
     <resources>
       <resource>
         <directory>src/main/resources</directory>
diff --git a/jena-fuseki2/jena-fuseki-war/pom.xml b/jena-fuseki2/jena-fuseki-war/pom.xml
index 17092d935cd..1e20b08724b 100644
--- a/jena-fuseki2/jena-fuseki-war/pom.xml
+++ b/jena-fuseki2/jena-fuseki-war/pom.xml
@@ -68,9 +68,7 @@
     
     <plugins>
       <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-war-plugin</artifactId>
-        <version>2.4</version>
         <executions> 
           <execution>
             <id>generate-webapp</id>
diff --git a/jena-jdbc/jena-jdbc-driver-bundle/pom.xml b/jena-jdbc/jena-jdbc-driver-bundle/pom.xml
index 850b45fc428..ab2a5f2f402 100644
--- a/jena-jdbc/jena-jdbc-driver-bundle/pom.xml
+++ b/jena-jdbc/jena-jdbc-driver-bundle/pom.xml
@@ -104,9 +104,7 @@
 		<plugins>
 			<!-- Shade Plugin -->
 			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-shade-plugin</artifactId>
-				<version>2.1</version>
 				<configuration>
 					<transformers>
             <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer" />
diff --git a/jena-jdbc/pom.xml b/jena-jdbc/pom.xml
index d054e44fe9e..eaf41fb0701 100644
--- a/jena-jdbc/pom.xml
+++ b/jena-jdbc/pom.xml
@@ -19,9 +19,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/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
-	<groupId>org.apache.jena</groupId>
 	<artifactId>jena-jdbc</artifactId>
-	<version>3.6.0-SNAPSHOT</version>
 	<packaging>pom</packaging>
 	<name>Apache Jena - JDBC Parent</name>
 	<description>This is the parent module for the Jena JDBC modules.  These modules provide JDBC Type 4 drivers for in-memory and TDB datasets as well as remote SPARQL endpoints.</description>
@@ -63,7 +61,6 @@
 			<!-- Sources Plugin -->
 			<plugin>
 				<artifactId>maven-source-plugin</artifactId>
-				<version>2.1.1</version>
 				<executions>
 					<execution>
 						<id>bundle-sources</id>
diff --git a/jena-permissions/pom.xml b/jena-permissions/pom.xml
index 5a46c2443c8..f95d209ee4c 100644
--- a/jena-permissions/pom.xml
+++ b/jena-permissions/pom.xml
@@ -19,9 +19,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/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
-  <groupId>org.apache.jena</groupId>
   <artifactId>jena-permissions</artifactId>
-  <version>3.6.0-SNAPSHOT</version>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
@@ -50,7 +48,6 @@
 			<plugin>
 	        	<groupId>org.codehaus.mojo</groupId>
 	        	<artifactId>build-helper-maven-plugin</artifactId>
-	        	<version>1.9.1</version>
 	        	<executions>
 	          		<execution>
 	            		<id>add-example-source</id>
diff --git a/jena-project/pom.xml b/jena-project/pom.xml
index 801776602da..070fca07514 100644
--- a/jena-project/pom.xml
+++ b/jena-project/pom.xml
@@ -668,8 +668,8 @@
         </plugin>
 
         <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-source-plugin</artifactId>
+          <version>3.0.1</version>
           <executions>
             <execution>
               <id>attach-sources</id>
@@ -740,8 +740,8 @@
         </plugin>
 
         <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-dependency-plugin</artifactId>
+          <version>3.0.2</version>
           <configuration>
             <overWriteReleases>false</overWriteReleases>
             <overWriteIfNewer>true</overWriteIfNewer>
@@ -749,9 +749,8 @@
         </plugin>
 
         <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-eclipse-plugin</artifactId>
-          <version>2.9</version>
+          <version>2.10</version>
           <configuration>
             <!-- By default, have separate Eclipse and maven build areas -->
             <buildOutputDirectory>${project.build.directory}/classes-eclipse</buildOutputDirectory>
@@ -791,16 +790,23 @@
         <plugin>
           <groupId>org.apache.felix</groupId>
           <artifactId>maven-bundle-plugin</artifactId>
-          <version>2.5.3</version>
+          <version>2.5.4</version>
           <extensions>true</extensions>
         </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-shade-plugin</artifactId>
-          <version>2.4.3</version>
+          <version>3.0.0</version>
+        </plugin>
+        <plugin>
+          <groupId>org.codehaus.mojo</groupId>
+          <artifactId>build-helper-maven-plugin</artifactId>
+          <version>3.0.0</version>
+        </plugin>
+        <plugin>
+          <artifactId>maven-war-plugin</artifactId>
+          <version>3.1.0</version>
         </plugin>
-
-
       </plugins>
     </pluginManagement>
   </build>
@@ -813,7 +819,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-surefire-report-plugin</artifactId>
-        <version>2.18.1</version>
+        <version>2.20.1</version>
         <configuration>
           <outputDirectory>${project.basedir}/target/surefire-reports-html</outputDirectory>
         </configuration>
@@ -833,9 +839,8 @@
       </plugin>
 
       <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-checkstyle-plugin</artifactId>
-        <version>2.15</version>
+        <version>2.17</version>
       </plugin>
 
       <plugin>
@@ -845,9 +850,8 @@
       </plugin>
 
       <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-pmd-plugin</artifactId>
-        <version>3.4</version>
+        <version>3.8</version>
         <configuration>
           <linkXref>true</linkXref>
           <sourceEncoding>utf-8</sourceEncoding>

From 6c100d92be885f13c31c2674ead85ba2a7f2b383 Mon Sep 17 00:00:00 2001
From: ajs6f <ajs6f@apache.org>
Date: Sat, 4 Nov 2017 11:29:53 -0400
Subject: [PATCH 6/8] Moving Shiro dependency management

---
 jena-fuseki2/jena-fuseki-core/pom.xml |  2 --
 jena-fuseki2/pom.xml                  |  3 +--
 jena-permissions/pom.xml              |  1 -
 jena-project/pom.xml                  | 16 +++++++++++++++-
 4 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/jena-fuseki2/jena-fuseki-core/pom.xml b/jena-fuseki2/jena-fuseki-core/pom.xml
index 3b00aa7ccc1..f73605faaa5 100644
--- a/jena-fuseki2/jena-fuseki-core/pom.xml
+++ b/jena-fuseki2/jena-fuseki-core/pom.xml
@@ -111,13 +111,11 @@
     <dependency>
       <groupId>org.apache.shiro</groupId>
       <artifactId>shiro-core</artifactId>
-      <version>${ver.shiro}</version>
     </dependency>
 
     <dependency>
       <groupId>org.apache.shiro</groupId>
       <artifactId>shiro-web</artifactId>
-      <version>${ver.shiro}</version>
     </dependency>
 
     <!-- Logging :  Needed because the Fuseki command line manages logging -->
diff --git a/jena-fuseki2/pom.xml b/jena-fuseki2/pom.xml
index 516a1e6c877..5a2c29babc5 100644
--- a/jena-fuseki2/pom.xml
+++ b/jena-fuseki2/pom.xml
@@ -61,8 +61,7 @@
   </licenses>
 
   <properties>
-    <ver.jetty>9.4.5.v20170502</ver.jetty>
-    <ver.shiro>1.2.4</ver.shiro>
+    <ver.jetty>9.4.7.v20170914</ver.jetty>
     <maven.build.timestamp.format>yyyy-MM-dd'T'HH:mm:ssZ</maven.build.timestamp.format>
     <build.time.xsd>${maven.build.timestamp}</build.time.xsd>  
   </properties>
diff --git a/jena-permissions/pom.xml b/jena-permissions/pom.xml
index f95d209ee4c..f52a191b6d8 100644
--- a/jena-permissions/pom.xml
+++ b/jena-permissions/pom.xml
@@ -210,7 +210,6 @@
 		<dependency>
 			<groupId>org.apache.shiro</groupId>
 			<artifactId>shiro-core</artifactId>
-			<version>1.2.2</version>
 			<scope>provided</scope>
 		</dependency>
 		<dependency>
diff --git a/jena-project/pom.xml b/jena-project/pom.xml
index 070fca07514..12d78d67a0c 100644
--- a/jena-project/pom.xml
+++ b/jena-project/pom.xml
@@ -75,6 +75,8 @@
     -->
     <ver.httpcore-osgi>${ver.httpcore}</ver.httpcore-osgi>
     <ver.httpclient-osgi>${ver.httpclient}</ver.httpclient-osgi>
+    
+    <ver.shiro>1.2.4</ver.shiro>
 
     <ver.lucene>6.4.1</ver.lucene>
 
@@ -170,7 +172,19 @@
         <artifactId>commons-io</artifactId>
         <version>${ver.commonsio}</version>
       </dependency>
-      
+
+      <dependency>
+        <groupId>org.apache.shiro</groupId>
+        <artifactId>shiro-core</artifactId>
+        <version>${ver.shiro}</version>
+      </dependency>
+
+      <dependency>
+        <groupId>org.apache.shiro</groupId>
+        <artifactId>shiro-web</artifactId>
+        <version>${ver.shiro}</version>
+      </dependency>
+
       <dependency>
         <groupId>org.apache.thrift</groupId>
         <artifactId>libthrift</artifactId>

From 56f2f6bd7641a408a9821d690d0f961f03ff796d Mon Sep 17 00:00:00 2001
From: ajs6f <ajs6f@apache.org>
Date: Sat, 4 Nov 2017 11:47:09 -0400
Subject: [PATCH 7/8] Upgrading Shiro

---
 jena-project/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/jena-project/pom.xml b/jena-project/pom.xml
index 12d78d67a0c..c0e3e3d8f24 100644
--- a/jena-project/pom.xml
+++ b/jena-project/pom.xml
@@ -76,7 +76,7 @@
     <ver.httpcore-osgi>${ver.httpcore}</ver.httpcore-osgi>
     <ver.httpclient-osgi>${ver.httpclient}</ver.httpclient-osgi>
     
-    <ver.shiro>1.2.4</ver.shiro>
+    <ver.shiro>1.4.0</ver.shiro>
 
     <ver.lucene>6.4.1</ver.lucene>
 

From 3aa760ea167856e77779d0847999c2dab129788a Mon Sep 17 00:00:00 2001
From: ajs6f <ajs6f@apache.org>
Date: Sat, 4 Nov 2017 11:49:30 -0400
Subject: [PATCH 8/8] Correcting typo

---
 jena-project/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/jena-project/pom.xml b/jena-project/pom.xml
index c0e3e3d8f24..ebe99b70f14 100644
--- a/jena-project/pom.xml
+++ b/jena-project/pom.xml
@@ -656,7 +656,7 @@
                   <pluginExecutionFilter>
                     <groupId>org.xenei</groupId>
                     <artifactId>contract-test-maven-plugin</artifactId>
-                    <versionRange>[${ver.contract.tests}},)</versionRange>
+                    <versionRange>[${ver.contract.tests},)</versionRange>
                     <goals>
                       <goal>contract-test</goal>
                     </goals>