Cleanup up pom.xml and updated beans xsd to 2.0

MattGill98 · MattGill98 · commit d4b0eaeb1017 · 2017-12-14T13:07:54.000Z
diff --git a/cdi/bean-discovery-modes/pom.xml b/cdi/bean-discovery-modes/pom.xml
@@ -8,12 +8,10 @@
         <groupId>org.javaee8</groupId>
         <artifactId>cdi</artifactId>
         <version>1.0-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>bean-discovery-modes</artifactId>
-    <version>1.0-SNAPSHOT</version>
     <packaging>war</packaging>
     
     <name>Java EE 8 Samples: CDI - Discovery Modes</name>
-</project>
+</project>
diff --git a/cdi/bean-discovery-modes/src/test/resources/all-beans.xml b/cdi/bean-discovery-modes/src/test/resources/all-beans.xml
@@ -1,6 +1,6 @@
 <?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"
+       xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/beans_2_0.xsd"
        version="2.0" bean-discovery-mode="all">
-</beans>
+</beans>
diff --git a/cdi/bean-discovery-modes/src/test/resources/annotated-beans.xml b/cdi/bean-discovery-modes/src/test/resources/annotated-beans.xml
@@ -1,6 +1,6 @@
 <?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"
+       xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/beans_2_0.xsd"
        version="2.0" bean-discovery-mode="annotated">
-</beans>
+</beans>
diff --git a/cdi/bean-discovery-modes/src/test/resources/none-beans.xml b/cdi/bean-discovery-modes/src/test/resources/none-beans.xml
@@ -1,6 +1,6 @@
 <?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"
+       xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/beans_2_0.xsd"
        version="2.0" bean-discovery-mode="none">
-</beans>
+</beans>
