Skip to content

Commit 39c2094

Browse files
kevzlou7979kevzlou7979
authored
Merge pull request #5 from GwtMaterialDesign/release_2.3
Release 2.3
2 parents 95ac68c + 494eb72 commit 39c2094

File tree

5 files changed

+97
-7
lines changed

5 files changed

+97
-7
lines changed

‎.travis.yml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
sudo: false
2+
dist: trusty
23
language: java
34
jdk:
45
- oraclejdk8
@@ -7,12 +8,12 @@ cache:
78
- $HOME/.m2
89
before_install:
910
# install the gwt-material-jquery library
10-
- git clone -b release_2.2 https://github.com/GwtMaterialDesign/gwt-material-jquery.git
11+
- git clone -b release_2.3 https://github.com/GwtMaterialDesign/gwt-material-jquery.git
1112
- cd gwt-material-jquery
1213
- mvn install -DskipTests=true -DdryRun=true
1314
- cd ..
1415
# install the gwt-material library
15-
- git clone -b release_2.2 https://github.com/GwtMaterialDesign/gwt-material.git
16+
- git clone -b release_2.3 https://github.com/GwtMaterialDesign/gwt-material.git
1617
- cd gwt-material
1718
- mvn install -DskipTests=true -DdryRun=true
1819
- 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" == "master" ]; then
3+
if [ "$TRAVIS_JDK_VERSION" == "oraclejdk8" ] && [ "$TRAVIS_PULL_REQUEST" == "false" ] && [ "$TRAVIS_BRANCH" == "release_2.3" ]; 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 --settings ~/settings.xml
66
fi

