10:54 a.m.
Author: pete.muir(a)jboss.org
Date: 2010-02-02 11:54:20 -0500 (Tue, 02 Feb 2010)
New Revision: 5714
Added:
extensions/trunk/.settings/
Modified:
extensions/trunk/bom/pom.xml
extensions/trunk/core/pom.xml
extensions/trunk/core/src/test/java/org/jboss/weld/test/log/LoggerInjectionTest.java
extensions/trunk/parent/pom.xml
extensions/trunk/pom.xml
Log:
update version number, fix build for Weld 1.0.1
Modified: extensions/trunk/bom/pom.xml
===================================================================
--- extensions/trunk/bom/pom.xml 2010-02-02 16:35:29 UTC (rev 5713)
+++ extensions/trunk/bom/pom.xml 2010-02-02 16:54:20 UTC (rev 5714)
@@ -3,12 +3,12 @@
<groupId>org.jboss.weld</groupId>
<artifactId>weld-extensions-bom</artifactId>
<packaging>pom</packaging>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.1-SNAPSHOT</version>
<parent>
<groupId>org.jboss.weld</groupId>
<artifactId>weld-parent</artifactId>
- <version>6</version>
+ <version>8</version>
</parent>
<name>Weld Extensions BOM</name>
@@ -33,13 +33,9 @@
<properties>
<weld.api.version>1.0</weld.api.version>
- <weld.core.version>1.0.0</weld.core.version>
- <!-- Use JSF 2 for all extensions support, despite core using JSF 1.2 -->
- <jsf.version>2.0.2-FCS</jsf.version>
- <wicket.version>1.4.1</wicket.version>
- <tomcat.version>6.0.20</tomcat.version>
- <uel.glassfish.version>2.1.2-b04</uel.glassfish.version>
+ <weld.core.version>1.0.1-CR1</weld.core.version>
<slf4j.version>1.5.10</slf4j.version>
+ <jta.version>1.1</jta.version>
</properties>
<!-- Dependency management, including extra repositories if needed -->
@@ -99,16 +95,6 @@
<scope>import</scope>
</dependency>
<dependency>
- <groupId>javax.faces</groupId>
- <artifactId>jsf-api</artifactId>
- <version>${jsf.version}</version>
- </dependency>
- <dependency>
- <groupId>javax.faces</groupId>
- <artifactId>jsf-impl</artifactId>
- <version>${jsf.version}</version>
- </dependency>
- <dependency>
<groupId>org.testng</groupId>
<artifactId>testng</artifactId>
<classifier>jdk15</classifier>
@@ -119,6 +105,12 @@
<artifactId>weld-extensions</artifactId>
<version>${project.version}</version>
</dependency>
+ <!-- Override bad dep in api -->
+ <dependency>
+ <groupId>javax.transaction</groupId>
+ <artifactId>jta</artifactId>
+ <version>${jta.version}</version>
+ </dependency>
</dependencies>
</dependencyManagement>
Modified: extensions/trunk/core/pom.xml
===================================================================
--- extensions/trunk/core/pom.xml 2010-02-02 16:35:29 UTC (rev 5713)
+++ extensions/trunk/core/pom.xml 2010-02-02 16:54:20 UTC (rev 5714)
@@ -2,13 +2,13 @@
<parent>
<artifactId>weld-extensions-parent</artifactId>
<groupId>org.jboss.weld</groupId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.1-SNAPSHOT</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.weld</groupId>
- <artifactId>weld-extensions</artifactId>
-
+ <artifactId>weld-extensions-core</artifactId>
+ <version>1.0.1-SNAPSHOT</version>
<!-- metadata -->
<name>Weld Extensions</name>
Modified:
extensions/trunk/core/src/test/java/org/jboss/weld/test/log/LoggerInjectionTest.java
===================================================================
---
extensions/trunk/core/src/test/java/org/jboss/weld/test/log/LoggerInjectionTest.java 2010-02-02
16:35:29 UTC (rev 5713)
+++
extensions/trunk/core/src/test/java/org/jboss/weld/test/log/LoggerInjectionTest.java 2010-02-02
16:54:20 UTC (rev 5714)
@@ -35,7 +35,7 @@
@Test
public void testBasicLogInjection()
{
- Sparrow bird = getCurrentManager().getInstanceByType(Sparrow.class);
+ Sparrow bird = getReference(Sparrow.class);
TestLoggerFactory.INSTANCE.getLogger("").reset();
bird.generateLogMessage();
assert TestLoggerFactory.INSTANCE.getLogger("").getLastMessage() !=
null;
@@ -45,7 +45,7 @@
@Test
public void testCategorySpecifiedLogger()
{
- Finch bird = getCurrentManager().getInstanceByType(Finch.class);
+ Finch bird = getReference(Finch.class);
TestLoggerFactory.INSTANCE.getLogger("").reset();
bird.generateLogMessage();
assert TestLoggerFactory.INSTANCE.getLogger("").getLastMessage() !=
null;
Modified: extensions/trunk/parent/pom.xml
===================================================================
--- extensions/trunk/parent/pom.xml 2010-02-02 16:35:29 UTC (rev 5713)
+++ extensions/trunk/parent/pom.xml 2010-02-02 16:54:20 UTC (rev 5714)
@@ -3,10 +3,11 @@
<groupId>org.jboss.weld</groupId>
<artifactId>weld-extensions-parent</artifactId>
<packaging>pom</packaging>
+ <version>1.0.1-SNAPSHOT</version>
<parent>
<groupId>org.jboss.weld</groupId>
<artifactId>weld-extensions-bom</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.1-SNAPSHOT</version>
<relativePath>../bom/pom.xml</relativePath>
</parent>
Modified: extensions/trunk/pom.xml
===================================================================
--- extensions/trunk/pom.xml 2010-02-02 16:35:29 UTC (rev 5713)
+++ extensions/trunk/pom.xml 2010-02-02 16:54:20 UTC (rev 5714)
@@ -3,12 +3,12 @@
<groupId>org.jboss.weld</groupId>
<artifactId>weld-extensions-build-aggregator</artifactId>
<packaging>pom</packaging>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.1-SNAPSHOT</version>
<parent>
<groupId>org.jboss.weld</groupId>
<artifactId>weld-parent</artifactId>
- <version>7</version>
+ <version>8</version>
</parent>
<name>Weld Extensions Build Aggregator</name>