From 6b850b1e2dd492d875b6b42ed2f7389f0f81bf71 Mon Sep 17 00:00:00 2001
From: Andy Seaborne <andy@apache.org>
Date: Fri, 2 Feb 2018 16:28:06 +0000
Subject: [PATCH] Apache parent POM v19

---
 jena-elephas/pom.xml | 22 ++++++++++++++++++++++
 jena-text-es/pom.xml | 10 ++++++++++
 pom.xml              |  7 +++++--
 3 files changed, 37 insertions(+), 2 deletions(-)

diff --git a/jena-elephas/pom.xml b/jena-elephas/pom.xml
index f1bec83735a..c2c71c4b160 100644
--- a/jena-elephas/pom.xml
+++ b/jena-elephas/pom.xml
@@ -58,6 +58,28 @@ limitations under the License.
     </profile>
   </profiles>
 
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-enforcer-plugin</artifactId>
+        <!-- skip does not seem to skip -->
+        <executions>
+          <execution>
+            <id>enforce</id>
+            <phase/>
+          </execution>
+        </executions>
+        <configuration>
+          <!-- The Hadoop dependency has inconsistent dependencies -->
+          <!-- Really want to just turn off <dependencyConvergence/> -->
+          <skip>true</skip>
+          <fail>false</fail>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+
   <dependencyManagement>
     <dependencies>
       <!-- Hadoop Dependencies -->
diff --git a/jena-text-es/pom.xml b/jena-text-es/pom.xml
index 71d2b29921c..e547f4e8a39 100644
--- a/jena-text-es/pom.xml
+++ b/jena-text-es/pom.xml
@@ -58,6 +58,16 @@
     <dependency>
       <groupId>org.elasticsearch.client</groupId>
       <artifactId>transport</artifactId>
+      <exclusions>
+        <!-- Take "jackson" that comes via jsonld-java
+             At Jena 3.7.0 that is jsonld-java v0.11.1 depends on jackson 2.9.0
+             whereas elasticsearch depends on jackson 2.8.6
+        -->
+        <exclusion>
+          <groupId>com.fasterxml.jackson.core</groupId>
+          <artifactId>jackson-core</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
 
     <dependency>
diff --git a/pom.xml b/pom.xml
index 2ccd2f8aeea..79e1ff78e1e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,7 +28,7 @@
   <parent>
     <groupId>org.apache</groupId>
     <artifactId>apache</artifactId>
-    <version>18</version>
+    <version>19</version>
   </parent>
 
   <licenses>
@@ -252,7 +252,9 @@
         <module>jena-fuseki1</module>
         <module>jena-csv</module>
         <module>jena-sdb</module>
-        <module>jena-maven-tools</module>
+        <!-- apache-19 breaks this
+          <module>jena-maven-tools</module>
+        -->
 
         <!-- Other -->
         <module>jena-permissions</module>
@@ -581,6 +583,7 @@
             </goals>
             <configuration combine.self="override">
               <rules>
+                <dependencyConvergence/>
                 <requireJavaVersion>
                   <version>1.8.0</version>
                 </requireJavaVersion>