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 +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 + */ ++@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 + */ ++@MessageLogger(projectCode = WELD_PROJECT_CODE) + public interface WeldLogger extends BasicLogger { + + String CATCHING_MARKER = "Catching"; +-- +2.3.3 + diff --git a/weld-core-2.3.2.Final-Remove-gwtdev-environment.patch b/weld-core-2.3.2.Final-Remove-gwtdev-environment.patch new file mode 100644 index 0000000..ea665b0 --- /dev/null +++ b/weld-core-2.3.2.Final-Remove-gwtdev-environment.patch @@ -0,0 +1,20 @@ +diff -Nru core-2.3.2.Final/environments/servlet/core/src/main/java/org/jboss/weld/environment/servlet/WeldServletLifecycle.java core-2.3.2.Final.gwtdev/environments/servlet/core/src/main/java/org/jboss/weld/environment/servlet/WeldServletLifecycle.java +--- core-2.3.2.Final/environments/servlet/core/src/main/java/org/jboss/weld/environment/servlet/WeldServletLifecycle.java 2015-12-08 16:06:29.000000000 +0100 ++++ core-2.3.2.Final.gwtdev/environments/servlet/core/src/main/java/org/jboss/weld/environment/servlet/WeldServletLifecycle.java 2016-06-07 21:18:05.466473052 +0200 +@@ -56,7 +56,6 @@ + import org.jboss.weld.environment.deployment.discovery.DiscoveryStrategy; + import org.jboss.weld.environment.deployment.discovery.DiscoveryStrategyFactory; + import org.jboss.weld.environment.deployment.discovery.jandex.Jandex; +-import org.jboss.weld.environment.gwtdev.GwtDevHostedModeContainer; + import org.jboss.weld.environment.jetty.JettyContainer; + import org.jboss.weld.environment.logging.CommonLogger; + import org.jboss.weld.environment.servlet.deployment.ServletContextBeanArchiveHandler; +@@ -362,7 +361,7 @@ + container = checkContainers(ctx, dump, extContainers); + if (container == null) { + // 3. Built-in containers in predefined order +- container = checkContainers(ctx, dump, Arrays.asList(TomcatContainer.INSTANCE, JettyContainer.INSTANCE, UndertowContainer.INSTANCE, GwtDevHostedModeContainer.INSTANCE)); ++ container = checkContainers(ctx, dump, Arrays.asList(TomcatContainer.INSTANCE, JettyContainer.INSTANCE, UndertowContainer.INSTANCE)); + } + } + return container; diff --git a/weld-core-2.3.5.Final.tar.gz b/weld-core-2.3.5.Final.tar.gz new file mode 100644 index 0000000..4acd384 Binary files /dev/null and b/weld-core-2.3.5.Final.tar.gz differ diff --git a/weld-core.spec b/weld-core.spec new file mode 100644 index 0000000..d44bd11 --- /dev/null +++ b/weld-core.spec @@ -0,0 +1,97 @@ +%global namedreltag .Final +%global namedversion %{version}%{?namedreltag} +Name: weld-core +Version: 2.3.5 +Release: 1 +Summary: Reference Implementation for JSR-299: Contexts and Dependency Injection (CDI) +License: ASL 2.0 and (CDDL or GPLv2 with exceptions) and LGPLv2+ and MIT and OFL +URL: http://weld.cdi-spec.org/ +Source0: https://github.com/weld/core/archive/%{namedversion}/%{name}-%{namedversion}.tar.gz +Patch0: 0001-Add-support-for-newer-jboss-logging-tools.patch +Patch1: weld-core-2.3.2.Final-Remove-gwtdev-environment.patch +BuildArch: noarch +BuildRequires: maven-local mvn(com.google.guava:guava:18.0) mvn(io.undertow:undertow-servlet) +BuildRequires: mvn(javax.el:el-api) mvn(javax.enterprise:cdi-api) mvn(javax.faces:jsf-api) +BuildRequires: mvn(javax.portlet:portlet-api) mvn(javax.servlet.jsp:jsp-api) mvn(junit:junit) +BuildRequires: mvn(net.sourceforge.findbugs:annotations) +BuildRequires: mvn(org.apache.maven.plugins:maven-antrun-plugin) +BuildRequires: mvn(org.apache.maven.plugins:maven-source-plugin) +BuildRequires: mvn(org.apache.tomcat:tomcat-catalina) mvn(org.codehaus.groovy:groovy-all) +BuildRequires: mvn(org.eclipse.jetty:jetty-server:8.1) +BuildRequires: mvn(org.eclipse.jetty:jetty-servlet:8.1) +BuildRequires: mvn(org.eclipse.jetty:jetty-webapp:8.1) mvn(org.eclipse.jetty:jetty-plus) +BuildRequires: mvn(org.hibernate.javax.persistence:hibernate-jpa-2.1-api) +BuildRequires: mvn(org.jboss.arquillian:arquillian-bom:pom:) +BuildRequires: mvn(org.jboss.classfilewriter:jboss-classfilewriter) mvn(org.jboss:jandex) +BuildRequires: mvn(org.jboss.jandex:jandex-maven-plugin) mvn(org.jboss.logging:jboss-logging) +BuildRequires: mvn(org.jboss.jdeparser:jdeparser:1) +BuildRequires: mvn(org.jboss.logging:jboss-logging-processor:1) +BuildRequires: mvn(org.jboss.shrinkwrap:shrinkwrap-impl-base) +BuildRequires: mvn(org.jboss.spec.javax.annotation:jboss-annotations-api_1.2_spec) +BuildRequires: mvn(org.jboss.spec.javax.ejb:jboss-ejb-api_3.2_spec) +BuildRequires: mvn(org.jboss.spec.javax.el:jboss-el-api_3.0_spec) +BuildRequires: mvn(org.jboss.spec.javax.faces:jboss-jsf-api_2.2_spec) +BuildRequires: mvn(org.jboss.spec.javax.interceptor:jboss-interceptors-api_1.2_spec) +BuildRequires: mvn(org.jboss.spec.javax.servlet:jboss-servlet-api_3.1_spec) +BuildRequires: mvn(org.jboss.spec.javax.transaction:jboss-transaction-api_1.2_spec) +BuildRequires: mvn(org.jboss.weld:weld-api) mvn(org.jboss.weld:weld-parent:pom:) +BuildRequires: mvn(org.jboss.weld:weld-spi) +Provides: bundled(fontawesome-fonts) = 4.2.0 +Provides: bundled(fontawesome-fonts-web) = 4.2.0 +%description +Weld is the reference implementation (RI) for JSR-299: Java Contexts and +Dependency Injection for the Java EE platform (CDI). CDI is the Java standard +for dependency injection and contextual lifecycle management, and integrates +cleanly with the Java EE platform. Any Java EE 6-compliant application server +provides support for JSR-299 (even the web profile). + +%package javadoc +Summary: Javadoc for %{name} +%description javadoc +This package contains the API documentation for %{name}. + +%prep +%setup -q -n core-%{namedversion} +%patch0 -p1 +%patch1 -p1 +find . -name '*.jar' -exec rm {} \; +find . -name '*.class' -exec rm {} \; +%pom_remove_plugin org.eclipse.m2e:lifecycle-mapping +%pom_disable_module porting-package +%pom_disable_module tests +%pom_disable_module tests-arquillian +%pom_disable_module inject-tck-runner +%pom_disable_module jboss-tck-runner +%pom_disable_module tests/base environments/servlet +%pom_disable_module tests/jetty environments/servlet +%pom_disable_module tests/tomcat environments/servlet +%pom_disable_module tests environments/se +%pom_disable_module tests probe +%pom_remove_plugin ro.isdc.wro4j:wro4j-maven-plugin probe/core +%pom_remove_plugin org.apache.maven.plugins:maven-checkstyle-plugin +rm -rf environments/servlet/core/src/main/java/org/jboss/weld/environment/gwtdev +%pom_remove_dep -r org.mortbay.jetty environments/servlet +%pom_remove_plugin org.apache.maven.plugins:maven-compiler-plugin environments/se/core +%pom_remove_plugin -r :maven-shade-plugin +%pom_remove_plugin -r :maven-shade-plugin environments/se/build environments/servlet/build +%pom_xpath_remove -r pom:dependency/pom:optional environments/se/build environments/servlet/build +%pom_change_dep org.glassfish:javax.el javax.el:el-api tests-common +%pom_xpath_set pom:properties/pom:jboss.logging.processor.version 1 +%pom_change_dep -r :jboss-logging-processor ::1 +sed -i -e 's/InstantiationException/InstantiationException, NoSuchMethodException/' \ + environments/servlet/core/src/main/java/org/jboss/weld/environment/tomcat/{Weld,}ForwardingInstanceManager.java + +%build +%mvn_build -f + +%install +%mvn_install + +%files -f .mfiles +%doc README.md + +%files javadoc -f .mfiles-javadoc + +%changelog +* Mon Aug 17 2020 Shaoqiang Kang - 2.3.5-1 +- Package init diff --git a/weld-core.yaml b/weld-core.yaml new file mode 100644 index 0000000..2794022 --- /dev/null +++ b/weld-core.yaml @@ -0,0 +1,4 @@ +version_control: github +src_repo: weld/core +tag_pattern: weld-core-(.*?).Final +seperator: "."