‎README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,12 @@ AmCharts V4 Official Documentation can be found [here](https://www.amcharts.com/
1313

1414

1515
## Maven
16-
### Current Version 2.2
16+
### Current Version 2.3
1717
```xml
1818
<dependency>
1919
<groupId>com.github.gwtmaterialdesign</groupId>
2020
<artifactId>gwt-material-am4charts</artifactId>
21-
<version>2.2</version>
21+
<version>2.3</version>
2222
</dependency>
2323
```
2424

‎gwt-material-am4charts.iml‎

Lines changed: 89 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,89 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" version="4">
3+
<component name="FacetManager">
4+
<facet type="gwt" name="GWT">
5+
<configuration>
6+
<setting name="additionalCompilerParameters" value="-Xms1g -XX:CompileThreshold=7000" />
7+
<setting name="compilerParameters" value="-compileReport -XcompilerMetrics -failOnError -logLevel INFO -optimize 9 -sourceLevel 1.8" />
8+
<setting name="compilerMaxHeapSize" value="1024" />
9+
<setting name="gwtSdkUrl" value="file://$MAVEN_REPOSITORY$/com/google/gwt/gwt-dev/2.8.2/" />
10+
<setting name="gwtSdkType" value="maven" />
11+
<packaging>
12+
<module name="gwt.material.design.amcharts.GwtMaterialAmChartsBase" enabled="false" />
13+
<module name="gwt.material.design.amcore.GwtMaterialAmCore" enabled="false" />
14+
<module name="gwt.material.design.ammaps.GwtMaterialAmMaps" enabled="false" />
15+
<module name="gwt.material.design.ammaps.GwtMaterialAmMapsBase" enabled="false" />
16+
</packaging>
17+
</configuration>
18+
</facet>
19+
</component>
20+
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
21+
<output url="file://$MODULE_DIR$/target/classes" />
22+
<output-test url="file://$MODULE_DIR$/target/test-classes" />
23+
<content url="file://$MODULE_DIR$">
24+
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
25+
<sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
26+
<excludeFolder url="file://$MODULE_DIR$/target" />
27+
</content>
28+
<orderEntry type="inheritedJdk" />
29+
<orderEntry type="sourceFolder" forTests="false" />
30+
<orderEntry type="library" name="Maven: com.google.gwt:gwt-user:2.8.2" level="project" />
31+
<orderEntry type="library" name="Maven: com.google.jsinterop:jsinterop-annotations:1.0.2" level="project" />
32+
<orderEntry type="library" name="Maven: com.google.jsinterop:jsinterop-annotations:sources:1.0.2" level="project" />
33+
<orderEntry type="library" name="Maven: javax.validation:validation-api:1.0.0.GA" level="project" />
34+
<orderEntry type="library" name="Maven: javax.validation:validation-api:sources:1.0.0.GA" level="project" />
35+
<orderEntry type="library" name="Maven: javax.servlet:javax.servlet-api:3.1.0" level="project" />
36+
<orderEntry type="library" name="Maven: org.w3c.css:sac:1.3" level="project" />
37+
<orderEntry type="library" name="Maven: com.google.gwt:gwt-dev:2.8.2" level="project" />
38+
<orderEntry type="library" name="Maven: com.google.code.findbugs:jsr305:1.3.9" level="project" />
39+
<orderEntry type="library" name="Maven: com.google.code.gson:gson:2.6.2" level="project" />
40+
<orderEntry type="library" name="Maven: org.ow2.asm:asm:5.0.3" level="project" />
41+
<orderEntry type="library" name="Maven: org.ow2.asm:asm-util:5.0.3" level="project" />
42+
<orderEntry type="library" name="Maven: org.ow2.asm:asm-tree:5.0.3" level="project" />
43+
<orderEntry type="library" name="Maven: org.ow2.asm:asm-commons:5.0.3" level="project" />
44+
<orderEntry type="library" name="Maven: colt:colt:1.2.0" level="project" />
45+
<orderEntry type="library" name="Maven: ant:ant:1.6.5" level="project" />
46+
<orderEntry type="library" name="Maven: commons-collections:commons-collections:3.2.2" level="project" />
47+
<orderEntry type="library" name="Maven: commons-io:commons-io:2.4" level="project" />
48+
<orderEntry type="library" name="Maven: com.ibm.icu:icu4j:50.1.1" level="project" />
49+
<orderEntry type="library" name="Maven: tapestry:tapestry:4.0.2" level="project" />
50+
<orderEntry type="library" name="Maven: net.sourceforge.htmlunit:htmlunit:2.19" level="project" />
51+
<orderEntry type="library" name="Maven: xalan:xalan:2.7.2" level="project" />
52+
<orderEntry type="library" name="Maven: xalan:serializer:2.7.2" level="project" />
53+
<orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.4" level="project" />
54+
<orderEntry type="library" name="Maven: org.apache.httpcomponents:httpclient:4.5.1" level="project" />
55+
<orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore:4.4.3" level="project" />
56+
<orderEntry type="library" name="Maven: org.apache.httpcomponents:httpmime:4.5.1" level="project" />
57+
<orderEntry type="library" name="Maven: commons-codec:commons-codec:1.10" level="project" />
58+
<orderEntry type="library" name="Maven: net.sourceforge.htmlunit:htmlunit-core-js:2.17" level="project" />
59+
<orderEntry type="library" name="Maven: xerces:xercesImpl:2.11.0" level="project" />
60+
<orderEntry type="library" name="Maven: xml-apis:xml-apis:1.4.01" level="project" />
61+
<orderEntry type="library" name="Maven: net.sourceforge.nekohtml:nekohtml:1.9.22" level="project" />
62+
<orderEntry type="library" name="Maven: net.sourceforge.cssparser:cssparser:0.9.18" level="project" />
63+
<orderEntry type="library" name="Maven: commons-logging:commons-logging:1.2" level="project" />
64+
<orderEntry type="library" name="Maven: org.eclipse.jetty.websocket:websocket-client:9.2.13.v20150730" level="project" />
65+
<orderEntry type="library" name="Maven: org.eclipse.jetty.websocket:websocket-common:9.2.14.v20151106" level="project" />
66+
<orderEntry type="library" name="Maven: org.eclipse.jetty.websocket:websocket-api:9.2.14.v20151106" level="project" />
67+
<orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-webapp:9.2.14.v20151106" level="project" />
68+
<orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-xml:9.2.14.v20151106" level="project" />
69+
<orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-servlet:9.2.14.v20151106" level="project" />
70+
<orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-security:9.2.14.v20151106" level="project" />
71+
<orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-servlets:9.2.14.v20151106" level="project" />
72+
<orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-continuation:9.2.14.v20151106" level="project" />
73+
<orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-http:9.2.14.v20151106" level="project" />
74+
<orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-util:9.2.14.v20151106" level="project" />
75+
<orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-io:9.2.14.v20151106" level="project" />
76+
<orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-annotations:9.2.14.v20151106" level="project" />
77+
<orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-plus:9.2.14.v20151106" level="project" />
78+
<orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-jndi:9.2.14.v20151106" level="project" />
79+
<orderEntry type="library" name="Maven: javax.annotation:javax.annotation-api:1.2" level="project" />
80+
<orderEntry type="library" name="Maven: org.eclipse.jetty:apache-jsp:9.2.14.v20151106" level="project" />
81+
<orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-server:9.2.14.v20151106" level="project" />
82+
<orderEntry type="library" name="Maven: org.eclipse.jetty.toolchain:jetty-schemas:3.1.M0" level="project" />
83+
<orderEntry type="library" name="Maven: org.mortbay.jasper:apache-jsp:8.0.9.M3" level="project" />
84+
<orderEntry type="library" name="Maven: org.mortbay.jasper:apache-el:8.0.9.M3" level="project" />
85+
<orderEntry type="library" name="Maven: com.github.gwtmaterialdesign:gwt-material-jquery:2.3" level="project" />
86+
<orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.11" level="project" />
87+
<orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" />
88+
</component>
89+
</module>

‎pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
<groupId>com.github.gwtmaterialdesign</groupId>
99
<artifactId>gwt-material-am4charts</artifactId>
10-
<version>2.2</version>
10+
<version>2.3</version>
1111
<packaging>gwt-lib</packaging>
1212

1313
<name>Gwt Material AmCharts V4</name>
@@ -38,7 +38,7 @@
3838
<connection>scm:git:[email protected]:GwtMaterialDesign/gwt-material.git</connection>
3939
<developerConnection>scm:git:[email protected]:GwtMaterialDesign/gwt-material.git</developerConnection>
4040
<url>http://github.com/GwtMaterialDesign/gwt-material</url>
41-
<tag>v2.2</tag>
41+
<tag>v2.3</tag>
4242
</scm>
4343

4444
<licenses>

0 commit comments

Comments
 (0)