Weld SVN: r4497 - cdi-tck/tags.
by weld-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-11-01 08:39:56 -0500 (Sun, 01 Nov 2009)
New Revision: 4497
Added:
cdi-tck/tags/1.0.0-CR3/
Log:
[maven-scm] copy for tag 1.0.0-CR3
Copied: cdi-tck/tags/1.0.0-CR3 (from rev 4496, cdi-tck/trunk)
14 years, 5 months
Weld SVN: r4496 - in cdi-tck/trunk: api and 2 other directories.
by weld-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-11-01 08:39:39 -0500 (Sun, 01 Nov 2009)
New Revision: 4496
Modified:
cdi-tck/trunk/api/pom.xml
cdi-tck/trunk/doc/reference/pom.xml
cdi-tck/trunk/impl/pom.xml
cdi-tck/trunk/pom.xml
Log:
[maven-release-plugin] prepare release 1.0.0-CR3
Modified: cdi-tck/trunk/api/pom.xml
===================================================================
--- cdi-tck/trunk/api/pom.xml 2009-11-01 13:31:46 UTC (rev 4495)
+++ cdi-tck/trunk/api/pom.xml 2009-11-01 13:39:39 UTC (rev 4496)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.jboss.jsr299.tck</groupId>
<artifactId>jsr299-tck-parent</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.0-CR3</version>
</parent>
<groupId>org.jboss.jsr299.tck</groupId>
Modified: cdi-tck/trunk/doc/reference/pom.xml
===================================================================
--- cdi-tck/trunk/doc/reference/pom.xml 2009-11-01 13:31:46 UTC (rev 4495)
+++ cdi-tck/trunk/doc/reference/pom.xml 2009-11-01 13:39:39 UTC (rev 4496)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.jboss.jsr299.tck</groupId>
<artifactId>jsr299-tck-parent</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.0-CR3</version>
<relativePath>../../pom.xml</relativePath>
</parent>
@@ -61,9 +61,9 @@
</build>
<scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/weld/cdi-tck/trunk</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/weld/cdi-tck/trunk</developerConnection>
- <url>scm:svn:https://svn.jboss.org/repos/weld/cdi-tck/trunk/jsr299-tck-referen...</url>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/weld/cdi-tck/tags/1.0.0-CR3</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/weld/cdi-tck/tags/1.0.0-CR3</developerConnection>
+ <url>scm:svn:https://svn.jboss.org/repos/weld/cdi-tck/tags/jsr299-tck-referenc...</url>
</scm>
</project>
Modified: cdi-tck/trunk/impl/pom.xml
===================================================================
--- cdi-tck/trunk/impl/pom.xml 2009-11-01 13:31:46 UTC (rev 4495)
+++ cdi-tck/trunk/impl/pom.xml 2009-11-01 13:39:39 UTC (rev 4496)
@@ -3,7 +3,7 @@
<parent>
<artifactId>jsr299-tck-parent</artifactId>
<groupId>org.jboss.jsr299.tck</groupId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.0-CR3</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.jsr299.tck</groupId>
Modified: cdi-tck/trunk/pom.xml
===================================================================
--- cdi-tck/trunk/pom.xml 2009-11-01 13:31:46 UTC (rev 4495)
+++ cdi-tck/trunk/pom.xml 2009-11-01 13:39:39 UTC (rev 4496)
@@ -4,7 +4,7 @@
<groupId>org.jboss.jsr299.tck</groupId>
<artifactId>jsr299-tck-parent</artifactId>
<packaging>pom</packaging>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.0-CR3</version>
<name>CDI TCK</name>
<parent>
@@ -303,11 +303,11 @@
</build>
<scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/weld/cdi-tck/trunk</connection>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/weld/cdi-tck/tags/1.0.0-CR3</connection>
<developerConnection>
- scm:svn:https://svn.jboss.org/repos/weld/cdi-tck/trunk
+ scm:svn:https://svn.jboss.org/repos/weld/cdi-tck/tags/1.0.0-CR3
</developerConnection>
- <url>scm:svn:https://svn.jboss.org/repos/weld/cdi-tck/trunk</url>
+ <url>scm:svn:https://svn.jboss.org/repos/weld/cdi-tck/tags/1.0.0-CR3</url>
</scm>
<profiles>
@@ -342,9 +342,11 @@
<goal>enforce</goal>
</goals>
<configuration>
- <requireJavaVersion>
- <version>1.6</version>
- </requireJavaVersion>
+ <rules>
+ <requireJavaVersion>
+ <version>1.6</version>
+ </requireJavaVersion>
+ </rules>
</configuration>
</execution>
</executions>
14 years, 5 months
Weld SVN: r4495 - in cdi-tck/trunk: doc/reference/en-US and 1 other directories.
by weld-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-11-01 08:31:46 -0500 (Sun, 01 Nov 2009)
New Revision: 4495
Modified:
cdi-tck/trunk/doc/reference/en-US/reporting.xml
cdi-tck/trunk/impl/pom.xml
cdi-tck/trunk/pom.xml
Log:
always run audit if in Java 6, remove dist from aggregator
Modified: cdi-tck/trunk/doc/reference/en-US/reporting.xml
===================================================================
--- cdi-tck/trunk/doc/reference/en-US/reporting.xml 2009-11-01 13:22:14 UTC (rev 4494)
+++ cdi-tck/trunk/doc/reference/en-US/reporting.xml 2009-11-01 13:31:46 UTC (rev 4495)
@@ -132,12 +132,12 @@
The coverage report is an HTML report generated as part of the TCK
project build. Specifically, it is generated by an annotation
processor that attaches to the compilation of the classes in the TCK
- test suite, another tool from the JBoss Test Utils project. You can
- enable this report by setting the commandline property tck-audit to
- true when running the Maven 2 build in the tck directory.
+ test suite, another tool from the JBoss Test Utils project. The report
+ is only generated when using Java 6 or above, as it requires the annotation
+ processor.
</para>
- <programlisting>mvn clean install -Dtck-audit=true</programlisting>
+ <programlisting>mvn clean install</programlisting>
<note>
<para>
Modified: cdi-tck/trunk/impl/pom.xml
===================================================================
--- cdi-tck/trunk/impl/pom.xml 2009-11-01 13:22:14 UTC (rev 4494)
+++ cdi-tck/trunk/impl/pom.xml 2009-11-01 13:31:46 UTC (rev 4495)
@@ -183,9 +183,7 @@
<profile>
<id>tck-audit</id>
<activation>
- <property>
- <name>tck-audit</name>
- </property>
+ <jdk>1.6</jdk>
</activation>
<dependencies>
<dependency>
@@ -205,25 +203,6 @@
</configuration>
</plugin>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-enforcer-plugin</artifactId>
- <executions>
- <execution>
- <id>enforce-versions</id>
- <goals>
- <goal>enforce</goal>
- </goals>
- <configuration>
- <rules>
- <requireJavaVersion>
- <version>1.6</version>
- </requireJavaVersion>
- </rules>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<executions>
@@ -271,7 +250,6 @@
</executions>
</plugin>
</plugins>
- <defaultGoal>compile</defaultGoal>
</build>
</profile>
Modified: cdi-tck/trunk/pom.xml
===================================================================
--- cdi-tck/trunk/pom.xml 2009-11-01 13:22:14 UTC (rev 4494)
+++ cdi-tck/trunk/pom.xml 2009-11-01 13:31:46 UTC (rev 4495)
@@ -322,17 +322,35 @@
<module>doc/reference</module>
</modules>
</profile>
-
+
<profile>
- <id>dist</id>
+ <id>verify-release</id>
<activation>
<property>
<name>release</name>
</property>
</activation>
- <modules>
- <module>dist</module>
- </modules>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-enforcer-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>enforce-java-release</id>
+ <goals>
+ <goal>enforce</goal>
+ </goals>
+ <configuration>
+ <requireJavaVersion>
+ <version>1.6</version>
+ </requireJavaVersion>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
</profile>
</profiles>
14 years, 5 months
Weld SVN: r4494 - cdi-tck/trunk and 1 other directory.
by weld-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-11-01 08:22:14 -0500 (Sun, 01 Nov 2009)
New Revision: 4494
Added:
build/trunk/dist-tck/
Removed:
cdi-tck/trunk/dist/
Log:
move tck dist out of tck
Copied: build/trunk/dist-tck (from rev 4493, cdi-tck/trunk/dist)
14 years, 5 months
Weld SVN: r4493 - in cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests: extensions/processBean and 1 other directories.
by weld-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-11-01 07:23:27 -0500 (Sun, 01 Nov 2009)
New Revision: 4493
Modified:
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/container/event/ContainerEventTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/processBean/ProcessSessionBeanTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/SimpleBeanLifecycleTest.java
Log:
remove use of old apis
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/container/event/ContainerEventTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/container/event/ContainerEventTest.java 2009-11-01 12:14:10 UTC (rev 4492)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/container/event/ContainerEventTest.java 2009-11-01 12:23:27 UTC (rev 4493)
@@ -16,14 +16,14 @@
*/
package org.jboss.jsr299.tck.tests.extensions.container.event;
+import static javax.enterprise.inject.spi.SessionBeanType.STATEFUL;
+import static javax.enterprise.inject.spi.SessionBeanType.STATELESS;
+
import javax.ejb.Stateless;
import javax.enterprise.inject.Produces;
import javax.enterprise.inject.spi.Annotated;
import javax.enterprise.inject.spi.AnnotatedType;
-import static javax.enterprise.inject.spi.SessionBeanType.STATELESS;
-import static javax.enterprise.inject.spi.SessionBeanType.STATEFUL;
-
import org.jboss.jsr299.tck.AbstractJSR299Test;
import org.jboss.test.audit.annotations.SpecAssertion;
import org.jboss.test.audit.annotations.SpecAssertions;
@@ -124,7 +124,7 @@
@SpecAssertion(section="12.3", id="fb")})
public void testProcessSessionBeanFiredForStatelessSessionBean() {
assert ProcessBeanObserver.getProcessStatelessSessionBeanEvent() != null;
- validateStatelessSessionBean(ProcessBeanObserver.getProcessStatelessSessionBeanEvent().getAnnotatedSessionBeanClass());
+ validateStatelessSessionBean(ProcessBeanObserver.getProcessStatelessSessionBeanEvent().getAnnotatedBeanClass());
}
@Test
@@ -134,7 +134,7 @@
@SpecAssertion(section="12.3", id="g")})
public void testProcessSessionBeanFiredForStatefulSessionBean() {
assert ProcessBeanObserver.getProcessStatefulSessionBeanEvent() != null;
- validateStatefulSessionBean(ProcessBeanObserver.getProcessStatefulSessionBeanEvent().getAnnotatedSessionBeanClass());
+ validateStatefulSessionBean(ProcessBeanObserver.getProcessStatefulSessionBeanEvent().getAnnotatedBeanClass());
}
@Test
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/processBean/ProcessSessionBeanTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/processBean/ProcessSessionBeanTest.java 2009-11-01 12:14:10 UTC (rev 4492)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/processBean/ProcessSessionBeanTest.java 2009-11-01 12:23:27 UTC (rev 4493)
@@ -48,8 +48,8 @@
assert ProcessBeanObserver.getElephantProcessSessionBean().getEjbName().equals("Rosie");
assert ProcessBeanObserver.getElephantProcessSessionBean().getSessionBeanType().equals(SessionBeanType.STATELESS);
assert ProcessBeanObserver.getElephantProcessSessionBean().getAnnotated() instanceof AnnotatedType<?>;
- assert ProcessBeanObserver.getElephantProcessSessionBean().getAnnotatedSessionBeanClass().getBaseType().equals(Elephant.class);
assert ProcessBeanObserver.getElephantProcessSessionBean().getAnnotatedBeanClass().getBaseType().equals(Elephant.class);
+ assert ProcessBeanObserver.getElephantProcessSessionBean().getAnnotatedBeanClass().getBaseType().equals(Elephant.class);
}
}
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/SimpleBeanLifecycleTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/SimpleBeanLifecycleTest.java 2009-11-01 12:14:10 UTC (rev 4492)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/SimpleBeanLifecycleTest.java 2009-11-01 12:23:27 UTC (rev 4493)
@@ -105,7 +105,6 @@
assert bean != null;
assert specializedBean != null;
- assert specializedBean == getCurrentManager().getMostSpecializedBean(bean);
assert specializedBean.getBeanClass().getSuperclass().equals(Lion.class);
}
14 years, 5 months
Weld SVN: r4492 - in api/trunk: bom and 1 other directory.
by weld-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-11-01 07:14:10 -0500 (Sun, 01 Nov 2009)
New Revision: 4492
Modified:
api/trunk/bom/pom.xml
api/trunk/pom.xml
Log:
use parent v4
Modified: api/trunk/bom/pom.xml
===================================================================
--- api/trunk/bom/pom.xml 2009-10-31 16:21:56 UTC (rev 4491)
+++ api/trunk/bom/pom.xml 2009-11-01 12:14:10 UTC (rev 4492)
@@ -8,7 +8,7 @@
<parent>
<groupId>org.jboss.weld</groupId>
<artifactId>weld-parent</artifactId>
- <version>2</version>
+ <version>4</version>
</parent>
<name>Weld and CDI APIs BOM</name>
Modified: api/trunk/pom.xml
===================================================================
--- api/trunk/pom.xml 2009-10-31 16:21:56 UTC (rev 4491)
+++ api/trunk/pom.xml 2009-11-01 12:14:10 UTC (rev 4492)
@@ -8,7 +8,7 @@
<parent>
<groupId>org.jboss.weld</groupId>
<artifactId>weld-parent</artifactId>
- <version>2</version>
+ <version>4</version>
</parent>
<name>Weld and CDI APIs Build Aggregator</name>
14 years, 5 months