From f247f9ad036ec403c654ac8b7e1a4ffcbb165941 Mon Sep 17 00:00:00 2001
From: Adam Samalik <asamalik@redhat.com>
Date: Thu, 29 Jun 2023 10:53:09 +0200
Subject: [PATCH] re-import sources as agreed with the maintainer

---
 .gitignore                                   |  3 +-
 0001-Remove-dependency-on-glassfish-el.patch | 52 --------------------
 gating.yaml                                  |  8 ---
 3 files changed, 2 insertions(+), 61 deletions(-)
 delete mode 100644 0001-Remove-dependency-on-glassfish-el.patch
 delete mode 100644 gating.yaml

diff --git a/.gitignore b/.gitignore
index 3196cf2..ee87c40 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
-SOURCES/1.2.tar.gz
+/cdi-api-1.0.SP4.tar.xz
+/1.1.tar.gz
 /1.2.tar.gz
diff --git a/0001-Remove-dependency-on-glassfish-el.patch b/0001-Remove-dependency-on-glassfish-el.patch
deleted file mode 100644
index c6d578b..0000000
--- a/0001-Remove-dependency-on-glassfish-el.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From b8570328d6d781b9f7fd96381423c4b3cef352fe Mon Sep 17 00:00:00 2001
-From: Marian Koncek <mkoncek@redhat.com>
-Date: Wed, 18 Sep 2019 11:54:36 +0200
-Subject: [PATCH] Remove dependency on glassfish-el
-
----
- .../enterprise/inject/spi/BeanManager.java    | 22 -------------------
- 1 file changed, 22 deletions(-)
-
-diff --git a/api/src/main/java/javax/enterprise/inject/spi/BeanManager.java b/api/src/main/java/javax/enterprise/inject/spi/BeanManager.java
-index 29c62af..b467727 100644
---- a/api/src/main/java/javax/enterprise/inject/spi/BeanManager.java
-+++ b/api/src/main/java/javax/enterprise/inject/spi/BeanManager.java
-@@ -17,8 +17,6 @@
- 
- package javax.enterprise.inject.spi;
- 
--import javax.el.ELResolver;
--import javax.el.ExpressionFactory;
- import javax.enterprise.context.ContextNotActiveException;
- import javax.enterprise.context.spi.Context;
- import javax.enterprise.context.spi.Contextual;
-@@ -415,26 +413,6 @@ public interface BeanManager {
-      */
-     public Context getContext(Class<? extends Annotation> scopeType);
- 
--    /**
--     * Returns a {@link javax.el.ELResolver} that resolves beans by EL name.
--     * 
--     * @return the {@link javax.el.ELResolver}
--     */
--    public ELResolver getELResolver();
--
--    /**
--     * Returns a wrapper {@link javax.el.ExpressionFactory} that delegates {@link javax.el.MethodExpression} and
--     * {@link javax.el.ValueExpression} creation to the given {@link javax.el.ExpressionFactory}. When a Unified EL expression
--     * is evaluated using a {@link javax.el.MethodExpression} or {@link javax.el.ValueExpression} returned by the wrapper
--     * {@link javax.el.ExpressionFactory}, the container handles destruction of objects with scope
--     * {@link javax.enterprise.context.Dependent}.
--     * 
--     * 
--     * @param expressionFactory the {@link javax.el.ExpressionFactory} to wrap
--     * @return the wrapped {@link javax.el.ExpressionFactory}
--     */
--    public ExpressionFactory wrapExpressionFactory(ExpressionFactory expressionFactory);
--
-     /**
-      * Obtain an {@link AnnotatedType} that may be used to read the annotations of the given class or interface.
-      * 
--- 
-2.21.0
-
diff --git a/gating.yaml b/gating.yaml
deleted file mode 100644
index d6b7694..0000000
--- a/gating.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
---- !Policy
-product_versions:
-  - rhel-9
-decision_contexts:
-  - osci_compose_gate
-rules:
-  # https://docs.engineering.redhat.com/display/RHELPLAN/Maven+Bootstrap+manual+gating+test
-  - !PassingTestCaseRule {test_case_name: manual.sst_cs_apps.maven.bootstrap}