Branch: refs/heads/master Home: https://github.com/weld/core Commit: d2570b847b7b087f0af575cb7b490bfb365d0053 https://github.com/weld/core/commit/d2570b847b7b087f0af575cb7b490bfb365d0053 Author: Martin Kouba <mkouba(a)redhat.com&gt; Date: 2015-02-26 (Thu, 26 Feb 2015) Changed paths: M environments/servlet/tests/jetty/pom.xml R environments/servlet/tests/jetty/src/test/resources/META-INF/beans.xml A environments/servlet/tests/jetty/src/test/weld-se-coop-resources/META-INF/beans.xml Log Message: ----------- Jetty - fix profile used to test weld-se and weld-servlet cooperation Commit: bd3f91d39e2da4d1cb8d858c7f411b98d0ac2339 https://github.com/weld/core/commit/bd3f91d39e2da4d1cb8d858c7f411b98d0ac2339 Author: Martin Kouba <mkouba(a)redhat.com&gt; Date: 2015-02-26 (Thu, 26 Feb 2015) Changed paths: M environments/common/src/main/java/org/jboss/weld/environment/deployment/discovery/AbstractDiscoveryStrategy.java M environments/common/src/main/java/org/jboss/weld/environment/deployment/discovery/BeanArchiveScanner.java M environments/common/src/main/java/org/jboss/weld/environment/deployment/discovery/DefaultBeanArchiveScanner.java M environments/common/src/main/java/org/jboss/weld/environment/logging/CommonLogger.java M environments/servlet/core/src/main/java/org/jboss/weld/environment/servlet/deployment/WebAppBeanArchiveScanner.java M environments/servlet/core/src/main/java/org/jboss/weld/environment/servlet/logging/WeldServletLogger.java A environments/servlet/tests/base/src/main/java/org/jboss/weld/environment/servlet/test/bootstrap/beansxml/ConflictingBeansXmlTestBase.java A environments/servlet/tests/base/src/main/java/org/jboss/weld/environment/servlet/test/bootstrap/beansxml/Foo.java A environments/servlet/tests/base/src/main/java/org/jboss/weld/environment/servlet/test/bootstrap/beansxml/VerifyExtension.java A environments/servlet/tests/jetty/src/test/java/org/jboss/weld/environment/servlet/test/bootstrap/beansxml/ConflictingBeansXmlTest.java A environments/servlet/tests/tomcat/src/test/java/org/jboss/weld/environment/servlet/test/bootstrap/beansxml/ConflictingBeansXmlTest.java Log Message: ----------- WELD-1877 Ignore WEB-INF/classes/META-INF/beans.xml properly if WEB-INF/beans.xml exists Compare: https://github.com/weld/core/compare/93ab0c3c6654...bd3f91d39e2d