From 4c89007aaddb65c8b0316f64a2683ee209eaa3d4 Mon Sep 17 00:00:00 2001
From: Brett Wooldridge <brett.wooldridge@gmail.com>
Date: Thu, 5 Mar 2015 23:00:23 +0900
Subject: [PATCH] Modernize dependencies.

---
 hikaricp-java6/pom.xml |  4 ++--
 hikaricp/pom.xml       |  4 ++--
 pom.xml                | 33 ++++++++++++++++++++++-----------
 3 files changed, 26 insertions(+), 15 deletions(-)

diff --git a/hikaricp-java6/pom.xml b/hikaricp-java6/pom.xml
index 90a0010d..7473a51b 100644
--- a/hikaricp-java6/pom.xml
+++ b/hikaricp-java6/pom.xml
@@ -40,8 +40,8 @@
 
    <properties>
       <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-      <felix.bundle.plugin.version>2.4.0</felix.bundle.plugin.version>
-      <felix.version>4.2.1</felix.version>
+      <felix.bundle.plugin.version>2.5.3</felix.bundle.plugin.version>
+      <felix.version>4.6.0</felix.version>
    </properties>
 
    <parent>
diff --git a/hikaricp/pom.xml b/hikaricp/pom.xml
index 1586ae93..d57e414d 100644
--- a/hikaricp/pom.xml
+++ b/hikaricp/pom.xml
@@ -40,8 +40,8 @@
 
    <properties>
       <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-      <felix.bundle.plugin.version>2.4.0</felix.bundle.plugin.version>
-      <felix.version>4.2.1</felix.version>
+      <felix.version>4.6.0</felix.version>
+      <felix.bundle.plugin.version>2.5.3</felix.bundle.plugin.version>
    </properties>
 
    <parent>
diff --git a/pom.xml b/pom.xml
index 2128f6b8..02478307 100644
--- a/pom.xml
+++ b/pom.xml
@@ -40,9 +40,15 @@
 
    <properties>
       <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-      <felix.version>4.2.1</felix.version>
-      <pax.exam.version>3.4.0</pax.exam.version>
-      <pax.url.version>1.6.0</pax.url.version>
+      <felix.version>4.6.0</felix.version>
+      <hibernate.version>4.3.8.Final</hibernate.version>
+      <javassist.version>3.19.0-GA</javassist.version>
+      <jndi.version>0.11.4.1</jndi.version>
+      <metrics.version>3.1.0</metrics.version>
+      <mockito.version>1.10.19</mockito.version>
+      <pax.exam.version>4.4.0</pax.exam.version>
+      <pax.url.version>2.3.0</pax.url.version>
+      <slf4j.version>1.7.10</slf4j.version>
    </properties>
 
    <parent>
@@ -60,55 +66,60 @@
       <dependency>
          <groupId>org.slf4j</groupId>
          <artifactId>slf4j-api</artifactId>
-         <version>1.7.5</version>
+         <version>${slf4j.version}</version>
       </dependency>
       <dependency>
          <groupId>org.slf4j</groupId>
          <artifactId>slf4j-simple</artifactId>
-         <version>1.7.5</version>
+         <version>${slf4j.version}</version>
          <optional>true</optional>
       </dependency>
       <dependency>
          <groupId>org.mockito</groupId>
          <artifactId>mockito-all</artifactId>
-         <version>1.9.5</version>
+         <version>${mockito.version}</version>
          <scope>test</scope>
       </dependency>
       <dependency>
          <groupId>org.javassist</groupId>
          <artifactId>javassist</artifactId>
-         <version>3.19.0-GA</version>
+         <version>${javassist.version}</version>
          <scope>compile</scope>
       </dependency>
       <dependency>
          <groupId>org.hibernate</groupId>
          <artifactId>hibernate-core</artifactId>
-         <version>4.3.0.Final</version>
+         <version>${hibernate.version}</version>
          <scope>provided</scope>
          <optional>true</optional>
       </dependency>
       <dependency>
          <groupId>io.dropwizard.metrics</groupId>
          <artifactId>metrics-core</artifactId>
-         <version>3.1.0</version>
+         <version>${metrics.version}</version>
          <scope>provided</scope>
          <optional>true</optional>
       </dependency>
       <dependency>
          <groupId>io.dropwizard.metrics</groupId>
          <artifactId>metrics-healthchecks</artifactId>
-         <version>3.1.0</version>
+         <version>${metrics.version}</version>
          <scope>provided</scope>
          <optional>true</optional>
       </dependency>
       <dependency>
          <groupId>simple-jndi</groupId>
          <artifactId>simple-jndi</artifactId>
-         <version>0.11.4.1</version>
+         <version>${jndi.version}</version>
          <scope>test</scope>
       </dependency>
 
       <!-- OSGi test -->
+      <dependency>
+         <groupId>javax.inject</groupId>
+         <artifactId>javax.inject</artifactId>
+         <version>1</version>
+      </dependency>
       <dependency>
          <groupId>org.apache.felix</groupId>
          <artifactId>org.apache.felix.framework</artifactId>