Author: mgrigorov
Date: Wed Aug 17 08:18:41 2011
New Revision: 1158567
URL: http://svn.apache.org/viewvc?rev=1158567&view=rev
Log:
WICKET-3969 Add CDI integration
Fix SLF4J dependency for Weld.
Modified:
wicket/trunk/pom.xml
wicket/trunk/wicket-examples/pom.xml
wicket/trunk/wicket-weld/pom.xml
Modified: wicket/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/wicket/trunk/pom.xml?rev=1158567&r1=1158566&r2=1158567&view=diff
==============================================================================
--- wicket/trunk/pom.xml (original)
+++ wicket/trunk/pom.xml Wed Aug 17 08:18:41 2011
@@ -64,6 +64,7 @@
<module>wicket-objectssizeof-agent</module>
<module>wicket-examples</module>
<module>archetypes/quickstart</module>
+ <module>wicket-weld</module>
</modules>
<build>
<plugins>
@@ -136,6 +137,7 @@
<module>wicket-objectssizeof-agent</module>
<module>wicket-examples</module>
<module>archetypes/quickstart</module>
+ <module>wicket-weld</module>
</modules>
<build>
<plugins>
@@ -196,6 +198,7 @@
<module>wicket-examples</module>
<module>archetypes/quickstart</module>
<module>testing/wicket-threadtest</module>
+ <module>wicket-weld</module>
</modules>
@@ -379,17 +382,17 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
- <version>1.5.10</version>
+ <version>1.6.1</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
- <version>1.5.10</version>
+ <version>1.6.1</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>jcl-over-slf4j</artifactId>
- <version>1.5.10</version>
+ <version>1.6.1</version>
</dependency>
<dependency>
<groupId>log4j</groupId>
@@ -826,7 +829,4 @@
</plugin>
</plugins>
</reporting>
- <modules>
- <module>wicket-weld</module>
- </modules>
-</project>
\ No newline at end of file
+</project>
Modified: wicket/trunk/wicket-examples/pom.xml
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/pom.xml?rev=1158567&r1=1158566&r2=1158567&view=diff
==============================================================================
--- wicket/trunk/wicket-examples/pom.xml (original)
+++ wicket/trunk/wicket-examples/pom.xml Wed Aug 17 08:18:41 2011
@@ -33,7 +33,6 @@
<dependency>
<groupId>org.apache.wicket</groupId>
<artifactId>wicket-core</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.wicket</groupId>
Modified: wicket/trunk/wicket-weld/pom.xml
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-weld/pom.xml?rev=1158567&r1=1158566&r2=1158567&view=diff
==============================================================================
--- wicket/trunk/wicket-weld/pom.xml (original)
+++ wicket/trunk/wicket-weld/pom.xml Wed Aug 17 08:18:41 2011
@@ -31,34 +31,51 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
<dependencies>
-<dependency>
- <groupId>javax.el</groupId>
- <artifactId>javax.el-api</artifactId>
- <version>2.2.1</version>
-</dependency>
-<dependency>
- <groupId>javax.servlet.jsp</groupId>
- <artifactId>javax.servlet.jsp-api</artifactId>
- <version>2.2.1</version>
-</dependency>
- <dependency>
- <groupId>org.jboss.weld.servlet</groupId>
- <artifactId>weld-servlet-core</artifactId>
- <version>1.1.1.Final</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.weld</groupId>
- <artifactId>weld-core</artifactId>
- <version>1.1.1.Final</version>
- </dependency>
- <dependency>
- <groupId>org.apache.wicket</groupId>
- <artifactId>wicket-core</artifactId>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
+ <dependency>
+ <groupId>javax.el</groupId>
+ <artifactId>javax.el-api</artifactId>
+ <version>2.2.1</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet.jsp</groupId>
+ <artifactId>javax.servlet.jsp-api</artifactId>
+ <version>2.2.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jcl-over-slf4j</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-ext</artifactId>
+ <version>1.6.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.weld.servlet</groupId>
+ <artifactId>weld-servlet-core</artifactId>
+ <version>1.1.1.Final</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.weld</groupId>
+ <artifactId>weld-core</artifactId>
+ <version>1.1.1.Final</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.wicket</groupId>
+ <artifactId>wicket-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
</project>
