Skip to content

Commit 28ecce8

Browse files
authored
Merge branch 'master' into release_2.5.0
2 parents 136c7a9 + bf25eec commit 28ecce8

File tree

3 files changed

+6
-9
lines changed

3 files changed

+6
-9
lines changed

.travis.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,17 +8,17 @@ cache:
88
- $HOME/.m2
99
before_install:
1010
# install the gwt-material-jquery library before we build the demo
11-
- git clone -b release_2.5.0 https://github.com/GwtMaterialDesign/gwt-material-jquery.git
11+
- git clone -b release_2.5.0_rc1 https://github.com/GwtMaterialDesign/gwt-material-jquery.git
1212
- cd gwt-material-jquery
1313
- mvn install -DskipTests=true -DdryRun=true
1414
- cd ..
1515
# install the gwt-material library before we build the demo
16-
- git clone -b release_2.5.0 https://github.com/GwtMaterialDesign/gwt-material.git
16+
- git clone -b release_2.5.0_rc1 https://github.com/GwtMaterialDesign/gwt-material.git
1717
- cd gwt-material
1818
- mvn install -DskipTests=true -DdryRun=true
1919
- cd ..
2020
# install the gwt-material-table library before we build the demo
21-
- git clone -b release_2.5.0 https://github.com/GwtMaterialDesign/gwt-material-table.git
21+
- git clone -b release_2.5.0_rc1 https://github.com/GwtMaterialDesign/gwt-material-table.git
2222
- cd gwt-material-table
2323
- mvn install -DskipTests=true -DdryRun=true
2424
- cd ..

.utility/deploy.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/bin/bash
22
set -ev
3-
if [ "$TRAVIS_JDK_VERSION" == "oraclejdk8" ] && [ "$TRAVIS_PULL_REQUEST" == "false" ] && [ "$TRAVIS_BRANCH" == "release_2.5.0" ]; then
3+
if [ "$TRAVIS_JDK_VERSION" == "oraclejdk8" ] && [ "$TRAVIS_PULL_REQUEST" == "false" ] && [ "$TRAVIS_BRANCH" == "release_2.5.0_rc1" ]; then
44
echo "<settings><servers><server><id>ossrh</id><username>\${env.OSSRH_USER}</username><password>\${env.OSSRH_PASS}</password></server></servers></settings>" > ~/settings.xml
55
mvn deploy -DskipTests --settings ~/settings.xml
66
fi

README.md

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@
66

77
Gwt Material Design Extra Components for https://github.com/GwtMaterialDesign/gwt-material <br>
88

9-
## Current Version 2.5.0
9+
## Current Version 2.5.0-rc1
1010
```xml
1111
<dependency>
1212
<groupId>com.github.gwtmaterialdesign</groupId>
1313
<artifactId>gwt-material-addins</artifactId>
14-
<version>2.5.0</version>
14+
<version>2.5.0-rc1</version>
1515
</dependency>
1616
```
1717

@@ -110,6 +110,3 @@ We created [Java Docs](http://gwtmaterialdesign.github.io/gwt-material-demo/apid
110110
- Inline Search
111111
- Timer (Infinite)
112112
- Toggle
113-
114-
## Follow Us
115-
<a href="https://plus.google.com/u/0/communities/108005250093449814286"> Google Plus</a>

0 commit comments

Comments
 (0)