From d8cf79c6a5e10bfefdd022ac64bba7a075aaab2f Mon Sep 17 00:00:00 2001
From: Brett Wooldridge <brett.wooldridge@gmail.com>
Date: Thu, 20 Apr 2017 13:13:48 +0900
Subject: [PATCH] Prepare for java9ea release.

---
 pom.xml | 52 +++++++++++++++++++++++++++-------------------------
 1 file changed, 27 insertions(+), 25 deletions(-)

diff --git a/pom.xml b/pom.xml
index 3d281706..be9c1232 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,9 +1,33 @@
 <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>
 
+   <properties>
+      <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+      <sureFireOptions9></sureFireOptions9>
+      <sureFireForks9>false</sureFireForks9>
+      <artifact.classifier></artifact.classifier>
+
+      <felix.bundle.plugin.version>3.3.0</felix.bundle.plugin.version>
+      <felix.version>5.6.2</felix.version>
+      <hibernate.version>5.2.9.Final</hibernate.version>
+      <javassist.version>3.21.0-GA</javassist.version>
+      <jndi.version>0.11.4.1</jndi.version>
+      <maven.release.version>2.5.3</maven.release.version>
+      <metrics.version>3.2.2</metrics.version>
+      <simpleclient.version>0.0.21</simpleclient.version>
+      <mockito.version>2.7.22</mockito.version>
+      <pax.exam.version>4.10.0</pax.exam.version>
+      <pax.url.version>2.5.2</pax.url.version>
+      <slf4j.version>1.7.25</slf4j.version>
+      <log4j.version>2.8.2</log4j.version>
+      <commons.csv.version>1.4</commons.csv.version>
+      <h2.version>1.4.194</h2.version>
+      <junit.version>4.12</junit.version>
+   </properties>
+
    <groupId>com.zaxxer</groupId>
    <artifactId>HikariCP</artifactId>
-   <version>2.6.2-SNAPSHOT</version>
+   <version>2.6.1-SNAPSHOT</version>
    <packaging>bundle</packaging>
 
    <name>HikariCP</name>
@@ -37,29 +61,6 @@
       </developer>
    </developers>
 
-   <properties>
-      <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-      <sureFireOptions9></sureFireOptions9>
-      <sureFireForks9>false</sureFireForks9>
-
-      <felix.bundle.plugin.version>3.3.0</felix.bundle.plugin.version>
-      <felix.version>5.6.2</felix.version>
-      <hibernate.version>5.2.9.Final</hibernate.version>
-      <javassist.version>3.21.0-GA</javassist.version>
-      <jndi.version>0.11.4.1</jndi.version>
-      <maven.release.version>2.5.3</maven.release.version>
-      <metrics.version>3.2.2</metrics.version>
-      <simpleclient.version>0.0.21</simpleclient.version>
-      <mockito.version>2.7.22</mockito.version>
-      <pax.exam.version>4.10.0</pax.exam.version>
-      <pax.url.version>2.5.2</pax.url.version>
-      <slf4j.version>1.7.25</slf4j.version>
-      <log4j.version>2.8.2</log4j.version>
-      <commons.csv.version>1.4</commons.csv.version>
-      <h2.version>1.4.194</h2.version>
-      <junit.version>4.12</junit.version>
-   </properties>
-
    <parent>
       <groupId>org.sonatype.oss</groupId>
       <artifactId>oss-parent</artifactId>
@@ -297,6 +298,7 @@
             <version>${felix.bundle.plugin.version}</version>
             <extensions>true</extensions>
             <configuration>
+               <classifier>${artifact.classifier}</classifier>
                <instructions>
                   <Bundle-Name>HikariCP</Bundle-Name>
                   <Export-Package>
@@ -434,7 +436,7 @@
                --add-exports java.base/sun.net.www.protocol.https=ALL-UNNAMED
             </sureFireOptions9>
             <sureFireForks9>true</sureFireForks9>
-            <coverallsSkip9>true</coverallsSkip9>
+            <artifact.classifier>java9</artifact.classifier>
          </properties>
       </profile>