Merge pull request #181 from adessoAG/master

Release 3.2.0
adessoSE · May 5, 2019 · 915a86d · 915a86d
2 parents 611fc2b + c515672
commit 915a86d
Show file tree

Hide file tree

Showing 985 changed files with 5,282 additions and 23,224 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,54 +1,82 @@
 language: java
 install: true
-
 sudo: false
 addons:
   apt:
     packages:
-      - oracle-java8-installer
-
+    - oracle-java8-installer
 before_install:
-  - chmod +x gradlew
+- chmod +x ./showcase/gradlew
+- chmod +x gradlew
+- gcloud version || true
+- if [ ! -d "$HOME/google-cloud-sdk/bin" ]; then rm -rf $HOME/google-cloud-sdk; export CLOUDSDK_CORE_DISABLE_PROMPTS=1; curl https://sdk.cloud.google.com | bash > /dev/null; fi
+# Add gcloud to $PATH
+- source /home/travis/google-cloud-sdk/path.bash.inc
+- gcloud components install app-engine-java
+- gcloud config set project wicked-charts-showcase
 
 stages:
-  - name: build
-
-  # only publish snapshots from "master" branch and not in pull requests
-  - name: snapshot
-    if: branch = master AND type IN (push)
-
-  # only publish release from "release" branch and not in pull requests
-  - name: release
-    if: branch = release AND type IN (push)
-
+- name: build
+- name: snapshot
+  if: branch = master AND type IN (push)
+- name: release
+  if: branch = release AND type IN (push)
+- name: showcase-build
+- name: showcase-deploy
+  if: branch = release OR branch = master AND type IN (push)
 jobs:
   include:
+  - stage: build
+    script: "./gradlew build"
+  - stage: snapshot
+    script:
+    - "./gradlew chartjs-wrapper:artifactoryPublish -x test -Dsnapshot=true -Dbintray.user=$BINTRAY_USER
+      -Dbintray.key=$BINTRAY_KEY -Dbuild.number=$TRAVIS_BUILD_NUMBER"
+    - "./gradlew highcharts-wrapper:artifactoryPublish -x test -Dsnapshot=true -Dbintray.user=$BINTRAY_USER
+      -Dbintray.key=$BINTRAY_KEY -Dbuild.number=$TRAVIS_BUILD_NUMBER"
+    - "./gradlew jsf:wicked-charts-jsf21:artifactoryPublish -x test -Dsnapshot=true
+      -Dbintray.user=$BINTRAY_USER -Dbintray.key=$BINTRAY_KEY -Dbuild.number=$TRAVIS_BUILD_NUMBER"
+    - "./gradlew wicket:wicked-charts-wicket14:artifactoryPublish -x test -Dsnapshot=true
+      -Dbintray.user=$BINTRAY_USER -Dbintray.key=$BINTRAY_KEY -Dbuild.number=$TRAVIS_BUILD_NUMBER"
+    - "./gradlew wicket:wicked-charts-wicket15:artifactoryPublish -x test -Dsnapshot=true
+      -Dbintray.user=$BINTRAY_USER -Dbintray.key=$BINTRAY_KEY -Dbuild.number=$TRAVIS_BUILD_NUMBER"
+    - "./gradlew wicket:wicked-charts-wicket6:artifactoryPublish -x test -Dsnapshot=true
+      -Dbintray.user=$BINTRAY_USER -Dbintray.key=$BINTRAY_KEY -Dbuild.number=$TRAVIS_BUILD_NUMBER"
+    - "./gradlew wicket:wicked-charts-wicket7:artifactoryPublish -x test -Dsnapshot=true
+      -Dbintray.user=$BINTRAY_USER -Dbintray.key=$BINTRAY_KEY -Dbuild.number=$TRAVIS_BUILD_NUMBER"
+    - "./gradlew wicket:wicked-charts-wicket8:artifactoryPublish -x test -Dsnapshot=true
+      -Dbintray.user=$BINTRAY_USER -Dbintray.key=$BINTRAY_KEY -Dbuild.number=$TRAVIS_BUILD_NUMBER"
+  - stage: release
+    script:
+    - "./gradlew chartjs-wrapper:bintrayUpload -x test -Dbintray.user=$BINTRAY_USER
+      -Dbintray.key=$BINTRAY_KEY -Dbuild.number=$TRAVIS_BUILD_NUMBER"
+    - "./gradlew highcharts-wrapper:bintrayUpload -x test -Dbintray.user=$BINTRAY_USER
+      -Dbintray.key=$BINTRAY_KEY -Dbuild.number=$TRAVIS_BUILD_NUMBER"
+    - "./gradlew jsf:wicked-charts-jsf21:bintrayUpload -x test -Dbintray.user=$BINTRAY_USER
+      -Dbintray.key=$BINTRAY_KEY -Dbuild.number=$TRAVIS_BUILD_NUMBER"
+    - "./gradlew wicket:wicked-charts-wicket14:bintrayUpload -x test -Dbintray.user=$BINTRAY_USER
+      -Dbintray.key=$BINTRAY_KEY -Dbuild.number=$TRAVIS_BUILD_NUMBER"
+    - "./gradlew wicket:wicked-charts-wicket15:bintrayUpload -x test -Dbintray.user=$BINTRAY_USER
+      -Dbintray.key=$BINTRAY_KEY -Dbuild.number=$TRAVIS_BUILD_NUMBER"
+    - "./gradlew wicket:wicked-charts-wicket6:bintrayUpload -x test -Dbintray.user=$BINTRAY_USER
+      -Dbintray.key=$BINTRAY_KEY -Dbuild.number=$TRAVIS_BUILD_NUMBER"
+    - "./gradlew wicket:wicked-charts-wicket7:bintrayUpload -x test -Dbintray.user=$BINTRAY_USER
+      -Dbintray.key=$BINTRAY_KEY -Dbuild.number=$TRAVIS_BUILD_NUMBER"
+    - "./gradlew wicket:wicked-charts-wicket8:bintrayUpload -x test -Dbintray.user=$BINTRAY_USER
+      -Dbintray.key=$BINTRAY_KEY -Dbuild.number=$TRAVIS_BUILD_NUMBER"
+  - stage: showcase-build
+    install: skip
+    script:
+    - "./gradlew build publishToMavenLocal -Dsnapshot=true && cd showcase && ./gradlew build"
+  - stage: showcase-deploy
+    install: skip
+    script:
+    - "cd showcase &&
+    openssl aes-256-cbc -K $encrypted_05eb42a9daa3_key -iv $encrypted_05eb42a9daa3_iv -in Wicked-Charts-Showcase-887cff2298d0.json.enc -out Wicked-Charts-Showcase-887cff2298d0.json -d
+    && gcloud auth activate-service-account --key-file=Wicked-Charts-Showcase-887cff2298d0.json
+     &&./gradlew wicked-charts-showcase-wicket8:appengineDeploy
+     &&./gradlew wicked-charts-showcase-wicket7:appengineDeploy
+     &&./gradlew wicked-charts-showcase-wicket6:appengineDeploy
+     &&./gradlew wicked-charts-showcase-wicket15:appengineDeploy
+     &&./gradlew wicked-charts-showcase-wicket14:appengineDeploy"
 
