Merge branch 'rc-3.1.0' of https://github.com/adessoAG/wicked-charts …

…into release
adessoSE · Jul 15, 2018 · 611fc2b · 611fc2b
2 parents e493ccd + 98a1043
commit 611fc2b
Show file tree

Hide file tree

Showing 849 changed files with 83,566 additions and 3,852 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -38,6 +38,8 @@ jobs:
       - ./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
@@ -49,3 +51,4 @@ jobs:
       - ./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/README.md b/README.md
@@ -8,17 +8,15 @@ Beautiful and interactive JavaScript charts for Java-based web applications.
  * 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/thombergs/wicked-charts.png?branch=master)](https://travis-ci.org/thombergs/wicked-charts)
+[![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.
 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.
+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.
 
-*Support for Chart.js is only available in Apache Wicket 7.x
-
-**Please note that while Wicked Charts is licensed under Apache 2.0 License, Highcharts itself is only free for non-commercial use. Chart.js, however, is licensed under the MIT license and is free to use.**
+*Please note that while Wicked Charts is licensed under Apache 2.0 License, Highcharts itself is only free for non-commercial use. Chart.js, however, is licensed under the MIT license and is free to use.*
 See here: [Highcharts shop](http://shop.highsoft.com/highcharts.html)
 And here: [Chart.js license](http://www.chartjs.org/docs/latest/notes/license.html)
 
@@ -34,80 +32,180 @@ Want to contribute?
 ===================
 Feel free to clone this repository and submit pull request. We'll see to get them merged into the main project.
 
-Gradle coordinates
+Adding Wicked-Charts as a dependency
 =================
-Depending on what web framework you use, add one of the following dependencies to your Gradle build:
+Depending on what web framework you use, add one of the following dependencies to your Gradle/Maven build:
+
+Wicket 8.x
+---------
+Gradle:
+```groovy
+repositories {
+    jcenter()
+}
+
+dependencies {
+  compile 'de.adesso.wicked-charts:wicked-charts-wicket8:3.1.0'
+}
+```
+
+Maven:
+```xml
+<dependency>
+  <groupId>de.adesso.wicked-charts</groupId>
+  <artifactId>wicked-charts-wicket8</artifactId>
+  <version>3.1.0</version>
+  <type>pom</type>
+</dependency>
+
+```
 
 Wicket 7.x
 ---------
-```html
+Gradle:
+```groovy
 repositories {
-  maven { url 'https://oss.jfrog.org/artifactory/oss-snapshot-local' }
+    jcenter()
 }
 
 dependencies {
-  compile 'de.adesso.wicked-charts:wicked-charts-wicket7:3.0.0'
+  compile 'de.adesso.wicked-charts:wicked-charts-wicket7:3.1.0'
 }
 ```
 
+Maven:
+```xml
+<dependency>
+  <groupId>de.adesso.wicked-charts</groupId>
+  <artifactId>wicked-charts-wicket7</artifactId>
+  <version>3.1.0</version>
+  <type>pom</type>
+</dependency>
+```
+
 Wicket 6.x
 ---------
-```html
+Gradle:
+```groovy
 repositories {
-  maven { url 'https://oss.jfrog.org/artifactory/oss-snapshot-local' }
+    jcenter()
 }
 
 dependencies {
-  compile 'de.adesso.wicked-charts:wicked-charts-wicket6:3.0.0'
+  compile 'de.adesso.wicked-charts:wicked-charts-wicket6:3.1.0'
 }
 ```
 
+Maven:
+```xml
+<dependency>
+  <groupId>de.adesso.wicked-charts</groupId>
+  <artifactId>wicked-charts-wicket6</artifactId>
+  <version>3.1.0</version>
+  <type>pom</type>
+</dependency>
+```
+
 Wicket 1.5.x
 ---------
-```html
+Gradle:
+```groovy
 repositories {
-  maven { url 'https://oss.jfrog.org/artifactory/oss-snapshot-local' }
+    jcenter()
 }
 
 dependencies {
-  compile 'de.adesso.wicked-charts:wicked-charts-wicket15:3.0.0'
+  compile 'de.adesso.wicked-charts:wicked-charts-wicket15:3.1.0'
 }
 ```
 
+Maven:
+```xml
+<dependency>
+  <groupId>de.adesso.wicked-charts</groupId>
+  <artifactId>wicked-charts-wicket15</artifactId>
+  <version>3.1.0</version>
+  <type>pom</type>
+</dependency>
+```
+
 Wicket 1.4.x
 ---------
-```html
+Gradle:
+```groovy
 repositories {
-  maven { url 'https://oss.jfrog.org/artifactory/oss-snapshot-local' }
+    jcenter()
 }
 
 dependencies {
-  compile 'de.adesso.wicked-charts:wicked-charts-wicket14:3.0.0'
+  compile 'de.adesso.wicked-charts:wicked-charts-wicket14:3.1.0'
 }
 ```
 
+Maven:
+```xml
+<dependency>
+  <groupId>de.adesso.wicked-charts</groupId>
+  <artifactId>wicked-charts-wicket14</artifactId>
+  <version>3.1.0</version>
+  <type>pom</type>
+</dependency>
+```
+
 JSF 2.1
 ---------
-```html
+Gradle:
+```groovy
 repositories {
-  maven { url 'https://oss.jfrog.org/artifactory/oss-snapshot-local' }
+    jcenter()
 }
 
 dependencies {
-  compile 'de.adesso.wicked-charts:wicked-charts-jsf21:3.0.0'
+  compile 'de.adesso.wicked-charts:wicked-charts-jsf21:3.1.0'
 }
 ```
 
+Maven:
+```xml
+<dependency>
+  <groupId>de.adesso.wicked-charts</groupId>
+  <artifactId>wicked-charts-jsf21</artifactId>
+  <version>3.1.0</version>
+  <type>pom</type>
+</dependency>
+```
+
 Java Wrappers
 ------------
 If you want to use the Java abstraction and JSON serializer of the Chart.js or Highcharts options (for example to add them to an application built with a different web framework than Wicket ot JSF), add the following dependencies:
-```html
+
+Gradle:
+```groovy
 repositories {
-  maven { url 'https://oss.jfrog.org/artifactory/oss-snapshot-local' }
+    jcenter()
 }
 
 dependencies {
-  compile 'de.adesso.wicked-charts:chartjs-wrapper:3.0.0'
-  compile 'de.adesso.wicked-charts:highcharts-wrapper:3.0.0'
+  compile 'de.adesso.wicked-charts:chartjs-wrapper:3.1.0'
+  compile 'de.adesso.wicked-charts:highcharts-wrapper:3.1.0'
 }
 ```
+
+Maven:
+```xml
+<dependencies>
+    <dependency>
+      <groupId>de.adesso.wicked-charts</groupId>
+      <artifactId>chartjs-wrapper</artifactId>
+      <version>3.1.0</version>
+      <type>pom</type>
+    </dependency>
+
+    <dependency>
+      <groupId>de.adesso.wicked-charts</groupId>
+      <artifactId>highcharts-wrapper</artifactId>
+      <version>3.1.0</version>
+      <type>pom</type>
+    </dependency>
+</dependencies>
+```
diff --git a/build.gradle b/build.gradle
@@ -26,7 +26,7 @@ subprojects {
     }
 
     // run gradle with "-Dsnapshot=true" to automatically append "-SNAPSHOT" to the version
-    version = '3.0.0' + (Boolean.valueOf(System.getProperty("snapshot")) ? "-SNAPSHOT" : "")
+    version = '3.1.0' + (Boolean.valueOf(System.getProperty("snapshot")) ? "-SNAPSHOT" : "")
     sourceCompatibility = 1.8
 
     ext {
@@ -73,29 +73,6 @@ subprojects {
         }
     }
 
-    publishing {
-        publications {
-            mavenPublication(MavenPublication) {
-                from components.java
-                artifact sourcesJar {
-                    classifier "sources"
-                }
-                artifact javadocJar {
-                    classifier "javadoc"
-                }
-                groupId 'de.adesso.wicked-charts'
-                artifactId project.name
-                version project.version
-                pom.withXml {
-                    def root = asNode()
-                    root.appendNode('description', 'Beautiful Charts for Java-based Web Applications')
-                    root.appendNode('name', project.name)
-                    root.appendNode('url', 'https://github.com/adessoag/wicked-charts')
-                    root.children().last() + pomConfig
-                }
-            }
-        }
-    }
 
     artifactory {
         contextUrl = 'http://oss.jfrog.org'
@@ -142,4 +119,28 @@ subprojects {
 
         publish = true
     }
+
+    publishing {
+        publications {
+            mavenPublication(MavenPublication) {
+                from components.java
+                artifact sourcesJar {
+                    classifier "sources"
+                }
+                artifact javadocJar {
+                    classifier "javadoc"
+                }
+                groupId 'de.adesso.wicked-charts'
+                artifactId project.name
+                version project.version
+                pom.withXml {
+                    def root = asNode()
+                    root.appendNode('description', 'Beautiful Charts for Java-based Web Applications')
+                    root.appendNode('name', project.name)
+                    root.appendNode('url', 'https://github.com/adessoag/wicked-charts')
+                    root.children().last() + pomConfig
+                }
+            }
+        }
+    }
 }
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
@@ -1,14 +1,13 @@
 package de.adesso.wickedcharts.chartjs;
 
-import java.util.List;
-
 import com.fasterxml.jackson.annotation.JsonIgnore;
-
 import de.adesso.wickedcharts.chartjs.chartoptions.ChartType;
 import de.adesso.wickedcharts.chartjs.chartoptions.Data;
 import de.adesso.wickedcharts.chartjs.chartoptions.Options;
 import lombok.experimental.Accessors;
 
+import java.util.List;
+
 /**
  * This class describes the complete configuration of a chart.
  */

diff --git a/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/AngleLines.java b/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/AngleLines.java
@@ -1,10 +1,10 @@
 package de.adesso.wickedcharts.chartjs.chartoptions;
 
-import java.io.Serializable;
-
 import de.adesso.wickedcharts.chartjs.chartoptions.colors.Color;
 import lombok.experimental.Accessors;
 
+import java.io.Serializable;
+
 /**
  * Defines the options for angled lines.
  *

diff --git a/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/Animation.java b/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/Animation.java
@@ -1,9 +1,9 @@
 package de.adesso.wickedcharts.chartjs.chartoptions;
 
-import java.io.Serializable;
-
 import lombok.experimental.Accessors;
 
+import java.io.Serializable;
+
 /**
  * Defines the animations.
  *

diff --git a/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/AxesScale.java b/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/AxesScale.java
@@ -1,9 +1,9 @@
 package de.adesso.wickedcharts.chartjs.chartoptions;
 
-import java.io.Serializable;
-
 import lombok.experimental.Accessors;
 
+import java.io.Serializable;
+
 /**
  * Defines options for the axes.
  *

diff --git a/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/Callback.java b/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/Callback.java
@@ -1,9 +1,9 @@
 package de.adesso.wickedcharts.chartjs.chartoptions;
 
-import java.io.Serializable;
-
 import lombok.experimental.Accessors;
 
+import java.io.Serializable;
+
 /**
  * Base-class for Callback functions.
  *

diff --git a/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/Data.java b/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/Data.java
@@ -1,15 +1,14 @@
 package de.adesso.wickedcharts.chartjs.chartoptions;
 
 
-import java.io.Serializable;
-import java.util.List;
-
 import com.fasterxml.jackson.annotation.JsonAutoDetect;
 import com.fasterxml.jackson.annotation.JsonProperty;
-
 import de.adesso.wickedcharts.chartjs.chartoptions.label.Label;
 import lombok.experimental.Accessors;
 
+import java.io.Serializable;
+import java.util.List;
+
 /**
  * Defines the different data objects.
  *