Manual merge on default branch
authorJaroslav Tulach <jaroslav.tulach@apidesign.org>
Tue, 16 Sep 2014 11:07:17 +0200
changeset 21722bc39a538cd
parent 216 7d091558d9f4
parent 212 0e4f488d5fa6
child 218 52badacce2cc
Manual merge on default branch
minesweeper/pom.xml
     1.1 --- a/minesweeper/pom.xml	Fri Aug 29 22:49:26 2014 +0200
     1.2 +++ b/minesweeper/pom.xml	Tue Sep 16 11:07:17 2014 +0200
     1.3 @@ -4,7 +4,7 @@
     1.4  
     1.5    <groupId>org.apidesign.demo</groupId>
     1.6    <artifactId>minesweeper</artifactId>
     1.7 -  <version>2.0-SNAPSHOT</version>
     1.8 +  <version>2.4-SNAPSHOT</version>
     1.9    <packaging>jar</packaging>
    1.10    <parent>
    1.11        <artifactId>demo</artifactId>
    1.12 @@ -286,7 +286,7 @@
    1.13                <dependency>
    1.14                    <groupId>org.apidesign.brwsr</groupId>
    1.15                    <artifactId>dlvkbrwsr</artifactId>
    1.16 -                  <version>1.0-SNAPSHOT</version>
    1.17 +                  <version>1.0</version>
    1.18                    <type>jar</type>
    1.19                </dependency>
    1.20                <dependency>
    1.21 @@ -476,7 +476,7 @@
    1.22                <dependency>
    1.23                    <groupId>org.apidesign.brwsr</groupId>
    1.24                    <artifactId>ibrwsr</artifactId>
    1.25 -                  <version>0.8.3</version>
    1.26 +                  <version>1.0</version>
    1.27                    <scope>runtime</scope>
    1.28                </dependency>
    1.29            </dependencies>
     2.1 --- a/pom.xml	Fri Aug 29 22:49:26 2014 +0200
     2.2 +++ b/pom.xml	Tue Sep 16 11:07:17 2014 +0200
     2.3 @@ -13,7 +13,7 @@
     2.4    </parent>  
     2.5    <properties>
     2.6        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     2.7 -      <net.java.html.version>1.0-SNAPSHOT</net.java.html.version>
     2.8 +      <net.java.html.version>1.0</net.java.html.version>
     2.9        <nb.html.version>0.8.3</nb.html.version>
    2.10        <bck2brwsr.version>0.9</bck2brwsr.version>
    2.11        <teavm.version>0.1</teavm.version>