Skip to content

Commit 5635c12

Browse files
kevzlou7979kevzlou7979
authored
Merge pull request #195 from GwtMaterialDesign/release_2.4.0
Release 2.4.0
2 parents 4620f49 + 3d1c303 commit 5635c12

28 files changed

+1122
-346
lines changed

‎.travis.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,19 +8,19 @@ 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.3 https://github.com/GwtMaterialDesign/gwt-material-jquery.git
11+
- git clone -b release_2.4.0 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.3 https://github.com/GwtMaterialDesign/gwt-material.git
16+
- git clone -b release_2.4.0 https://github.com/GwtMaterialDesign/gwt-material.git
1717
- cd gwt-material
1818
- mvn install -DskipTests=true -DdryRun=true
1919
- cd ..
2020
install: true
2121
before_script:
2222
- chmod +x .utility/*
2323
script:
24-
- mvn clean install -DdryRun=true
24+
- mvn clean install -DdryRun=true -DskipTests=true
2525
after_success:
2626
- .utility/deploy.sh

‎.utility/deploy.sh

Lines changed: 2 additions & 2 deletions
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.3" ]; then
3+
if [ "$TRAVIS_JDK_VERSION" == "oraclejdk8" ] && [ "$TRAVIS_PULL_REQUEST" == "false" ] && [ "$TRAVIS_BRANCH" == "release_2.4.0" ]; then
44
echo "<settings><servers><server><id>ossrh</id><username>\${env.OSSRH_USER}</username><password>\${env.OSSRH_PASS}</password></server></servers></settings>" > ~/settings.xml
5-
mvn deploy --settings ~/settings.xml
5+
mvn deploy -DskipTests --settings ~/settings.xml
66
fi

‎README.md

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,21 +11,20 @@ A complex table component designed for the material design specifications!
1111
Support documentation can be found [here](https://github.com/GwtMaterialDesign/gwt-material-table/wiki)
1212

1313
## Maven
14-
Current Version 2.3.0
14+
Current Version 2.4.0-rc1
1515
```xml
1616
<dependency>
1717
<groupId>com.github.gwtmaterialdesign</groupId>
1818
<artifactId>gwt-material-table</artifactId>
19-
<version>2.3.0</version>
19+
<version>2.4.0-rc1</version>
2020
</dependency>
2121
```
2222

23-
Snapshot Version 2.3.1-SNAPSHOT
2423
```xml
2524
<dependency>
2625
<groupId>com.github.gwtmaterialdesign</groupId>
2726
<artifactId>gwt-material-table</artifactId>
28-
<version>2.3.1-SNAPSHOT</version>
27+
<version>2.4.0-SNAPSHOT</version>
2928
</dependency>
3029
```
3130

‎pom.xml

Lines changed: 91 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@
66
<parent>
77
<artifactId>gwt-material-parent</artifactId>
88
<groupId>com.github.gwtmaterialdesign</groupId>
9-
<version>2.3.0</version>
9+
<version>2.4.0-rc1</version>
1010
</parent>
1111

1212
<artifactId>gwt-material-table</artifactId>
1313
<packaging>gwt-lib</packaging>
14-
<version>2.3.0</version>
14+
<version>2.4.0-rc1</version>
1515

1616
<name>Gwt Material Table</name>
1717
<description>A complex table component designed for the material design specifications</description>
@@ -58,16 +58,12 @@
5858
<maven.compiler.target>1.8</maven.compiler.target>
5959
<project.encoding>UTF-8</project.encoding>
6060
<webappDirectory>${project.build.directory}/${project.build.finalName}</webappDirectory>
61-
6261
<!-- Libraries -->
63-
<gwt-material.version>2.3.0</gwt-material.version>
64-
65-
<!-- Testing -->
66-
<junit.version>4.11</junit.version>
67-
62+
<gwt-material.version>2.4.0-rc1</gwt-material.version>
6863
<!-- Plugin Versions -->
6964
<maven-surefire-plugin.version>2.18.1</maven-surefire-plugin.version>
7065
<maven-compiler-plugin.version>3.2</maven-compiler-plugin.version>
66+
<maven.failsafe.plugin>2.22.1</maven.failsafe.plugin>
7167
</properties>
7268

7369
<licenses>
@@ -117,9 +113,13 @@
117113
<groupId>junit</groupId>
118114
<artifactId>junit</artifactId>
119115
<version>${junit.version}</version>
120-
<!-- this can be overridden -->
121116
<scope>test</scope>
122117
</dependency>
118+
<dependency>
119+
<groupId>net.sourceforge.htmlunit</groupId>
120+
<artifactId>htmlunit</artifactId>
121+
<version>${htmlunit.version}</version>
122+
</dependency>
123123
</dependencies>
124124

125125
<build>
@@ -134,58 +134,107 @@
134134

135135
<plugins>
136136
<plugin>
137-
<groupId>net.ltgt.gwt.maven</groupId>
138-
<artifactId>gwt-maven-plugin</artifactId>
139-
<version>${tbroyer.version}</version>
140-
<extensions>true</extensions>
137+
<artifactId>maven-surefire-plugin</artifactId>
138+
<version>${surefire.version}</version>
141139
<configuration>
142-
<moduleName>gwt.material.design.GwtMaterialTable</moduleName>
143-
<style>OBFUSCATED</style>
144-
<logLevel>INFO</logLevel>
145-
<sourceLevel>1.8</sourceLevel>
146-
<jvmArgs>
147-
<jvmArg>-Xmx1g</jvmArg>
148-
<jvmArg>-Xms1g</jvmArg>
149-
<jvmArg>-XX:CompileThreshold=7000</jvmArg>
150-
</jvmArgs>
151-
<optimize>9</optimize>
152-
<compilerArgs>
153-
<compilerArg>-compileReport</compilerArg>
154-
<compilerArg>-XcompilerMetrics</compilerArg>
155-
</compilerArgs>
156-
<skipModule>true</skipModule>
157-
<classpathScope>compile+runtime</classpathScope>
158-
<failOnError>true</failOnError>
159-
<skipModule>true</skipModule>
140+
<excludes>
141+
<exclude>**/**.java</exclude>
142+
</excludes>
160143
</configuration>
161144
<executions>
162145
<execution>
146+
<phase>test</phase>
163147
<goals>
164-
<goal>compile</goal>
148+
<goal>test</goal>
165149
</goals>
166150
</execution>
167151
</executions>
168152
</plugin>
153+
169154
<plugin>
170-
<artifactId>maven-surefire-plugin</artifactId>
171-
<version>${surefire.version}</version>
155+
<!--
156+
The integration-test phase runs after regular test phase (but before verify/install).
157+
We use this to our advantage to peak at the compiled output from the GWTTestSuite
158+
-->
159+
<groupId>org.apache.maven.plugins</groupId>
160+
<artifactId>maven-failsafe-plugin</artifactId>
161+
<version>${maven.failsafe.plugin}</version>
162+
<configuration>
163+
<includes>
164+
<include>**/*.class</include>
165+
</includes>
166+
</configuration>
167+
</plugin>
168+
169+
<plugin>
170+
<!--
171+
The integration-test phase runs after regular test phase (but before verify/install).
172+
We use this to our advantage to peak at the compiled output from the GWTTestSuite
173+
-->
174+
<groupId>org.apache.maven.plugins</groupId>
175+
<artifactId>maven-failsafe-plugin</artifactId>
176+
<version>${maven.failsafe.plugin}</version>
172177
<configuration>
173178
<includes>
174-
<include>**/*Test.java</include>
179+
<include>**/*.class</include>
175180
</includes>
176-
<additionalClasspathElements>
177-
<additionalClasspathElement>${project.build.sourceDirectory}</additionalClasspathElement>
178-
<additionalClasspathElement>${project.build.testSourceDirectory}</additionalClasspathElement>
179-
</additionalClasspathElements>
180-
<useManifestOnlyJar>false</useManifestOnlyJar>
181-
<forkMode>always</forkMode>16
182-
<argLine>-Dorg.apache.commons.logging.Log=org.apache.commons.logging.impl.NoOpLog</argLine>
181+
</configuration>
182+
</plugin>
183+
184+
<plugin>
185+
<groupId>net.ltgt.gwt.maven</groupId>
186+
<artifactId>gwt-maven-plugin</artifactId>
187+
<version>${tbroyer.version}</version>
188+
<extensions>true</extensions>
189+
<configuration>
190+
<moduleName>gwt.material.design.GwtMaterialTable</moduleName>
191+
<style>OBFUSCATED</style>
192+
<logLevel>INFO</logLevel>
193+
<sourceLevel>1.8</sourceLevel>
194+
<jvmArgs>
195+
<jvmArg>-Xmx1g</jvmArg>
196+
<jvmArg>-Xms1g</jvmArg>
197+
<jvmArg>-XX:CompileThreshold=7000</jvmArg>
198+
</jvmArgs>
199+
<optimize>9</optimize>
200+
<compilerArgs>
201+
<compilerArg>-compileReport</compilerArg>
202+
<compilerArg>-XcompilerMetrics</compilerArg>
203+
</compilerArgs>
204+
<skipModule>true</skipModule>
205+
<classpathScope>compile+runtime</classpathScope>
206+
<failOnError>true</failOnError>
183207
</configuration>
184208
<executions>
185209
<execution>
210+
<id>compile</id>
211+
<goals>
212+
<goal>compile</goal>
213+
</goals>
214+
</execution>
215+
<execution>
216+
<id>default-test</id>
186217
<goals>
187218
<goal>test</goal>
188219
</goals>
220+
<configuration>
221+
<!--
222+
Because we expressly disable asserts in tests to avoid a compiler bug, we also must run surefire manually
223+
on the JRE tests
224+
-->
225+
<excludes>
226+
<exclude>**/ui/**.java</exclude>
227+
</excludes>
228+
<includes>
229+
<include>**/DataTableTestSuite.java</include>
230+
</includes>
231+
232+
<!-- disable JVM asserts, but enable JS asserts for tests -->
233+
<enableAssertions>false</enableAssertions>
234+
<testArgs>
235+
<testArg>-checkAssertions</testArg>
236+
</testArgs>
237+
</configuration>
189238
</execution>
190239
</executions>
191240
</plugin>

0 commit comments

Comments
 (0)