Skip to content

Commit

Permalink
Merge pull request #17 from GwtMaterialDesign/release_2.4.2
Browse files Browse the repository at this point in the history
Preparation for 2.4.2 release (Fixed for XSS Vulnerability)
  • Loading branch information
kevzlou7979 authored Dec 28, 2020
2 parents f4b3832 + f326a63 commit f3fc4dc
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 8 deletions.
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,12 @@ cache:
- $HOME/.m2
before_install:
# install the gwt-material-jquery library
- git clone -b release_2.4.1 https://github.com/GwtMaterialDesign/gwt-material-jquery.git
- git clone -b release_2.4.2 https://github.com/GwtMaterialDesign/gwt-material-jquery.git
- cd gwt-material-jquery
- mvn install -DskipTests=true -DdryRun=true
- cd ..
# install the gwt-material library
- git clone -b release_2.4.1 https://github.com/GwtMaterialDesign/gwt-material.git
- git clone -b release_2.4.2 https://github.com/GwtMaterialDesign/gwt-material.git
- cd gwt-material
- mvn install -DskipTests=true -DdryRun=true
- cd ..
Expand Down
2 changes: 1 addition & 1 deletion .utility/deploy.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/bash
set -ev
if [ "$TRAVIS_JDK_VERSION" == "oraclejdk8" ] && [ "$TRAVIS_PULL_REQUEST" == "false" ] && [ "$TRAVIS_BRANCH" == "release_2.4.1" ]; then
if [ "$TRAVIS_JDK_VERSION" == "oraclejdk8" ] && [ "$TRAVIS_PULL_REQUEST" == "false" ] && [ "$TRAVIS_BRANCH" == "release_2.4.2" ]; then
echo "<settings><servers><server><id>ossrh</id><username>\${env.OSSRH_USER}</username><password>\${env.OSSRH_PASS}</password></server></servers></settings>" > ~/settings.xml
mvn deploy --settings ~/settings.xml
fi
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,12 @@ AmCharts V4 Official Documentation can be found [here](https://www.amcharts.com/


## Maven
### Current Version 2.4.1
### Current Version 2.4.2
```xml
<dependency>
<groupId>com.github.gwtmaterialdesign</groupId>
<artifactId>gwt-material-am4charts</artifactId>
<version>2.4.1</version>
<version>2.4.2</version>
</dependency>
```

Expand Down
6 changes: 3 additions & 3 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

<groupId>com.github.gwtmaterialdesign</groupId>
<artifactId>gwt-material-am4charts</artifactId>
<version>2.4.1</version>
<version>2.4.2</version>
<packaging>gwt-lib</packaging>

<name>Gwt Material AmCharts V4</name>
Expand Down Expand Up @@ -38,7 +38,7 @@
<connection>scm:git:git@github.com:GwtMaterialDesign/gwt-material.git</connection>
<developerConnection>scm:git:git@github.com:GwtMaterialDesign/gwt-material.git</developerConnection>
<url>http://github.com/GwtMaterialDesign/gwt-material</url>
<tag>v2.4.1</tag>
<tag>v2.4.2</tag>
</scm>

<licenses>
Expand Down Expand Up @@ -124,7 +124,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.11</version>
<version>4.13.1</version>
<!-- this can be overridden -->
<scope>test</scope>
</dependency>
Expand Down

0 comments on commit f3fc4dc

Please sign in to comment.