Skip to content

Commit b850ab7

Browse files
kevzlou7979kevzlou7979
authored
Merge pull request #35 from GwtMaterialDesign/release_2.0
Release 2.0-rc1 (WIP)
2 parents b61411c + 4cd33f2 commit b850ab7

File tree

216 files changed

+13100
-7615
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

216 files changed

+13100
-7615
lines changed

‎.travis.yml‎

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,31 @@
11
sudo: false
22
language: java
33
jdk:
4-
- oraclejdk7
4+
- oraclejdk8
55
cache:
66
directories:
77
- $HOME/.m2
88
before_install:
99
# install the gwt-material library before we build the demo
10-
- git clone -b release_1.6.0 https://github.com/GwtMaterialDesign/gwt-material.git
10+
- git clone -b release_2.0 https://github.com/GwtMaterialDesign/gwt-material.git
1111
- cd gwt-material
1212
- mvn install -DskipTests=true -DdryRun=true
1313
- cd ..
1414
# install the gwt-material-themes library
15-
- git clone -b release_1.6.0 https://github.com/GwtMaterialDesign/gwt-material-themes.git
15+
- git clone -b release_2.0 https://github.com/GwtMaterialDesign/gwt-material-themes.git
1616
- cd gwt-material-themes
1717
- mvn install -DskipTests=true -DdryRun=true
1818
- cd ..
1919
# install the gwt-material-addins library
20-
- git clone -b release_1.6.0 https://github.com/GwtMaterialDesign/gwt-material-addins.git
20+
- git clone -b release_2.0 https://github.com/GwtMaterialDesign/gwt-material-addins.git
2121
- cd gwt-material-addins
2222
- mvn install -DskipTests=true -DdryRun=true
2323
- cd ..
24+
# install the gwt-material-table library before we build the demo
25+
- git clone -b master https://github.com/GwtMaterialDesign/gwt-material-table.git
26+
- cd gwt-material-table
27+
- mvn install -DskipTests=true -DdryRun=true
28+
- cd ..
2429
install: true
2530
before_script:
2631
- chmod +x .utility/*

‎.utility/update_demo_site.sh‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/bin/bash
22
set -ev
3-
if [ "$TRAVIS_JDK_VERSION" == "oraclejdk7" ] && [ "$TRAVIS_PULL_REQUEST" == "false" ] && [ "$TRAVIS_BRANCH" == "release_1.6.0" ]; then
3+
if [ "$TRAVIS_JDK_VERSION" == "oraclejdk8" ] && [ "$TRAVIS_PULL_REQUEST" == "false" ] && [ "$TRAVIS_BRANCH" == "release_2.0" ]; then
44

55
if [[ -z "$GH_TOKEN" ]]; then
66
echo -e "GH_TOKEN is not set"
@@ -24,23 +24,23 @@ git clone --quiet --branch=gh-pages https://[email protected]/GwtMaterialDesi
2424
cd gh-pages
2525

2626
# remove the GwtMaterialDemo directories from git.
27-
if [[ -d ./snapshot/gwtmaterialdemo ]]; then
28-
git rm -rf ./snapshot/gwtmaterialdemo
27+
if [[ -d ./2.0-SNAPSHOT/gwtmaterialdemo ]]; then
28+
git rm -rf ./2.0-SNAPSHOT/gwtmaterialdemo
2929
fi
30-
if [[ -f ./snapshot/index.html ]]; then
31-
git rm -rf ./snapshot/index.html
30+
if [[ -f ./2.0-SNAPSHOT/index.html ]]; then
31+
git rm -rf ./2.0-SNAPSHOT/index.html
3232
fi
33-
if [[ -d ./snapshot/META-INF ]]; then
34-
git rm -rf ./snapshot/META-INF
33+
if [[ -d ./2.0-SNAPSHOT/META-INF ]]; then
34+
git rm -rf ./2.0-SNAPSHOT/META-INF
3535
fi
36-
if [[ -d ./snapshot/WEB-INF ]]; then
37-
git rm -rf ./snapshot/WEB-INF
36+
if [[ -d ./2.0-SNAPSHOT/WEB-INF ]]; then
37+
git rm -rf ./2.0-SNAPSHOT/WEB-INF
3838
fi
3939

40-
# copy the new GwtMaterialDemo the snapshot dir.
41-
unzip -u $TRAVIS_BUILD_DIR/target/gwt-material-demo-*.war -d ./snapshot/
42-
rm -rf ./snapshot/META-INF
43-
rm -rf ./snapshot/WEB-INF
40+
# copy the new GwtMaterialDemo the 2.0-SNAPSHOT dir.
41+
unzip -u $TRAVIS_BUILD_DIR/target/gwt-material-demo-*.war -d ./2.0-SNAPSHOT/
42+
rm -rf ./2.0-SNAPSHOT/META-INF
43+
rm -rf ./2.0-SNAPSHOT/WEB-INF
4444

4545
git add -f .
4646
git commit -m "Auto-push demo to gh-pages successful. (Travis build: $TRAVIS_BUILD_NUMBER)"

‎README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@
22
#gwt-material-demo [![Build Status](https://travis-ci.org/GwtMaterialDesign/gwt-material-demo.svg?branch=master)](https://travis-ci.org/GwtMaterialDesign/gwt-material-demo)
33
Demo application to show the features of the [gwt-material](https://github.com/GwtMaterialDesign/gwt-material) library.
44

5-
### Release 1.6.0 Demo
5+
### Release 2.0-rc1 Demo
66
[http://gwtmaterialdesign.github.io/gwt-material-demo](http://gwtmaterialdesign.github.io/gwt-material-demo)
77
```xml
88
<dependency>
99
<groupId>com.github.gwtmaterialdesign</groupId>
1010
<artifactId>gwt-material-demo</artifactId>
11-
<version>1.6.0</version>
11+
<version>2.0-rc1</version>
1212
</dependency>
1313
```
1414

‎pom.xml‎

Lines changed: 95 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,14 @@
44
<parent>
55
<artifactId>gwt-material-parent</artifactId>
66
<groupId>com.github.gwtmaterialdesign</groupId>
7-
<version>1.6.0</version>
7+
<version>2.0-rc1</version>
88
</parent>
99

1010
<modelVersion>4.0.0</modelVersion>
1111

1212
<artifactId>gwt-material-demo</artifactId>
1313
<packaging>war</packaging>
14-
<version>1.6.0</version>
14+
<version>2.0-rc1</version>
1515
<name>Gwt Material Demo</name>
1616
<description>Showcase for gwt-material</description>
1717

@@ -26,15 +26,16 @@
2626
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
2727

2828
<!-- Project properties -->
29-
<maven.compiler.source>1.7</maven.compiler.source>
30-
<maven.compiler.target>1.7</maven.compiler.target>
29+
<maven.compiler.source>1.8</maven.compiler.source>
30+
<maven.compiler.target>1.8</maven.compiler.target>
3131
<project.encoding>UTF-8</project.encoding>
3232

3333
<!-- GWT -->
34-
<gwt.version>2.7.0</gwt.version>
34+
<gwt.version>2.8.0</gwt.version>
3535
<gwtp.version>1.5.3</gwtp.version>
3636
<gin.version>2.1.2</gin.version>
37-
<gwt-material.version>1.6.0-SNAPSHOT</gwt-material.version>
37+
<gwt-material.version>2.0-rc1</gwt-material.version>
38+
<gwt-material-table.version>1.0-rc1</gwt-material-table.version>
3839

3940
<gwt.style>PRETTY</gwt.style>
4041

@@ -47,6 +48,13 @@
4748
<maven-compiler-plugin.version>3.2</maven-compiler-plugin.version>
4849
</properties>
4950

51+
<licenses>
52+
<license>
53+
<name>Apache License Version 2</name>
54+
<url>http://www.apache.org/licenses/LICENSE-2.0.html</url>
55+
</license>
56+
</licenses>
57+
5058
<build>
5159
<outputDirectory>${project.build.directory}/${project.build.finalName}/WEB-INF/classes</outputDirectory>
5260

@@ -57,6 +65,54 @@
5765
</resources>
5866

5967
<plugins>
68+
<plugin>
69+
<groupId>org.codehaus.mojo</groupId>
70+
<artifactId>license-maven-plugin</artifactId>
71+
<version>1.5</version>
72+
<configuration>
73+
<licenseName>apache_v2</licenseName>
74+
<inceptionYear>2015</inceptionYear>
75+
<organizationName>GwtMaterialDesign</organizationName>
76+
<projectName>GwtMaterial</projectName>
77+
<includes>
78+
<include>**/*.java</include>
79+
<include>**/*.xml</include>
80+
</includes>
81+
</configuration>
82+
<executions>
83+
<execution>
84+
<id>license</id>
85+
<phase>process-sources</phase>
86+
<goals>
87+
<goal>update-file-header</goal>
88+
</goals>
89+
</execution>
90+
</executions>
91+
</plugin>
92+
<plugin>
93+
<groupId>org.apache.maven.plugins</groupId>
94+
<artifactId>maven-javadoc-plugin</artifactId>
95+
<version>2.10.3</version>
96+
<configuration>
97+
<!-- comment out for now because doesn't work on JDK < 8 -->
98+
<!--<additionalparam>-Xdoclint:none</additionalparam>-->
99+
<encoding>${project.build.sourceEncoding}</encoding>
100+
<locale>en</locale>
101+
<linksource>true</linksource>
102+
<validateLinks>true</validateLinks>
103+
<links>
104+
<link>https://github.com/gwtproject/gwt/tree/master/doc/validation-package-list</link>
105+
</links>
106+
</configuration>
107+
<executions>
108+
<execution>
109+
<phase>package</phase>
110+
<goals>
111+
<goal>jar</goal>
112+
</goals>
113+
</execution>
114+
</executions>
115+
</plugin>
60116
<plugin>
61117
<groupId>org.codehaus.mojo</groupId>
62118
<artifactId>versions-maven-plugin</artifactId>
@@ -71,7 +127,6 @@
71127
</execution>
72128
</executions>
73129
</plugin>
74-
75130
<plugin>
76131
<groupId>org.apache.maven.plugins</groupId>
77132
<version>${maven-compiler-plugin.version}</version>
@@ -80,16 +135,12 @@
80135
<source>${maven.compiler.source}</source>
81136
<target>${maven.compiler.target}</target>
82137
</configuration>
83-
<dependencies>
84-
<!-- Run RequestFactory validation tool. -->
85-
<dependency>
86-
<groupId>com.google.web.bindery</groupId>
87-
<artifactId>requestfactory-apt</artifactId>
88-
<version>${gwt.version}</version>
89-
</dependency>
90-
</dependencies>
91138
</plugin>
92-
139+
<plugin>
140+
<groupId>org.apache.maven.plugins</groupId>
141+
<artifactId>maven-gpg-plugin</artifactId>
142+
<version>1.6</version>
143+
</plugin>
93144
<!-- Skips the GWTTestCases during Junit Testing -->
94145
<plugin>
95146
<groupId>org.apache.maven.plugins</groupId>
@@ -170,6 +221,24 @@
170221
</plugins>
171222
</build>
172223

224+
<repositories>
225+
<repository>
226+
<id>snapshots-repo</id>
227+
<url>https://oss.sonatype.org/content/repositories/google-snapshots</url>
228+
<releases>
229+
<enabled>false</enabled>
230+
</releases>
231+
<snapshots>
232+
<enabled>true</enabled>
233+
</snapshots>
234+
</repository>
235+
<repository>
236+
<id>jboss-public-repository-group</id>
237+
<name>JBoss Public Maven Repository Group</name>
238+
<url>https://repository.jboss.org/nexus/content/groups/public/</url>
239+
</repository>
240+
</repositories>
241+
173242
<distributionManagement>
174243
<snapshotRepository>
175244
<id>ossrh</id>
@@ -188,17 +257,22 @@
188257
<dependency>
189258
<groupId>com.github.gwtmaterialdesign</groupId>
190259
<artifactId>gwt-material</artifactId>
191-
<version>1.6.0</version>
260+
<version>${gwt-material.version}</version>
192261
</dependency>
193262
<dependency>
194263
<groupId>com.github.gwtmaterialdesign</groupId>
195264
<artifactId>gwt-material-themes</artifactId>
196-
<version>1.6.0</version>
265+
<version>${gwt-material.version}</version>
197266
</dependency>
198267
<dependency>
199268
<groupId>com.github.gwtmaterialdesign</groupId>
200269
<artifactId>gwt-material-addins</artifactId>
201-
<version>1.6.0</version>
270+
<version>${gwt-material.version}</version>
271+
</dependency>
272+
<dependency>
273+
<groupId>com.github.gwtmaterialdesign</groupId>
274+
<artifactId>gwt-material-table</artifactId>
275+
<version>${gwt-material-table.version}</version>
202276
</dependency>
203277

204278
<!-- App Engine -->
@@ -234,8 +308,8 @@
234308

235309
<dependency>
236310
<groupId>javax.servlet</groupId>
237-
<artifactId>servlet-api</artifactId>
238-
<version>3.0-alpha-1</version>
311+
<artifactId>javax.servlet-api</artifactId>
312+
<version>3.1.0</version>
239313
<scope>provided</scope>
240314
</dependency>
241315
<dependency>

0 commit comments

Comments
 (0)