Preparation for 2.1 release

.travis.yml

@@ -7,22 +7,22 @@ cache:
   - $HOME/.m2
 before_install:
 # install the gwt-material library before we build the demo
-- git clone -b release_2.1 https://github.com/GwtMaterialDesign/gwt-material.git
+- git clone -b master https://github.com/GwtMaterialDesign/gwt-material.git
 - cd gwt-material
 - mvn install -DskipTests=true -DdryRun=true
 - cd ..
 # install the gwt-material-themes library
-- git clone -b release_2.1 https://github.com/GwtMaterialDesign/gwt-material-themes.git
+- git clone -b master https://github.com/GwtMaterialDesign/gwt-material-themes.git
 - cd gwt-material-themes
 - mvn install -DskipTests=true -DdryRun=true
 - cd ..
 # install the gwt-material-addins library
-- git clone -b release_2.1 https://github.com/GwtMaterialDesign/gwt-material-addins.git
+- git clone -b master https://github.com/GwtMaterialDesign/gwt-material-addins.git
 - cd gwt-material-addins
 - mvn install -DskipTests=true -DdryRun=true
 - cd ..
 # install the gwt-material-table library before we build the demo
-- git clone -b release_2.1 https://github.com/GwtMaterialDesign/gwt-material-table.git
+- git clone -b master https://github.com/GwtMaterialDesign/gwt-material-table.git
 - cd gwt-material-table
 - mvn install -DskipTests=true -DdryRun=true
 - cd ..

.utility/update_demo_site.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 set -ev
-if [ "$TRAVIS_JDK_VERSION" == "oraclejdk8" ] && [ "$TRAVIS_PULL_REQUEST" == "false" ] && [ "$TRAVIS_BRANCH" == "release_2.1" ]; then
+if [ "$TRAVIS_JDK_VERSION" == "oraclejdk8" ] && [ "$TRAVIS_PULL_REQUEST" == "false" ] && [ "$TRAVIS_BRANCH" == "master" ]; then
 
 if [[ -z "$GH_TOKEN" ]]; then
 echo -e "GH_TOKEN is not set"
@@ -24,14 +24,23 @@ git clone --quiet --branch=gh-pages https://$GH_TOKEN@github.com/GwtMaterialDesi
 cd gh-pages
 
 # remove the GwtMaterialDemo directories from git.
-if [[ -d ./2.1/ ]]; then
-git rm -rf ./2.1/
+if [[ -d ./gwtmaterialdemo ]]; then
+git rm -rf ./gwtmaterialdemo
+fi
+if [[ -f ./index.html ]]; then
+git rm -rf ./index.html
+fi
+if [[ -d ./META-INF ]]; then
+git rm -rf ./META-INF
+fi
+if [[ -d ./snapshot/WEB-INF ]]; then
+git rm -rf ./snapshot/WEB-INF
 fi
 
 # copy the new GwtMaterialDemo the snapshot dir.
-unzip -u $TRAVIS_BUILD_DIR/target/gwt-material-demo-*.war -d ./2.1/
-rm -rf ./2.1/META-INF
-rm -rf ./2.1/WEB-INF
+unzip -u $TRAVIS_BUILD_DIR/target/gwt-material-demo-*.war -d ./
+rm -rf ./META-INF
+rm -rf ./WEB-INF
 
 git add -f .
 git commit -m "Auto-push demo to gh-pages successful. (Travis build: $TRAVIS_BUILD_NUMBER)"

README.md

@@ -6,23 +6,23 @@
 
 Demo application to show the features of the [gwt-material](https://github.com/GwtMaterialDesign/gwt-material) library.
 
-### Release 2.0.1 Demo
+### Release 2.1 Demo
 [http://gwtmaterialdesign.github.io/gwt-material-demo](http://gwtmaterialdesign.github.io/gwt-material-demo)
 ```xml
 <dependency>
     <groupId>com.github.gwtmaterialdesign</groupId>
     <artifactId>gwt-material-demo</artifactId>
-    <version>2.0.1</version>
+    <version>2.1</version>
 </dependency>
 ```
 
-### 2.1 Snapshot Demo
+### 2.2 Snapshot Demo
 [http://gwtmaterialdesign.github.io/gwt-material-demo/snapshot](http://gwtmaterialdesign.github.io/gwt-material-demo/snapshot)
 ```xml
 <dependency>
     <groupId>com.github.gwtmaterialdesign</groupId>
     <artifactId>gwt-material-demo</artifactId>
-    <version>2.1-SNAPSHOT</version>
+    <version>2.2-SNAPSHOT</version>
 </dependency>
 ```
 

pom.xml

@@ -4,14 +4,14 @@
     <parent>
         <artifactId>gwt-material-parent</artifactId>
         <groupId>com.github.gwtmaterialdesign</groupId>
-        <version>2.1-SNAPSHOT</version>
+        <version>2.1</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>gwt-material-demo</artifactId>
     <packaging>war</packaging>
-    <version>2.1-SNAPSHOT</version>
+    <version>2.1</version>
     <name>Gwt Material Demo</name>
     <description>Showcase for gwt-material</description>
 
@@ -34,7 +34,7 @@
         <gwt.version>2.8.2</gwt.version>
         <gwtp.version>1.6</gwtp.version>
         <gin.version>2.1.2</gin.version>
-        <gwt-material.version>2.1-SNAPSHOT</gwt-material.version>
+        <gwt-material.version>2.1</gwt-material.version>
 
         <!-- Maven -->
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>