[weld-core] Upstream release 2.2.6.Final

[Marek Goldmann]

commit 3c0b9084c4d73d549be39d8cf3f2cdb5a2579313
Author: Marek Goldmann <marek.goldmann at gmail.com>
Date:   Mon Mar 23 13:05:26 2015 +0100

    Upstream release 2.2.6.Final

 .gitignore                                         |  1 +
 ...Add-support-for-newer-jboss-logging-tools.patch | 64 ++++++++++++++++++++++
 0001-jboss-logging-tools-1.2-support.patch         | 38 -------------
 sources                                            |  2 +-
 weld-core.spec                                     | 15 ++++-
 5 files changed, 78 insertions(+), 42 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 604e62f..25456a0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@
 /2.0.3.Final.tar.gz
 /2.1.0.CR1.tar.gz
 /2.1.2.Final.tar.gz
+/2.2.6.Final.tar.gz
diff --git a/0001-Add-support-for-newer-jboss-logging-tools.patch b/0001-Add-support-for-newer-jboss-logging-tools.patch
new file mode 100644
index 0000000..695be03
--- /dev/null
+++ b/0001-Add-support-for-newer-jboss-logging-tools.patch
@@ -0,0 +1,64 @@
+From c57f3b50126a45c99d6e46d70675ab7213ca9f32 Mon Sep 17 00:00:00 2001
+From: Marek Goldmann <marek.goldmann at gmail.com>
+Date: Mon, 23 Mar 2015 12:29:23 +0100
+Subject: [PATCH] Add support for newer jboss-logging-tools
+
+---
+ .../org/jboss/weld/environment/logging/WeldEnvironmentLogger.java     | 3 +++
+ impl/src/main/java/org/jboss/weld/logging/WeldLogger.java             | 4 ++++
+ 2 files changed, 7 insertions(+)
+
+diff --git a/environments/common/src/main/java/org/jboss/weld/environment/logging/WeldEnvironmentLogger.java b/environments/common/src/main/java/org/jboss/weld/environment/logging/WeldEnvironmentLogger.java
+index 027929a..f09a168 100644
+--- a/environments/common/src/main/java/org/jboss/weld/environment/logging/WeldEnvironmentLogger.java
++++ b/environments/common/src/main/java/org/jboss/weld/environment/logging/WeldEnvironmentLogger.java
+@@ -1,17 +1,20 @@
+ package org.jboss.weld.environment.logging;
+ 
++import static org.jboss.weld.environment.logging.WeldEnvironmentLogger.WELD_ENV_PROJECT_CODE;
+ 
+ import org.jboss.logging.BasicLogger;
+ import org.jboss.logging.Logger.Level;
+ import org.jboss.logging.annotations.Cause;
+ import org.jboss.logging.annotations.LogMessage;
+ import org.jboss.logging.annotations.Message;
++import org.jboss.logging.annotations.MessageLogger;
+ 
+ /**
+  *
+  * @author Matej Briškár
+  * @author Martin Kouba
+  */
++ at MessageLogger(projectCode = WELD_ENV_PROJECT_CODE)
+ public interface WeldEnvironmentLogger extends BasicLogger {
+ 
+     String CATCHING_MARKER = "Catching";
+diff --git a/impl/src/main/java/org/jboss/weld/logging/WeldLogger.java b/impl/src/main/java/org/jboss/weld/logging/WeldLogger.java
+index 184d3d7..f4a0778 100644
+--- a/impl/src/main/java/org/jboss/weld/logging/WeldLogger.java
++++ b/impl/src/main/java/org/jboss/weld/logging/WeldLogger.java
+@@ -16,17 +16,21 @@
+  */
+ package org.jboss.weld.logging;
+ 
++import static org.jboss.weld.logging.WeldLogger.WELD_PROJECT_CODE;
++
+ import org.jboss.logging.BasicLogger;
+ import org.jboss.logging.Logger.Level;
+ import org.jboss.logging.annotations.Cause;
+ import org.jboss.logging.annotations.LogMessage;
+ import org.jboss.logging.annotations.Message;
++import org.jboss.logging.annotations.MessageLogger;
+ 
+ /**
+  * A source of localized log/bundle messages and exceptions. Note that this interface extends {@link BasicLogger} so that regular logger methods are available.
+  *
+  * @author Martin Kouba
+  */
++ at MessageLogger(projectCode = WELD_PROJECT_CODE)
+ public interface WeldLogger extends BasicLogger {
+ 
+     String CATCHING_MARKER = "Catching";
+-- 
+2.3.3
+
diff --git a/sources b/sources
index b0a806d..ef495ff 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-cbf91a31271ef2cfe8eecbddf5415342  2.1.2.Final.tar.gz
+fcc3a1049ba74a6d60ecfcbc409a04f1  2.2.6.Final.tar.gz
diff --git a/weld-core.spec b/weld-core.spec
index f4eb6c9..a7f7b7d 100644
--- a/weld-core.spec
+++ b/weld-core.spec
@@ -2,14 +2,14 @@
 %global namedversion %{version}%{?namedreltag}
 
 Name:       weld-core
-Version:    2.1.2
-Release:    4%{?dist}
+Version:    2.2.6
+Release:    1%{?dist}
 Summary:    Reference Implementation for JSR-299: Contexts and Dependency Injection (CDI)
 License:    ASL 2.0 and LGPLv2+ and (CDDL or GPLv2 with exceptions)
 URL:        http://seamframework.org/Weld
 Source0:    https://github.com/weld/core/archive/%{namedversion}.tar.gz
 
-Patch0:     0001-jboss-logging-tools-1.2-support.patch
+Patch0:     0001-Add-support-for-newer-jboss-logging-tools.patch
 
 BuildArch: noarch
 
@@ -44,6 +44,9 @@ BuildRequires: mvn(org.jboss.spec.javax.annotation:jboss-annotations-api_1.2_spe
 BuildRequires: mvn(org.jboss.spec.javax.interceptor:jboss-interceptors-api_1.2_spec)
 BuildRequires: mvn(org.jboss:jboss-vfs)
 BuildRequires: mvn(org.jboss.spec.javax.faces:jboss-jsf-api_2.2_spec)
+BuildRequires: mvn(org.jboss.shrinkwrap:shrinkwrap-impl-base)
+BuildRequires: mvn(org.glassfish:javax.el)
+BuildRequires: mvn(org.jboss:jandex)
 
 %description
 Weld is the reference implementation (RI) for JSR-299: Java Contexts and
@@ -87,6 +90,9 @@ rm -rf environments/servlet/core/src/main/java/org/jboss/weld/environment/jetty
 rm -rf environments/servlet/core/src/main/java/org/jboss/weld/environment/tomcat
 rm -rf environments/servlet/core/src/main/java/org/jboss/weld/environment/tomcat7
 
+# Used to compile test classes, but we do not execute tests at all
+%pom_remove_plugin org.apache.maven.plugins:maven-compiler-plugin environments/se/core/pom.xml
+
 %build
 %mvn_build -f
 
@@ -99,6 +105,9 @@ rm -rf environments/servlet/core/src/main/java/org/jboss/weld/environment/tomcat
 %files javadoc -f .mfiles-javadoc
 
 %changelog
+* Wed Jan 14 2015 Marek Goldmann <mgoldman at redhat.com> - 2.2.6-1
+- Upstream release 2.2.6.Final
+
 * Mon Aug 04 2014 Yaakov Selkowitz <yselkowi at redhat.com> - 2.1.2-4
 - Fix junit BRs (#1107142)