# HG changeset patch
# User Jaroslav Tulach <jaroslav.tulach@apidesign.org>
# Date 1372322589 -7200
# Node ID b284b21de7a75da1a62728f3486da839656a8567
# Parent  36614e9273e957719edbe9bff7282bdbaaa4dad3
Fixing versioning in the archetype

diff -r 36614e9273e9 -r b284b21de7a7 ko/archetype-test/src/test/java/org/apidesign/bck2brwsr/ko/archetype/test/ArchetypeVersionTest.java
--- a/ko/archetype-test/src/test/java/org/apidesign/bck2brwsr/ko/archetype/test/ArchetypeVersionTest.java	Thu Jun 27 10:05:00 2013 +0200
+++ b/ko/archetype-test/src/test/java/org/apidesign/bck2brwsr/ko/archetype/test/ArchetypeVersionTest.java	Thu Jun 27 10:43:09 2013 +0200
@@ -62,8 +62,13 @@
         
         Document dom = DocumentBuilderFactory.newInstance().newDocumentBuilder().parse(r.openStream());
         String arch = (String) xp2.evaluate(dom, XPathConstants.STRING);
+        
+        // temporary
+        int snapshot = arch.indexOf("-SNAPSHOT");
+        assertTrue(snapshot > 0, "Now depends on snapshot: " + arch);
+        arch = arch.substring(0, snapshot);
 
-        assertEquals(arch, version, "net.java.html.json dependency needs to be on latest version");
+        assertTrue(arch.matches("[0-9\\.]+"), "net.java.html.json version seems valid: " + arch);
     }
     
     @Test public void testCheckLauncher() throws Exception {
@@ -79,8 +84,7 @@
         Document dom = DocumentBuilderFactory.newInstance().newDocumentBuilder().parse(r.openStream());
         String arch = (String) xp2.evaluate(dom, XPathConstants.STRING);
 
-        
-        assertTrue(arch.matches("[0-9\\.]+"), "launcher version seems valid: " + arch);
+        assertEquals(arch, version, "launcher dependency is on more recent version");
     }
     
     @Test public void testCheckBck2Brwsr() throws Exception {
@@ -96,7 +100,7 @@
         Document dom = DocumentBuilderFactory.newInstance().newDocumentBuilder().parse(r.openStream());
         String arch = (String) xp2.evaluate(dom, XPathConstants.STRING);
         
-        assertTrue(arch.matches("[0-9\\.]+"), "bck2brwsr version seems valid: " + arch);
+        assertEquals(arch, version, "bck2brwsr dependency is on more recent version");
     }
     
     @Test public void testNbActions() throws Exception {
@@ -122,7 +126,7 @@
 
     static String findCurrentVersion() throws XPathExpressionException, IOException, ParserConfigurationException, SAXException, XPathFactoryConfigurationException {
         final ClassLoader l = ArchetypeVersionTest.class.getClassLoader();
-        URL u = l.getResource("META-INF/maven/org.apidesign.html/knockout4j-archetype/pom.xml");
+        URL u = l.getResource("META-INF/maven/org.apidesign.bck2brwsr/knockout4j-archetype/pom.xml");
         assertNotNull(u, "Own pom found: " + System.getProperty("java.class.path"));
 
         final XPathFactory fact = XPathFactory.newInstance();
diff -r 36614e9273e9 -r b284b21de7a7 ko/archetype/src/main/resources/archetype-resources/pom.xml
--- a/ko/archetype/src/main/resources/archetype-resources/pom.xml	Thu Jun 27 10:05:00 2013 +0200
+++ b/ko/archetype/src/main/resources/archetype-resources/pom.xml	Thu Jun 27 10:43:09 2013 +0200
@@ -38,9 +38,9 @@
 
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <net.java.html.version>${project.version}</net.java.html.version>
-    <bck2brwsr.version>${bck2brwsr.version}</bck2brwsr.version>
-    <bck2brwsr.launcher.version>${bck2brwsr.launcher.version}</bck2brwsr.launcher.version>
+    <net.java.html.version>${net.java.html.version}</net.java.html.version>
+    <bck2brwsr.version>${project.version}</bck2brwsr.version>
+    <bck2brwsr.launcher.version>${project.version}</bck2brwsr.launcher.version>
     <bck2brwsr.obfuscationlevel>MINIMAL</bck2brwsr.obfuscationlevel>
     <brwsr.startpage>\${package.replace('.','/')}/index.html</brwsr.startpage>
   </properties>