diff --git a/.travis.yml b/.travis.yml
index a93a6d59..1686522b 100644
--- 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
index a439dc6a..29100dec 100644
--- a/README.md
+++ b/README.md
@@ -45,7 +45,7 @@ repositories {
}
dependencies {
- compile 'de.adesso.wicked-charts:wicked-charts-wicket8:3.0.0'
+ compile 'de.adesso.wicked-charts:wicked-charts-wicket8:3.1.0'
}
```
@@ -54,7 +54,7 @@ Maven:
de.adesso.wicked-charts
wicked-charts-wicket8
- 3.0.0
+ 3.1.0
pom
@@ -69,7 +69,7 @@ repositories {
}
dependencies {
- compile 'de.adesso.wicked-charts:wicked-charts-wicket7:3.0.0'
+ compile 'de.adesso.wicked-charts:wicked-charts-wicket7:3.1.0'
}
```
@@ -78,7 +78,7 @@ Maven:
de.adesso.wicked-charts
wicked-charts-wicket7
- 3.0.0
+ 3.1.0
pom
```
@@ -92,7 +92,7 @@ repositories {
}
dependencies {
- compile 'de.adesso.wicked-charts:wicked-charts-wicket6:3.0.0'
+ compile 'de.adesso.wicked-charts:wicked-charts-wicket6:3.1.0'
}
```
@@ -101,7 +101,7 @@ Maven:
de.adesso.wicked-charts
wicked-charts-wicket6
- 3.0.0
+ 3.1.0
pom
```
@@ -115,7 +115,7 @@ repositories {
}
dependencies {
- compile 'de.adesso.wicked-charts:wicked-charts-wicket15:3.0.0'
+ compile 'de.adesso.wicked-charts:wicked-charts-wicket15:3.1.0'
}
```
@@ -124,7 +124,7 @@ Maven:
de.adesso.wicked-charts
wicked-charts-wicket15
- 3.0.0
+ 3.1.0
pom
```
@@ -138,7 +138,7 @@ repositories {
}
dependencies {
- compile 'de.adesso.wicked-charts:wicked-charts-wicket14:3.0.0'
+ compile 'de.adesso.wicked-charts:wicked-charts-wicket14:3.1.0'
}
```
@@ -147,7 +147,7 @@ Maven:
de.adesso.wicked-charts
wicked-charts-wicket14
- 3.0.0
+ 3.1.0
pom
```
@@ -161,7 +161,7 @@ repositories {
}
dependencies {
- compile 'de.adesso.wicked-charts:wicked-charts-jsf21:3.0.0'
+ compile 'de.adesso.wicked-charts:wicked-charts-jsf21:3.1.0'
}
```
@@ -170,7 +170,7 @@ Maven:
de.adesso.wicked-charts
wicked-charts-jsf21
- 3.0.0
+ 3.1.0
pom
```
@@ -186,8 +186,8 @@ repositories {
}
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'
}
```
@@ -197,14 +197,14 @@ Maven:
de.adesso.wicked-charts
chartjs-wrapper
- 3.0.0
+ 3.1.0
pom
de.adesso.wicked-charts
highcharts-wrapper
- 3.0.0
+ 3.1.0
pom
diff --git a/build.gradle b/build.gradle
index eebde4ca..76394e70 100644
--- a/build.gradle
+++ b/build.gradle
@@ -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
+ }
+ }
+ }
+ }
}
\ No newline at end of file
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 9ec837b2..8941bfbb 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.8-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.5.1-all.zip
diff --git a/showcase/build.gradle b/showcase/build.gradle
index 38c5388d..6c57891c 100644
--- a/showcase/build.gradle
+++ b/showcase/build.gradle
@@ -35,7 +35,7 @@ dependencies {
}
// 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 {
@@ -98,7 +98,7 @@ publishing {
}
groupId 'de.adesso.wicked-charts'
artifactId 'wicked-charts-showcase-options'
- version '3.0.0'
+ version '3.1.0'
pom.withXml {
def root = asNode()
root.appendNode('description', 'Beautiful Charts for Java-based Web Applications')
diff --git a/showcase/gradle/wrapper/gradle-wrapper.properties b/showcase/gradle/wrapper/gradle-wrapper.properties
index 238101c8..a18a9e65 100644
--- a/showcase/gradle/wrapper/gradle-wrapper.properties
+++ b/showcase/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.8-all.zip
\ No newline at end of file
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.5.1-all.zip
\ No newline at end of file
diff --git a/showcase/wicked-charts-showcase-jsf21/build.gradle b/showcase/wicked-charts-showcase-jsf21/build.gradle
index c0d23a5c..5ab3368f 100644
--- a/showcase/wicked-charts-showcase-jsf21/build.gradle
+++ b/showcase/wicked-charts-showcase-jsf21/build.gradle
@@ -1,5 +1,5 @@
dependencies {
- compile 'de.adesso.wicked-charts:wicked-charts-jsf21:3.0.0'
+ compile group: 'de.adesso.wicked-charts', name: 'wicked-charts-wicket6', version: "${wicketcharts_version}"
compile project(':wicked-charts-showcase-options')
compile 'org.slf4j:slf4j-log4j12:1.6.2'
compile 'log4j:log4j:1.2.17'
diff --git a/showcase/wicked-charts-showcase-options/build.gradle b/showcase/wicked-charts-showcase-options/build.gradle
index 23d9cc1c..45351ca2 100644
--- a/showcase/wicked-charts-showcase-options/build.gradle
+++ b/showcase/wicked-charts-showcase-options/build.gradle
@@ -1,5 +1,5 @@
dependencies {
- compile 'de.adesso.wicked-charts:highcharts-wrapper:3.0.0'
+ compile group: 'de.adesso.wicked-charts', name: 'highcharts-wrapper', version: "${wicketcharts_version}"
testCompile 'junit:junit:4.12'
compile 'junit:junit:4.12'
}
\ No newline at end of file