Author: lukaszlenart
Date: Mon Sep 19 07:02:17 2011
New Revision: 1172492
URL: http://svn.apache.org/viewvc?rev=1172492&view=rev
Log:
WW-3617 - Updates poms to include CDI plugin in the trunk
Modified:
struts/struts2/trunk/apps/blank/ (props changed)
struts/struts2/trunk/plugins/cdi/pom.xml
struts/struts2/trunk/plugins/pom.xml
struts/struts2/trunk/pom.xml
Propchange: struts/struts2/trunk/apps/blank/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Sep 19 07:02:17 2011
@@ -5,3 +5,5 @@
*.iml
*.iws
target
+
+.idea
Modified: struts/struts2/trunk/plugins/cdi/pom.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/cdi/pom.xml?rev=1172492&r1=1172491&r2=1172492&view=diff
==============================================================================
--- struts/struts2/trunk/plugins/cdi/pom.xml (original)
+++ struts/struts2/trunk/plugins/cdi/pom.xml Mon Sep 19 07:02:17 2011
@@ -1,4 +1,24 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+-->
<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
<modelVersion>4.0.0</modelVersion>
@@ -6,33 +26,31 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.3-SNAPSHOT</version>
+ <version>2.3.1-SNAPSHOT</version>
</parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-cdi-plugin</artifactId>
- <version>2.3-SNAPSHOT</version>
+ <name>Struts 2 CDI Plugin</name>
+ <packaging>jar</packaging>
<dependencies>
<dependency>
<groupId>javax.enterprise</groupId>
<artifactId>cdi-api</artifactId>
- <version>1.0-SP1</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.jboss.weld</groupId>
<artifactId>weld-core</artifactId>
- <version>1.0.1-Final</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.jboss.weld</groupId>
<artifactId>weld-se</artifactId>
- <version>1.0.1-Final</version>
<scope>test</scope>
</dependency>
Modified: struts/struts2/trunk/plugins/pom.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/pom.xml?rev=1172492&r1=1172491&r2=1172492&view=diff
==============================================================================
--- struts/struts2/trunk/plugins/pom.xml (original)
+++ struts/struts2/trunk/plugins/pom.xml Mon Sep 19 07:02:17 2011
@@ -65,6 +65,7 @@
<module>json</module>
<module>embeddedjsp</module>
<module>gxp</module>
+ <module>cdi</module>
</modules>
<dependencies>
Modified: struts/struts2/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/pom.xml?rev=1172492&r1=1172491&r2=1172492&view=diff
==============================================================================
--- struts/struts2/trunk/pom.xml (original)
+++ struts/struts2/trunk/pom.xml Mon Sep 19 07:02:17 2011
@@ -700,6 +700,25 @@
<version>2.1</version>
</dependency>
+ <!-- CDI & Weld -->
+ <dependency>
+ <groupId>javax.enterprise</groupId>
+ <artifactId>cdi-api</artifactId>
+ <version>1.0-SP1</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.weld</groupId>
+ <artifactId>weld-core</artifactId>
+ <version>1.0.1-Final</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.weld</groupId>
+ <artifactId>weld-se</artifactId>
+ <version>1.0.1-Final</version>
+ </dependency>
+
</dependencies>
</dependencyManagement>
