Add CDI integration module (#812978)
https://bugzilla.redhat.com/812978 Now that the cdi-api is available the CDI integration module can be easily added.
This commit is contained in:
parent
3b38abdc88
commit
92093e02cb
@ -1,14 +1,8 @@
|
|||||||
commit 907551f6df11c589490242579077fdd65b50ca3f
|
|
||||||
Author: Juan Hernandez <juan.hernandez@redhat.com>
|
|
||||||
Date: Tue Mar 13 19:05:09 2012 +0100
|
|
||||||
|
|
||||||
Remove currently unbuilt modules
|
|
||||||
|
|
||||||
diff --git a/pom.xml b/pom.xml
|
diff --git a/pom.xml b/pom.xml
|
||||||
index 455d6ee..7d34f57 100644
|
index 455d6ee..965d294 100644
|
||||||
--- a/pom.xml
|
--- a/pom.xml
|
||||||
+++ b/pom.xml
|
+++ b/pom.xml
|
||||||
@@ -86,22 +86,9 @@
|
@@ -86,22 +86,10 @@
|
||||||
<module>resteasy-test-data</module>
|
<module>resteasy-test-data</module>
|
||||||
<module>resteasy-jaxrs</module>
|
<module>resteasy-jaxrs</module>
|
||||||
<module>providers</module>
|
<module>providers</module>
|
||||||
@ -23,7 +17,7 @@ index 455d6ee..7d34f57 100644
|
|||||||
- <module>async-http-tomcat</module>
|
- <module>async-http-tomcat</module>
|
||||||
- <module>resteasy-spring</module>
|
- <module>resteasy-spring</module>
|
||||||
<module>resteasy-jsapi</module>
|
<module>resteasy-jsapi</module>
|
||||||
- <module>resteasy-cdi</module>
|
<module>resteasy-cdi</module>
|
||||||
- <module>war-tests</module>
|
- <module>war-tests</module>
|
||||||
- <module>examples</module>
|
- <module>examples</module>
|
||||||
- <module>async-http-servlet-3.0</module>
|
- <module>async-http-servlet-3.0</module>
|
||||||
|
@ -3,7 +3,7 @@
|
|||||||
|
|
||||||
Name: resteasy
|
Name: resteasy
|
||||||
Version: 2.3.2
|
Version: 2.3.2
|
||||||
Release: 1%{?dist}
|
Release: 2%{?dist}
|
||||||
Summary: Framework for RESTful Web services and Java applications
|
Summary: Framework for RESTful Web services and Java applications
|
||||||
Group: Development/Libraries
|
Group: Development/Libraries
|
||||||
License: ASL 2.0 and CDDL
|
License: ASL 2.0 and CDDL
|
||||||
@ -71,7 +71,7 @@ BuildRequires: tomcat-el-2.2-api
|
|||||||
BuildRequires: tomcat-servlet-3.0-api
|
BuildRequires: tomcat-servlet-3.0-api
|
||||||
#BuildRequires: tomcat6
|
#BuildRequires: tomcat6
|
||||||
#BuildRequires: tomcat6-lib
|
#BuildRequires: tomcat6-lib
|
||||||
#BuildRequires: weld-cdi-api
|
BuildRequires: cdi-api
|
||||||
BuildRequires: xerces-j2
|
BuildRequires: xerces-j2
|
||||||
|
|
||||||
#BuildRequires: findbugs-maven-plugin
|
#BuildRequires: findbugs-maven-plugin
|
||||||
@ -112,6 +112,7 @@ Requires: bouncycastle-mail
|
|||||||
|
|
||||||
# C:
|
# C:
|
||||||
Requires: cglib
|
Requires: cglib
|
||||||
|
Requires: cdi-api
|
||||||
|
|
||||||
# D:
|
# D:
|
||||||
Requires: dnsjava
|
Requires: dnsjava
|
||||||
@ -211,6 +212,7 @@ resteasy-bom resteasy-bom
|
|||||||
resteasy-guice resteasy-guice
|
resteasy-guice resteasy-guice
|
||||||
resteasy-jaxrs resteasy-jaxrs
|
resteasy-jaxrs resteasy-jaxrs
|
||||||
resteasy-jsapi resteasy-jsapi
|
resteasy-jsapi resteasy-jsapi
|
||||||
|
resteasy-cdi resteasy-cdi
|
||||||
tjws tjws
|
tjws tjws
|
||||||
.
|
.
|
||||||
|
|
||||||
@ -224,7 +226,6 @@ tjws tjws
|
|||||||
# providers/multipart resteasy-multipart-provider
|
# providers/multipart resteasy-multipart-provider
|
||||||
# providers/resteasy-hibernatevalidator-provider resteasy-hibernatevalidator-provider
|
# providers/resteasy-hibernatevalidator-provider resteasy-hibernatevalidator-provider
|
||||||
# resteasy-cache/resteasy-cache-core resteasy-cache-core
|
# resteasy-cache/resteasy-cache-core resteasy-cache-core
|
||||||
# resteasy-cdi resteasy-cdi
|
|
||||||
# resteasy-links resteasy-links
|
# resteasy-links resteasy-links
|
||||||
# resteasy-spring resteasy-spring
|
# resteasy-spring resteasy-spring
|
||||||
# resteasy-crypto resteasy-crypto
|
# resteasy-crypto resteasy-crypto
|
||||||
@ -245,5 +246,8 @@ cp -rp target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}
|
|||||||
%doc License.html
|
%doc License.html
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Mon Apr 12 2012 Juan Hernandez <juan.hernandez@redhat.com> 2.3.2-2
|
||||||
|
- Build CDI integration module (bug #812978)
|
||||||
|
|
||||||
* Thu Mar 6 2012 Ade Lee <alee@redhat.com> 2.3.2-1
|
* Thu Mar 6 2012 Ade Lee <alee@redhat.com> 2.3.2-1
|
||||||
- Initial packaging
|
- Initial packaging
|
||||||
|
Loading…
Reference in New Issue
Block a user