From 5268ad20c0981342097917b5fc22f69d92d13f82 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@pivotal.io>
Date: Mon, 18 Sep 2017 15:40:57 +0200
Subject: [PATCH] DATACOUCH-336 - Upgrade to OpenWebBeans 2.0.1

---
 pom.xml                                       | 12 ++++-----
 .../repository/cdi/CdiRepositoryTests.java    | 27 ++++++++++---------
 src/integration/resources/META-INF/beans.xml  |  6 -----
 3 files changed, 21 insertions(+), 24 deletions(-)
 delete mode 100644 src/integration/resources/META-INF/beans.xml

diff --git a/pom.xml b/pom.xml
index 0c29c140..7ec8c6f0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -122,16 +122,16 @@
         </dependency>
 
         <dependency>
-            <groupId>org.apache.openwebbeans.test</groupId>
-            <artifactId>cditest-owb</artifactId>
-            <version>${webbeans}</version>
+            <groupId>javax.annotation</groupId>
+            <artifactId>javax.annotation-api</artifactId>
+            <version>${javax-annotation-api}</version>
             <scope>test</scope>
         </dependency>
 
         <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>servlet-api</artifactId>
-            <version>3.0-alpha-1</version>
+            <groupId>org.apache.openwebbeans</groupId>
+            <artifactId>openwebbeans-se</artifactId>
+            <version>${webbeans}</version>
             <scope>test</scope>
         </dependency>
 
diff --git a/src/integration/java/org/springframework/data/couchbase/repository/cdi/CdiRepositoryTests.java b/src/integration/java/org/springframework/data/couchbase/repository/cdi/CdiRepositoryTests.java
index 7f10dc37..350ec103 100644
--- a/src/integration/java/org/springframework/data/couchbase/repository/cdi/CdiRepositoryTests.java
+++ b/src/integration/java/org/springframework/data/couchbase/repository/cdi/CdiRepositoryTests.java
@@ -26,39 +26,42 @@ import com.couchbase.client.java.Bucket;
 import com.couchbase.client.java.view.DefaultView;
 import com.couchbase.client.java.view.DesignDocument;
 import com.couchbase.client.java.view.View;
-import org.apache.webbeans.cditest.CdiTestContainer;
-import org.apache.webbeans.cditest.CdiTestContainerLoader;
 import org.junit.AfterClass;
 import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Test;
 
+import javax.enterprise.inject.se.SeContainer;
+import javax.enterprise.inject.se.SeContainerInitializer;
+
 /**
  * @author Mark Paluch
  */
 public class CdiRepositoryTests {
 
-	private static CdiTestContainer cdiContainer;
+	private static SeContainer cdiContainer;
 	private CdiPersonRepository repository;
 	private QualifiedPersonRepository qualifiedPersonRepository;
 	private Bucket couchbaseClient;
 
 	@BeforeClass
-	public static void init() throws Exception {
-		cdiContainer = CdiTestContainerLoader.getCdiContainer();
-		cdiContainer.startApplicationScope();
-		cdiContainer.bootContainer();
+	public static void init() {
+
+		cdiContainer = SeContainerInitializer.newInstance() //
+						.disableDiscovery() //
+						.addPackages(CdiRepositoryClient.class) //
+						.initialize();
 	}
 
 	@AfterClass
-	public static void shutdown() throws Exception {
-		cdiContainer.stopContexts();
-		cdiContainer.shutdownContainer();
+	public static void shutdown() {
+		cdiContainer.close();
 	}
 
 	@Before
 	public void setUp() {
-		CdiRepositoryClient repositoryClient = cdiContainer.getInstance(CdiRepositoryClient.class);
+
+		CdiRepositoryClient repositoryClient = cdiContainer.select(CdiRepositoryClient.class).get();
 		repository = repositoryClient.getCdiPersonRepository();
 		qualifiedPersonRepository = repositoryClient.getQualifiedPersonRepository();
 
@@ -97,7 +100,7 @@ public class CdiRepositoryTests {
 			assertEquals(bean.getId(), actual.getId());
 		});
 	}
-	
+
 	/**
 	 * @see DATACOUCH-203
 	 */
diff --git a/src/integration/resources/META-INF/beans.xml b/src/integration/resources/META-INF/beans.xml
deleted file mode 100644
index 71dc6db1..00000000
--- a/src/integration/resources/META-INF/beans.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://java.sun.com/xml/ns/javaee" 
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/beans_1_0.xsd">
-</beans>
-