Author: shawkins Date: 2012-04-12 14:49:45 -0400 (Thu, 12 Apr 2012) New Revision: 3997 Modified: trunk/common-core/src/main/java/org/teiid/core/types/basic/StringToTimestampTransform.java trunk/documentation/javadocs/pom.xml Log: forward merge from 7.7.1 Modified: trunk/common-core/src/main/java/org/teiid/core/types/basic/StringToTimestampTransform.java =================================================================== --- trunk/common-core/src/main/java/org/teiid/core/types/basic/StringToTimestampTransform.java 2012-04-12 18:49:04 UTC (rev 3996) +++ trunk/common-core/src/main/java/org/teiid/core/types/basic/StringToTimestampTransform.java 2012-04-12 18:49:45 UTC (rev 3997) @@ -33,7 +33,7 @@ public class StringToTimestampTransform extends Transform { private static boolean validate = true; - private static Pattern pattern = Pattern.compile("\\d{4}-\\d{2}-\\d{2} \\d{2}:\\d{2}:\\d{2}"); //$NON-NLS-1$ + private static Pattern pattern = Pattern.compile("\\d{4}-\\d{2}-\\d{2} \\d{2}:\\d{2}:\\d{2}(\\.\\d{1,9})?"); //$NON-NLS-1$ static { try { Modified: trunk/documentation/javadocs/pom.xml =================================================================== --- trunk/documentation/javadocs/pom.xml 2012-04-12 18:49:04 UTC (rev 3996) +++ trunk/documentation/javadocs/pom.xml 2012-04-12 18:49:45 UTC (rev 3997) @@ -2,7 +2,7 @@ <parent> <groupId>org.jboss.teiid</groupId> <artifactId>documentation</artifactId> - <version>8.0</version> + <version>8.0.0.alpha2-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>javadocs</artifactId>