update versions

weld · Nov 9, 2009 · 017214e · 017214e
1 parent 1c591bc
commit 017214e
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 8 deletions.
diff --git a/bom/pom.xml b/bom/pom.xml
@@ -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>

diff --git a/impl/src/main/java/org/jboss/weld/util/Names.java b/impl/src/main/java/org/jboss/weld/util/Names.java
@@ -337,7 +337,16 @@ public static String version(Package pkg)
          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";

diff --git a/jboss-tck-runner/pom.xml b/jboss-tck-runner/pom.xml
@@ -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>

diff --git a/pom.xml b/pom.xml
@@ -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>