From de8f4e8d1076b412a975f5ce940b49b1d1a45628 Mon Sep 17 00:00:00 2001
From: Colin Decker <cgdecker@google.com>
Date: Wed, 10 Jul 2013 11:32:43 -0400
Subject: [PATCH] Add a beans.xml file disabling CDI bean discovery to
 META-INF/ in the guava jar. See guava issue:
 https://code.google.com/p/guava-libraries/issues/detail?id=1433 -------------
 Created by MOE: http://code.google.com/p/moe-java MOE_MIGRATED_REVID=49166428

---
 guava/src/META-INF/beans.xml | 12 ++++++++++++
 1 file changed, 12 insertions(+)
 create mode 100644 guava/src/META-INF/beans.xml

diff --git a/guava/src/META-INF/beans.xml b/guava/src/META-INF/beans.xml
new file mode 100644
index 000000000000..3e5a27457dbc
--- /dev/null
+++ b/guava/src/META-INF/beans.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://xmlns.jcp.org/xml/ns/javaee"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/beans_1_1.xsd"
+    bean-discovery-mode="none">
+  <!--
+  This file is here for bean-discovery-mode="none", which turns off CDI's behavior of assuming
+  that anything annotated with @Inject is a "bean" and must be instantiated. Guava just uses
+  @Inject for convenience. See: https://code.google.com/p/guava-libraries/issues/detail?id=1433
+  -->
+</beans>
+