7:16 p.m.
Author: pete.muir(a)jboss.org
Date: 2009-11-08 20:16:46 -0500 (Sun, 08 Nov 2009)
New Revision: 4820
Modified:
core/trunk/bom/pom.xml
core/trunk/impl/src/main/java/org/jboss/weld/util/Names.java
core/trunk/jboss-tck-runner/pom.xml
core/trunk/pom.xml
Log:
update versions
Modified: core/trunk/bom/pom.xml
===================================================================
--- core/trunk/bom/pom.xml 2009-11-09 01:00:41 UTC (rev 4819)
+++ core/trunk/bom/pom.xml 2009-11-09 01:16:46 UTC (rev 4820)
@@ -8,7 +8,7 @@
<parent>
<groupId>org.jboss.weld</groupId>
<artifactId>weld-parent</artifactId>
- <version>4</version>
+ <version>6</version>
</parent>
<name>Weld Core BOM</name>
@@ -71,10 +71,10 @@
</repositories>
<properties>
- <weld.api.version>1.0-CR4</weld.api.version>
+ <weld.api.version>1.0</weld.api.version>
<google.collections.version>1.0-rc3</google.collections.version>
<javassist.version>3.11.0.GA</javassist.version>
- <cdi.tck.version>1.0.0-CR6</cdi.tck.version>
+ <cdi.tck.version>1.0.0-CR7</cdi.tck.version>
<atinject.tck.version>1.0.0-PFD-3</atinject.tck.version>
<jboss.interceptor.version>1.0.0-CR5</jboss.interceptor.version>
<slf4j.version>1.5.9.RC1</slf4j.version>
Modified: core/trunk/impl/src/main/java/org/jboss/weld/util/Names.java
===================================================================
--- core/trunk/impl/src/main/java/org/jboss/weld/util/Names.java 2009-11-09 01:00:41 UTC
(rev 4819)
+++ core/trunk/impl/src/main/java/org/jboss/weld/util/Names.java 2009-11-09 01:16:46 UTC
(rev 4820)
@@ -337,7 +337,16 @@
String version = pkg.getImplementationVersion();
if (version != null)
{
- return new StringBuilder().append(version.substring(0,
version.lastIndexOf("-"))).append("
(").append(version.substring(version.lastIndexOf("-") +
1)).append(")").toString();
+ String separator = null;
+ if (version.indexOf("-") > 0)
+ {
+ separator = "-";
+ }
+ else
+ {
+ separator = ".";
+ }
+ return new StringBuilder().append(version.substring(0,
version.lastIndexOf(separator))).append("
(").append(version.substring(version.lastIndexOf(separator) +
1)).append(")").toString();
}
}
return "SNAPSHOT";
Modified: core/trunk/jboss-tck-runner/pom.xml
===================================================================
--- core/trunk/jboss-tck-runner/pom.xml 2009-11-09 01:00:41 UTC (rev 4819)
+++ core/trunk/jboss-tck-runner/pom.xml 2009-11-09 01:16:46 UTC (rev 4820)
@@ -92,7 +92,7 @@
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<suiteXmlFiles>
-
<suiteXmlFile>${project.build.directory}/dependency/jsr299-tck-impl-suite.xml</suiteXmlFile>
+
<suiteXmlFile>src/test/resources/tck-tests.xml</suiteXmlFile>
</suiteXmlFiles>
<argLine>-Xmx748m</argLine>
<forkMode>once</forkMode>
@@ -167,7 +167,7 @@
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<suiteXmlFiles>
-
<suiteXmlFile>${project.build.directory}/dependency/jsr299-tck-impl-suite.xml</suiteXmlFile>
+
<suiteXmlFile>src/test/resources/tck-tests.xml</suiteXmlFile>
</suiteXmlFiles>
<systemProperties>
<property>
@@ -210,7 +210,7 @@
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<suiteXmlFiles>
-
<suiteXmlFile>${project.build.directory}/dependency/jsr299-tck-impl-suite.xml</suiteXmlFile>
+
<suiteXmlFile>src/test/resources/tck-tests.xml</suiteXmlFile>
</suiteXmlFiles>
<systemProperties>
<property>
Modified: core/trunk/pom.xml
===================================================================
--- core/trunk/pom.xml 2009-11-09 01:00:41 UTC (rev 4819)
+++ core/trunk/pom.xml 2009-11-09 01:16:46 UTC (rev 4820)
@@ -9,7 +9,7 @@
<parent>
<groupId>org.jboss.weld</groupId>
<artifactId>weld-parent</artifactId>
- <version>4</version>
+ <version>6</version>
</parent>
<name>Weld Build Aggregator</name>