Fixing versioning in the archetype classloader
authorJaroslav Tulach <jaroslav.tulach@apidesign.org>
Thu, 27 Jun 2013 10:43:09 +0200
branchclassloader
changeset 1236b284b21de7a7
parent 1235 36614e9273e9
child 1237 558604864a1b
Fixing versioning in the archetype
ko/archetype-test/src/test/java/org/apidesign/bck2brwsr/ko/archetype/test/ArchetypeVersionTest.java
ko/archetype/src/main/resources/archetype-resources/pom.xml
     1.1 --- a/ko/archetype-test/src/test/java/org/apidesign/bck2brwsr/ko/archetype/test/ArchetypeVersionTest.java	Thu Jun 27 10:05:00 2013 +0200
     1.2 +++ b/ko/archetype-test/src/test/java/org/apidesign/bck2brwsr/ko/archetype/test/ArchetypeVersionTest.java	Thu Jun 27 10:43:09 2013 +0200
     1.3 @@ -62,8 +62,13 @@
     1.4          
     1.5          Document dom = DocumentBuilderFactory.newInstance().newDocumentBuilder().parse(r.openStream());
     1.6          String arch = (String) xp2.evaluate(dom, XPathConstants.STRING);
     1.7 +        
     1.8 +        // temporary
     1.9 +        int snapshot = arch.indexOf("-SNAPSHOT");
    1.10 +        assertTrue(snapshot > 0, "Now depends on snapshot: " + arch);
    1.11 +        arch = arch.substring(0, snapshot);
    1.12  
    1.13 -        assertEquals(arch, version, "net.java.html.json dependency needs to be on latest version");
    1.14 +        assertTrue(arch.matches("[0-9\\.]+"), "net.java.html.json version seems valid: " + arch);
    1.15      }
    1.16      
    1.17      @Test public void testCheckLauncher() throws Exception {
    1.18 @@ -79,8 +84,7 @@
    1.19          Document dom = DocumentBuilderFactory.newInstance().newDocumentBuilder().parse(r.openStream());
    1.20          String arch = (String) xp2.evaluate(dom, XPathConstants.STRING);
    1.21  
    1.22 -        
    1.23 -        assertTrue(arch.matches("[0-9\\.]+"), "launcher version seems valid: " + arch);
    1.24 +        assertEquals(arch, version, "launcher dependency is on more recent version");
    1.25      }
    1.26      
    1.27      @Test public void testCheckBck2Brwsr() throws Exception {
    1.28 @@ -96,7 +100,7 @@
    1.29          Document dom = DocumentBuilderFactory.newInstance().newDocumentBuilder().parse(r.openStream());
    1.30          String arch = (String) xp2.evaluate(dom, XPathConstants.STRING);
    1.31          
    1.32 -        assertTrue(arch.matches("[0-9\\.]+"), "bck2brwsr version seems valid: " + arch);
    1.33 +        assertEquals(arch, version, "bck2brwsr dependency is on more recent version");
    1.34      }
    1.35      
    1.36      @Test public void testNbActions() throws Exception {
    1.37 @@ -122,7 +126,7 @@
    1.38  
    1.39      static String findCurrentVersion() throws XPathExpressionException, IOException, ParserConfigurationException, SAXException, XPathFactoryConfigurationException {
    1.40          final ClassLoader l = ArchetypeVersionTest.class.getClassLoader();
    1.41 -        URL u = l.getResource("META-INF/maven/org.apidesign.html/knockout4j-archetype/pom.xml");
    1.42 +        URL u = l.getResource("META-INF/maven/org.apidesign.bck2brwsr/knockout4j-archetype/pom.xml");
    1.43          assertNotNull(u, "Own pom found: " + System.getProperty("java.class.path"));
    1.44  
    1.45          final XPathFactory fact = XPathFactory.newInstance();
     2.1 --- a/ko/archetype/src/main/resources/archetype-resources/pom.xml	Thu Jun 27 10:05:00 2013 +0200
     2.2 +++ b/ko/archetype/src/main/resources/archetype-resources/pom.xml	Thu Jun 27 10:43:09 2013 +0200
     2.3 @@ -38,9 +38,9 @@
     2.4  
     2.5    <properties>
     2.6      <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     2.7 -    <net.java.html.version>${project.version}</net.java.html.version>
     2.8 -    <bck2brwsr.version>${bck2brwsr.version}</bck2brwsr.version>
     2.9 -    <bck2brwsr.launcher.version>${bck2brwsr.launcher.version}</bck2brwsr.launcher.version>
    2.10 +    <net.java.html.version>${net.java.html.version}</net.java.html.version>
    2.11 +    <bck2brwsr.version>${project.version}</bck2brwsr.version>
    2.12 +    <bck2brwsr.launcher.version>${project.version}</bck2brwsr.launcher.version>
    2.13      <bck2brwsr.obfuscationlevel>MINIMAL</bck2brwsr.obfuscationlevel>
    2.14      <brwsr.startpage>\${package.replace('.','/')}/index.html</brwsr.startpage>
    2.15    </properties>