From d56953c8eff6ae7c92d6ce9705f85fb44447d103 Mon Sep 17 00:00:00 2001
From: Kevin Risden <risdenk@avalonconsult.com>
Date: Fri, 30 Sep 2016 09:28:22 -0500
Subject: [PATCH] [solr] Skip Solr 5.x tests with JDK 9
---
solr/pom.xml | 53 ++++++++++++++++++++++++++++------------------------
1 file changed, 29 insertions(+), 24 deletions(-)
diff --git a/solr/pom.xml b/solr/pom.xml
index 4ce44ed1..09ada0d8 100644
--- a/solr/pom.xml
+++ b/solr/pom.xml
@@ -18,31 +18,36 @@ LICENSE file.
-->
<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/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>com.yahoo.ycsb</groupId>
- <artifactId>binding-parent</artifactId>
- <version>0.12.0-SNAPSHOT</version>
- <relativePath>../binding-parent</relativePath>
- </parent>
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>com.yahoo.ycsb</groupId>
+ <artifactId>binding-parent</artifactId>
+ <version>0.12.0-SNAPSHOT</version>
+ <relativePath>../binding-parent</relativePath>
+ </parent>
- <artifactId>solr-binding</artifactId>
- <name>Solr Binding</name>
- <packaging>jar</packaging>
+ <artifactId>solr-binding</artifactId>
+ <name>Solr Binding</name>
+ <packaging>jar</packaging>
- <dependencies>
- <dependency>
- <groupId>com.yahoo.ycsb</groupId>
- <artifactId>core</artifactId>
- <version>${project.version}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.solr</groupId>
- <artifactId>solr-solrj</artifactId>
- <version>${solr.version}</version>
- </dependency>
+ <properties>
+ <!-- Tests do not run on jdk9 -->
+ <skipJDK9Tests>true</skipJDK9Tests>
+ </properties>
+
+ <dependencies>
+ <dependency>
+ <groupId>com.yahoo.ycsb</groupId>
+ <artifactId>core</artifactId>
+ <version>${project.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.solr</groupId>
+ <artifactId>solr-solrj</artifactId>
+ <version>${solr.version}</version>
+ </dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
@@ -55,5 +60,5 @@ LICENSE file.
<version>${solr.version}</version>
<scope>test</scope>
</dependency>
- </dependencies>
+ </dependencies>
</project>
--
GitLab