-    # run gradle build
-    - stage: build
-      script: ./gradlew build
-
-    # publish snapshot to oss.jfrog.org
-    - stage: snapshot
-      script:
-      - ./gradlew chartjs-wrapper:artifactoryPublish -x test -Dsnapshot=true -Dbintray.user=$BINTRAY_USER -Dbintray.key=$BINTRAY_KEY -Dbuild.number=$TRAVIS_BUILD_NUMBER
-      - ./gradlew highcharts-wrapper:artifactoryPublish -x test -Dsnapshot=true -Dbintray.user=$BINTRAY_USER -Dbintray.key=$BINTRAY_KEY -Dbuild.number=$TRAVIS_BUILD_NUMBER
-      - ./gradlew jsf:wicked-charts-jsf21:artifactoryPublish -x test -Dsnapshot=true -Dbintray.user=$BINTRAY_USER -Dbintray.key=$BINTRAY_KEY -Dbuild.number=$TRAVIS_BUILD_NUMBER
-      - ./gradlew wicket:wicked-charts-wicket14:artifactoryPublish -x test -Dsnapshot=true -Dbintray.user=$BINTRAY_USER -Dbintray.key=$BINTRAY_KEY -Dbuild.number=$TRAVIS_BUILD_NUMBER
-      - ./gradlew wicket:wicked-charts-wicket15:artifactoryPublish -x test -Dsnapshot=true -Dbintray.user=$BINTRAY_USER -Dbintray.key=$BINTRAY_KEY -Dbuild.number=$TRAVIS_BUILD_NUMBER
-      - ./gradlew wicket:wicked-charts-wicket6:artifactoryPublish -x test -Dsnapshot=true -Dbintray.user=$BINTRAY_USER -Dbintray.key=$BINTRAY_KEY -Dbuild.number=$TRAVIS_BUILD_NUMBER
-      - ./gradlew wicket:wicked-charts-wicket7:artifactoryPublish -x test -Dsnapshot=true -Dbintray.user=$BINTRAY_USER -Dbintray.key=$BINTRAY_KEY -Dbuild.number=$TRAVIS_BUILD_NUMBER
-      - ./gradlew wicket:wicked-charts-wicket8:artifactoryPublish -x test -Dsnapshot=true -Dbintray.user=$BINTRAY_USER -Dbintray.key=$BINTRAY_KEY -Dbuild.number=$TRAVIS_BUILD_NUMBER
-
-
-    # release a new stable version to bintray
-    - stage: release
-      script:
-      - ./gradlew chartjs-wrapper:bintrayUpload -x test -Dbintray.user=$BINTRAY_USER -Dbintray.key=$BINTRAY_KEY -Dbuild.number=$TRAVIS_BUILD_NUMBER
-      - ./gradlew highcharts-wrapper:bintrayUpload -x test -Dbintray.user=$BINTRAY_USER -Dbintray.key=$BINTRAY_KEY -Dbuild.number=$TRAVIS_BUILD_NUMBER
-      - ./gradlew jsf:wicked-charts-jsf21:bintrayUpload -x test -Dbintray.user=$BINTRAY_USER -Dbintray.key=$BINTRAY_KEY -Dbuild.number=$TRAVIS_BUILD_NUMBER
-      - ./gradlew wicket:wicked-charts-wicket14:bintrayUpload -x test -Dbintray.user=$BINTRAY_USER -Dbintray.key=$BINTRAY_KEY -Dbuild.number=$TRAVIS_BUILD_NUMBER
-      - ./gradlew wicket:wicked-charts-wicket15:bintrayUpload -x test -Dbintray.user=$BINTRAY_USER -Dbintray.key=$BINTRAY_KEY -Dbuild.number=$TRAVIS_BUILD_NUMBER
-      - ./gradlew wicket:wicked-charts-wicket6:bintrayUpload -x test -Dbintray.user=$BINTRAY_USER -Dbintray.key=$BINTRAY_KEY -Dbuild.number=$TRAVIS_BUILD_NUMBER
-      - ./gradlew wicket:wicked-charts-wicket7:bintrayUpload -x test -Dbintray.user=$BINTRAY_USER -Dbintray.key=$BINTRAY_KEY -Dbuild.number=$TRAVIS_BUILD_NUMBER
-      - ./gradlew wicket:wicked-charts-wicket8:bintrayUpload -x test -Dbintray.user=$BINTRAY_USER -Dbintray.key=$BINTRAY_KEY -Dbuild.number=$TRAVIS_BUILD_NUMBER
diff --git a/NOTICE b/NOTICE
@@ -1,4 +1,4 @@
-  Copyright 2012-2018 Wicked Charts (http://github.com/adessoAG/wicked-charts)
+  Copyright 2012-2019 Wicked Charts (http://github.com/adessoAG/wicked-charts)
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.

diff --git a/README.md b/README.md
@@ -5,14 +5,14 @@ Beautiful and interactive JavaScript charts for Java-based web applications.
  * Check out the [Changelog](https://github.com/adessoAG/wicked-charts/wiki/Changelog)
  * Check out the [Feature Overview](https://github.com/adessoAG/wicked-charts/wiki/Feature-Overview) with coding examples
  * Browse the [Javadoc](http://adessoAG.github.io/wicked-charts/apidocs)
- * Download and run the [Showcase](https://github.com/adessoAG/wicked-charts/wiki/Developer-Info:-Starting-the-Showcase-Application) application for your web framework
+ * [Browse](https://wicked-charts-showcase.appspot.com/) or download and run the [Showcase](https://github.com/adessoAG/wicked-charts/wiki/Developer-Info:-Starting-the-Showcase-Application) application for your web framework
  * Check out the [FAQ](https://github.com/adessoAG/wicked-charts/wiki/FAQ)
 
 [![Build Status](https://travis-ci.org/adessoAG/wicked-charts.png?branch=master)](https://travis-ci.org/adessoAG/wicked-charts)
 
 What is Wicked Charts?
 ======================
-Wicked Charts is a Java wrapper of the [Chart.js](www.chartjs.org) and [Highcharts](www.highcharts.com) JavaScript libraries.
+Wicked Charts is a Java wrapper of the [Chart.js](https://www.chartjs.org/) and [Highcharts](https://www.highcharts.com/) JavaScript libraries.
 The Chart.js and Highcharts libraries provide eye-pleasing charts using HTML5 (see [Highcharts demo](http://www.highcharts.com/demo) and [Chart.js Samples](http://www.chartjs.org/samples/latest/)).
 With Wicked Charts, you can configure a chart in Java and display it in any web application based on Apache Wicket or JSF. Or you can use the Chart.js or Highcharts Java wrappers to integrate it in web applications built with other java web frameworks.
 
@@ -30,7 +30,7 @@ If your Java-based framework of choice is not supported by Wicked Charts, feel f
 
 Want to contribute?
 ===================
-Feel free to clone this repository and submit pull request. We'll see to get them merged into the main project.
+Feel free to clone this repository and submit pull requests. We'll see to get them merged into the main project.
 
 Adding Wicked-Charts as a dependency
 =================
@@ -45,7 +45,7 @@ repositories {
 }
 
 dependencies {
-  compile 'de.adesso.wicked-charts:wicked-charts-wicket8:3.1.0'
+  compile 'de.adesso.wicked-charts:wicked-charts-wicket8:3.2.0'
 }
 ```
 
@@ -54,7 +54,7 @@ Maven:
 <dependency>
   <groupId>de.adesso.wicked-charts</groupId>
   <artifactId>wicked-charts-wicket8</artifactId>
-  <version>3.1.0</version>
+  <version>3.2.0</version>
   <type>pom</type>
 </dependency>
 
@@ -69,7 +69,7 @@ repositories {
 }
 
 dependencies {
-  compile 'de.adesso.wicked-charts:wicked-charts-wicket7:3.1.0'
+  compile 'de.adesso.wicked-charts:wicked-charts-wicket7:3.2.0'
 }
 ```
 
@@ -78,7 +78,7 @@ Maven:
 <dependency>
   <groupId>de.adesso.wicked-charts</groupId>
   <artifactId>wicked-charts-wicket7</artifactId>
-  <version>3.1.0</version>
+  <version>3.2.0</version>
   <type>pom</type>
 </dependency>
 ```
@@ -92,7 +92,7 @@ repositories {
 }
 
 dependencies {
-  compile 'de.adesso.wicked-charts:wicked-charts-wicket6:3.1.0'
+  compile 'de.adesso.wicked-charts:wicked-charts-wicket6:3.2.0'
 }
 ```
 
@@ -101,7 +101,7 @@ Maven:
 <dependency>
   <groupId>de.adesso.wicked-charts</groupId>
   <artifactId>wicked-charts-wicket6</artifactId>
-  <version>3.1.0</version>
+  <version>3.2.0</version>
   <type>pom</type>
 </dependency>
 ```
@@ -115,7 +115,7 @@ repositories {
 }
 
 dependencies {
-  compile 'de.adesso.wicked-charts:wicked-charts-wicket15:3.1.0'
+  compile 'de.adesso.wicked-charts:wicked-charts-wicket15:3.2.0'
 }
 ```
 
@@ -124,7 +124,7 @@ Maven:
 <dependency>
   <groupId>de.adesso.wicked-charts</groupId>
   <artifactId>wicked-charts-wicket15</artifactId>
-  <version>3.1.0</version>
+  <version>3.2.0</version>
   <type>pom</type>
 </dependency>
 ```
@@ -138,7 +138,7 @@ repositories {
 }
 
 dependencies {
-  compile 'de.adesso.wicked-charts:wicked-charts-wicket14:3.1.0'
+  compile 'de.adesso.wicked-charts:wicked-charts-wicket14:3.2.0'
 }
 ```
 
@@ -147,7 +147,7 @@ Maven:
 <dependency>
   <groupId>de.adesso.wicked-charts</groupId>
   <artifactId>wicked-charts-wicket14</artifactId>
-  <version>3.1.0</version>
+  <version>3.2.0</version>
   <type>pom</type>
 </dependency>
 ```
@@ -161,7 +161,7 @@ repositories {
 }
 
 dependencies {
-  compile 'de.adesso.wicked-charts:wicked-charts-jsf21:3.1.0'
+  compile 'de.adesso.wicked-charts:wicked-charts-jsf21:3.2.0'
 }
 ```
 
@@ -170,7 +170,7 @@ Maven:
 <dependency>
   <groupId>de.adesso.wicked-charts</groupId>
   <artifactId>wicked-charts-jsf21</artifactId>
-  <version>3.1.0</version>
+  <version>3.2.0</version>
   <type>pom</type>
 </dependency>
 ```
@@ -186,8 +186,8 @@ repositories {
 }
 
 dependencies {
-  compile 'de.adesso.wicked-charts:chartjs-wrapper:3.1.0'
-  compile 'de.adesso.wicked-charts:highcharts-wrapper:3.1.0'
+  compile 'de.adesso.wicked-charts:chartjs-wrapper:3.2.0'
+  compile 'de.adesso.wicked-charts:highcharts-wrapper:3.2.0'
 }
 ```
 
@@ -197,15 +197,39 @@ Maven:
     <dependency>
       <groupId>de.adesso.wicked-charts</groupId>
       <artifactId>chartjs-wrapper</artifactId>
-      <version>3.1.0</version>
+      <version>3.2.0</version>
       <type>pom</type>
     </dependency>
 
     <dependency>
       <groupId>de.adesso.wicked-charts</groupId>
       <artifactId>highcharts-wrapper</artifactId>
-      <version>3.1.0</version>
+      <version>3.2.0</version>
       <type>pom</type>
     </dependency>
 </dependencies>
 ```
+
+Latest snapshot release
+-----------------------
+Gradle:
+```groovy
+repositories {
+    maven { url 'https://oss.jfrog.org/artifactory/oss-snapshot-local' }
+}
+
+dependencies {
+  compile 'de.adesso.wicked-charts:wicked-charts-wicket8:3.3.0-SNAPSHOT'
+}
+```
+
+Maven:
+```xml
+<dependency>
+  <groupId>de.adesso.wicked-charts</groupId>
+  <artifactId>wicked-charts-wicket8</artifactId>
+  <version>3.3.0-SNAPSHOT</version>
+  <type>pom</type>
+</dependency>
+```
+
diff --git a/build.gradle b/build.gradle
@@ -7,8 +7,8 @@ buildscript {
         }
     }
     dependencies {
-        classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.7.3'
-        classpath "org.jfrog.buildinfo:build-info-extractor-gradle:4.6.2"
+        classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.4'
+        classpath "org.jfrog.buildinfo:build-info-extractor-gradle:4.9.1"
     }
 }
 
@@ -25,17 +25,23 @@ subprojects {
         jcenter()
     }
 
+    dependencies{
+        testCompile group: 'org.junit.jupiter', name: 'junit-jupiter-api', version: junit_version
+        testRuntimeOnly group: 'org.junit.jupiter', name: 'junit-jupiter-engine', version: junit_version
+    }
+    test {
+        useJUnitPlatform()
+    }
+
     // run gradle with "-Dsnapshot=true" to automatically append "-SNAPSHOT" to the version
-    version = '3.1.0' + (Boolean.valueOf(System.getProperty("snapshot")) ? "-SNAPSHOT" : "")
-    sourceCompatibility = 1.8
+    version = '3.2.0' + (Boolean.valueOf(System.getProperty("snapshot")) ? "-SNAPSHOT" : "")
 
     ext {
         bintrayUser = System.getProperty("bintray.user")
         bintrayKey = System.getProperty("bintray.key")
         buildNumber = System.getProperty("build.number")
     }
-
-
+
     task sourcesJar(type: Jar, dependsOn: classes) {
         classifier = 'sources'
         from sourceSets.main.allSource

diff --git a/chartjs-wrapper/build.gradle b/chartjs-wrapper/build.gradle
@@ -1,6 +1,6 @@
 dependencies {
-	compile 'org.projectlombok:lombok:1.16.20'
-	testCompile 'junit:junit:4.12'
+	compileOnly 'org.projectlombok:lombok:1.18.6'
+	annotationProcessor 'org.projectlombok:lombok:1.18.6'
 	compile 'com.fasterxml.jackson.core:jackson-annotations:2.8.1'
 	compile 'com.fasterxml.jackson.core:jackson-core:2.8.1'
 	compile 'com.fasterxml.jackson.core:jackson-databind:2.8.1'

diff --git a/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/ChartConfiguration.java b/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/ChartConfiguration.java
@@ -6,14 +6,15 @@
 import de.adesso.wickedcharts.chartjs.chartoptions.Options;
 import lombok.experimental.Accessors;
 
+import java.io.Serializable;
 import java.util.List;
 
 /**
  * This class describes the complete configuration of a chart.
  */
 @Accessors(chain = true)
 @lombok.Data
-public class ChartConfiguration {
+public class ChartConfiguration implements Serializable {
 	private ChartType type;
 	private Data data;
 	private Options options;