From 40eada4e806190cf708f7bd2b11e7cc7c984c8cb Mon Sep 17 00:00:00 2001
From: Robin Bygrave <robin.bygrave@gmail.com>
Date: Wed, 18 May 2016 08:33:04 +1200
Subject: [PATCH] #6 - Modify POM dependencies, change to provided scope for
 Ebean and Spring context

---
 pom.xml | 32 ++++++++++++++++++++------------
 1 file changed, 20 insertions(+), 12 deletions(-)

diff --git a/pom.xml b/pom.xml
index 5634dd20b..5c10c2a49 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <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>org.avaje</groupId>
     <artifactId>avaje-javaparent</artifactId>
@@ -10,7 +11,7 @@
   <groupId>org.avaje.ebeanorm</groupId>
   <artifactId>avaje-ebeanorm-spring</artifactId>
   <name>avaje-ebeanorm-spring</name>
-  <version>6.1.2-SNAPSHOT</version>
+  <version>7.1.1-SNAPSHOT</version>
   <packaging>jar</packaging>
   <description>Support for Spring transactions and IOC setup of Ebean server config</description>
 
@@ -38,28 +39,41 @@
   <dependencies>
 
     <dependency>
-      <groupId>org.avaje.ebeanorm</groupId>
-      <artifactId>avaje-ebeanorm</artifactId>
-      <version>[6,7)</version>
+      <groupId>org.slf4j</groupId>
+      <artifactId>jcl-over-slf4j</artifactId>
+      <version>[1.7,)</version>
     </dependency>
 
+    <!-- Provided: Bring in explicitly -->
+    <dependency>
+      <groupId>org.avaje.ebeanorm</groupId>
+      <artifactId>avaje-ebeanorm</artifactId>
+      <version>[6,8)</version>
+      <scope>provided</scope>
+    </dependency>
+
+    <!-- Optional: Add to use AgentLoaderSupport -->
     <dependency>
       <groupId>org.avaje.ebeanorm</groupId>
       <artifactId>avaje-ebeanorm-agent</artifactId>
       <version>[4.5,5)</version>
+      <scope>provided</scope>
     </dependency>
 
+    <!-- Optional: Add to use AgentLoaderSupport -->
     <dependency>
       <groupId>org.avaje</groupId>
       <artifactId>avaje-agentloader</artifactId>
       <version>2.1.2</version>
+      <scope>provided</scope>
     </dependency>
 
-    <!-- Spring -->
+    <!-- Provided: Spring, bring in explicitly -->
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-context</artifactId>
       <version>${spring.framework.version}</version>
+      <scope>provided</scope>
     </dependency>
 
     <dependency>
@@ -113,12 +127,6 @@
       </exclusions>
     </dependency>
 
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>jcl-over-slf4j</artifactId>
-      <version>1.7.12</version>
-    </dependency>
-
     <dependency>
       <groupId>org.avaje.composite</groupId>
       <artifactId>avaje-composite-testing-ebean</artifactId>
@@ -134,7 +142,7 @@
       <plugin>
         <groupId>org.avaje.ebeanorm</groupId>
         <artifactId>avaje-ebeanorm-mavenenhancer</artifactId>
-        <version>4.5.3</version>
+        <version>4.10.1</version>
         <executions>
           <execution>
             <id>main</id>