diff --git a/.gitignore b/.gitignore index 2073d302..7b455f9f 100644 --- a/.gitignore +++ b/.gitignore @@ -37,12 +37,15 @@ hs_err_pid* .idea/gradle.xml .idea/workspace.xml .idea/jsLibraryMappings.xml +.idea/usage.statistics.xml .idea/tasks.xml .idea/sonarlint/ .idea/dataSources.* .idea/dataSources/ .idea/dictionaries/* .idea/shelf/ +.idea/modules.xml +*.iml # Visual Studio Code # /bin/ diff --git a/.idea/compiler.xml b/.idea/compiler.xml index 6fd3dc7d..43a96d79 100644 --- a/.idea/compiler.xml +++ b/.idea/compiler.xml @@ -2,6 +2,8 @@ + + diff --git a/.idea/misc.xml b/.idea/misc.xml index 6d140a36..49f04b76 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,9 +1,7 @@ - - - - - + + + \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml index 5b4a7605..c8fcfe6e 100644 --- a/.idea/modules.xml +++ b/.idea/modules.xml @@ -2,7 +2,6 @@ - diff --git a/.idea/modules/delivery-sdk-android/delivery-sdk-android.iml b/.idea/modules/delivery-sdk-android/delivery-sdk-android.iml deleted file mode 100644 index e1c4ddb5..00000000 --- a/.idea/modules/delivery-sdk-android/delivery-sdk-android.iml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/modules/delivery-sdk-android/delivery-sdk-android_main.iml b/.idea/modules/delivery-sdk-android/delivery-sdk-android_main.iml deleted file mode 100644 index 659c74b3..00000000 --- a/.idea/modules/delivery-sdk-android/delivery-sdk-android_main.iml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/modules/delivery-sdk-android/delivery-sdk-android_test.iml b/.idea/modules/delivery-sdk-android/delivery-sdk-android_test.iml deleted file mode 100644 index 25d8fb8b..00000000 --- a/.idea/modules/delivery-sdk-android/delivery-sdk-android_test.iml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/modules/delivery-sdk-java.iml b/.idea/modules/delivery-sdk-java.iml deleted file mode 100644 index cef794eb..00000000 --- a/.idea/modules/delivery-sdk-java.iml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/modules/delivery-sdk-java_main.iml b/.idea/modules/delivery-sdk-java_main.iml index 13305d57..51a1b8b3 100644 --- a/.idea/modules/delivery-sdk-java_main.iml +++ b/.idea/modules/delivery-sdk-java_main.iml @@ -1,30 +1,6 @@ - - - - - - - - - + + - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/modules/delivery-sdk-java_test.iml b/.idea/modules/delivery-sdk-java_test.iml index 140f4d00..51a1b8b3 100644 --- a/.idea/modules/delivery-sdk-java_test.iml +++ b/.idea/modules/delivery-sdk-java_test.iml @@ -1,37 +1,6 @@ - - - - - - - - - + + - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/sonarlint.xml b/.idea/sonarlint.xml deleted file mode 100644 index 68d69344..00000000 --- a/.idea/sonarlint.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - \ No newline at end of file diff --git a/.idea/uiDesigner.xml b/.idea/uiDesigner.xml deleted file mode 100644 index e96534fb..00000000 --- a/.idea/uiDesigner.xml +++ /dev/null @@ -1,124 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.travis.yml b/.travis.yml index 7b071f84..ea675b60 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,7 +16,6 @@ addons: script: - ".travis/build.sh" - - ".travis/upload_nexus.sh" before_cache: # remove all the artifacts (JAR, ZIP) that are installed in local repo because of gradle deploy diff --git a/.travis/build.sh b/.travis/build.sh index 36f810e7..bb84125d 100755 --- a/.travis/build.sh +++ b/.travis/build.sh @@ -1,11 +1,31 @@ #!/bin/bash -./gradlew build +set -e # Exit with nonzero exit code if anything fails -# Pull requests shouldn't try to run sonarqube as travis doesn't configure it correctly when doing a PR from another remote if [ "$TRAVIS_PULL_REQUEST" != "false" ]; then - echo "Skipping sonarqube; just doing a build." - exit 0 -fi + ./gradlew build +else + ./gradlew build \ + -Penable.signing=true \ + -Psigning.keyId=D1115C87 \ + -Psigning.password=$signingPassword \ + -Psigning.secretKeyRingFile="$HOME/signing.gpg" \ + -PnexusUsername=$sonatypeUsername \ + -PnexusPassword=$sonatypePassword + + ./gradlew sonarqube \ + -Penable.signing=true \ + -Psigning.keyId=D1115C87 \ + -Psigning.password=$signingPassword \ + -Psigning.secretKeyRingFile="$HOME/signing.gpg" \ + -PnexusUsername=$sonatypeUsername \ + -PnexusPassword=$sonatypePassword -./gradlew sonarqube + ./gradlew publish \ + -Penable.signing=true \ + -Psigning.keyId=D1115C87 \ + -Psigning.password=$signingPassword \ + -Psigning.secretKeyRingFile="$HOME/signing.gpg" \ + -PnexusUsername=$sonatypeUsername \ + -PnexusPassword=$sonatypePassword +fi diff --git a/.travis/deploy_ghpages.sh b/.travis/deploy_ghpages.sh index e6ae3c58..5abe67e3 100755 --- a/.travis/deploy_ghpages.sh +++ b/.travis/deploy_ghpages.sh @@ -8,7 +8,7 @@ TARGET_BRANCH="gh-pages" # Pull requests and commits to other branches shouldn't try to deploy, just build to verify if [ "$TRAVIS_PULL_REQUEST" != "false" -o "$TRAVIS_BRANCH" != "$SOURCE_BRANCH" ]; then - echo "Skipping deploy; just doing a build." + echo "Skipping deploy; exiting." exit 0 fi @@ -18,7 +18,7 @@ SSH_REPO=${REPO/https:\/\/github.com\//git@github.com:} SHA=`git rev-parse --verify HEAD` # Clone the existing gh-pages for this repo into out/ -# Create a new empty branch if gh-pages doesn't exist yet (should only happen on first deply) +# Create a new empty branch if gh-pages doesn't exist yet (should only happen on first deploy) git clone $REPO out cd out git checkout $TARGET_BRANCH || git checkout --orphan $TARGET_BRANCH diff --git a/.travis/promote_release_nexus.sh b/.travis/promote_release_nexus.sh deleted file mode 100755 index 8dd8b18b..00000000 --- a/.travis/promote_release_nexus.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash -if [ "${RELEASE}" = "true" ]; then -./gradlew closeAndReleaseRepository -PnexusUsername=$sonatypeUsername -PnexusPassword=$sonatypePassword -fi diff --git a/.travis/upload_nexus.sh b/.travis/upload_nexus.sh deleted file mode 100755 index 16f070a2..00000000 --- a/.travis/upload_nexus.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/bash - -# Pull requests shouldn't try to deploy -if [ "$TRAVIS_PULL_REQUEST" != "false" ]; then - echo "Skipping nexus upload; just doing a build." - exit 0 -fi - -./gradlew uploadArchives -Psigning.password=$signingPassword -PnexusUsername=$sonatypeUsername -PnexusPassword=$sonatypePassword diff --git a/LICENSE b/LICENSE index 543f85c5..3ddd6cb6 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ MIT License -Copyright © 2017 +Copyright © 2018 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/README.md b/README.md index 20b6fdee..75a0c8d8 100644 --- a/README.md +++ b/README.md @@ -2,9 +2,9 @@ [![Build Status](https://travis-ci.org/Kentico/delivery-sdk-java.svg?branch=master)](https://travis-ci.org/Kentico/delivery-sdk-java) [![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](https://opensource.org/licenses/MIT) -[![Javadocs](http://javadoc.io/badge/com.kenticocloud/delivery-sdk-java.svg)](http://javadoc.io/doc/com.kenticocloud/delivery-sdk-java) +[![Javadocs](http://javadoc.io/badge/com.kenticocloud/delivery.svg)](http://javadoc.io/doc/com.kenticocloud/delivery) [![SonarQube](http://img.shields.io/badge/SonarQube-Results-blue.svg)](https://sonarcloud.io/dashboard?id=com.kenticocloud%3Adelivery-sdk-java) -[![MavenCentral](http://img.shields.io/badge/Maven_Central-1.0.6-yellow.svg)](https://oss.sonatype.org/content/groups/public/com/kenticocloud/delivery-sdk-java/) +[![MavenCentral](http://img.shields.io/badge/Maven_Central-2.0.0-yellow.svg)](https://oss.sonatype.org/content/groups/public/com/kenticocloud/delivery/) [![Forums](https://img.shields.io/badge/chat-on%20forums-orange.svg)](https://forums.kenticocloud.com) [![Analytics](https://ga-beacon.appspot.com/UA-69014260-4/Kentico/delivery-sdk-java?pixel)](https://github.com/igrigorik/ga-beacon) @@ -17,11 +17,11 @@ You can add this to your Gradle project by the following: ```groovy repositories { - mavenCentral() + mavenCentral() } dependencies { - compile('com.kenticocloud:delivery-sdk-java:1.0.6') + compile('com.kenticocloud:delivery:2.0.0') } ``` @@ -29,8 +29,8 @@ Or via your Maven POM: ```xml com.kenticocloud - delivery-sdk-java - 1.0.6 + delivery + 2.0.0 ``` @@ -48,6 +48,7 @@ DeliveryClient client = new DeliveryClient("975bf280-fd91-488c-994c-2f04416e5ee3 You can also provide the project ID and other parameters by passing the [`DeliveryOptions`](https://github.com/Kentico/delivery-sdk-java/blob/master/src/main/java/com/kenticocloud/delivery/DeliveryOptions.java) object to the class constructor. The `DeliveryOptions` object can be used to set the following parameters: * `setPreviewApiKey(String)` – sets the Delivery Preview API key. +* `setProductionApiKey(String)` - sets the Delivery Client key for secured access. * `setProjectId(String)` – sets the project identifier. * `setUsePreviewApi(boolean)` – determines whether to use the Delivery Preview API. * `setWaitForLoadingNewContent(boolean)` – makes the client instance wait while fetching updated content, useful when acting upon [webhook calls](https://developer.kenticocloud.com/docs/webhooks#section-requesting-new-content). @@ -197,85 +198,6 @@ for (Option option : element.getOptions()) { articleItem.getModularContent("related_articles") ``` -## Android -Basic Android support is available, however it is still very much in the beta phase. - -The SDK is built on top of Java 8 APIs which means currently there are a lot of limitations on environments this is working in. - -### Android Project setup -Android support is tested to work with Android Studio 3, the latest preview can be found at . - -The minimum SDK version that currently works is 26, which may be extremely limiting to which devices you can deploy to. To update your project, update your app's gradle file: -```groovy -android { - compileSdkVersion 26 - buildToolsVersion "26.0.2" - defaultConfig { - ... - minSdkVersion 26 - targetSdkVersion 26 - ... - } - ... - compileOptions { - sourceCompatibility JavaVersion.VERSION_1_8 - targetCompatibility JavaVersion.VERSION_1_8 - } -} - -dependencies { - ... - implementation 'com.kenticocloud:delivery-sdk-android:1.0.6' -} - -``` - -An example of interacting with the SDK is here: -```java -package yourapppackage.yourapp; - -import android.os.StrictMode; -import android.support.v7.app.AppCompatActivity; -import android.os.Bundle; -import android.widget.TextView; - -import com.kenticocloud.delivery.ContentItemResponse; -import com.kenticocloud.delivery.DeliveryClient; -import com.kenticocloud.delivery.DeliveryParameterBuilder; -import com.kenticocloud.delivery.TextElement; - -import java.io.IOException; -import java.util.List; - -import shadow.kentico.http.NameValuePair; - -public class MainActivity extends AppCompatActivity { - - @Override - protected void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - setContentView(R.layout.activity_main); - - //This is bad, but the point is just to prove this out. To fix the DeliveryClient should - //be in a separate thread. - StrictMode.ThreadPolicy policy = new StrictMode.ThreadPolicy.Builder().permitAll().build(); - StrictMode.setThreadPolicy(policy); - - DeliveryClient client = new DeliveryClient("975bf280-fd91-488c-994c-2f04416e5ee3"); - List params = DeliveryParameterBuilder.params().projection("title", "summary", "post_date", "teaser_image", "related_articles").build(); - - try { - ContentItemResponse item = client.getItem("on_roasts", params); - String title = ((TextElement) item.getItem().getElements().get("title")).getValue(); - final TextView textViewToChange = (TextView) findViewById(R.id.textoutput); - textViewToChange.setText(title); - } catch (IOException e) { - e.printStackTrace(); - } - } -} -``` - ## Further information For more developer resources, visit the Kentico Cloud Developer Hub at . @@ -293,7 +215,7 @@ Ensure your `JAVA_HOME` environment is set. Then build the project via the prov ``` Optional: -[JetBrains IntelliJ Idea](https://www.jetbrains.com/idea/) project files are included. Open up the project and Import the Gradle project to sync up dependencies. +[JetBrains IntelliJ Idea](https://www.jetbrains.com/idea/) Import the Gradle project to sync up dependencies. ## Feedback & Contributing diff --git a/build.gradle b/build.gradle index 5f1da6c9..a5f37ca7 100644 --- a/build.gradle +++ b/build.gradle @@ -1,184 +1,27 @@ -plugins { - id 'io.codearte.nexus-staging' version '0.11.0' - id 'com.github.johnrengelman.shadow' version '2.0.1' - id "org.sonarqube" version "2.2" - id "com.gorylenko.gradle-git-properties" version "1.4.17" -} - -group 'com.kenticocloud' -version '2.0.0-SNAPSHOT' -ext.isContinuousIntegrationBuild = System.getenv('CONTINUOUS_INTEGRATION') != null ? System.getenv('CONTINUOUS_INTEGRATION').toBoolean() : false -ext.repositoryHost = isContinuousIntegrationBuild ? "maven.org" : "localBuild" - -apply plugin: 'java' -apply plugin: 'jacoco' -apply plugin: 'maven' -apply plugin: 'signing' - -sourceCompatibility = 1.8 - -repositories { - mavenCentral() -} - -dependencies { - compile group: 'org.slf4j', name: 'slf4j-api', version: '1.7.25' - - compile group: 'com.fasterxml.jackson.core', name: 'jackson-core', version: '2.8.9' - compile group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: '2.8.9' - compile group: 'com.fasterxml.jackson.datatype', name: 'jackson-datatype-jsr310', version: '2.4.0' - - compile group: 'org.apache.httpcomponents', name: 'httpclient', version: '4.5.3' - - compile group: 'commons-beanutils', name: 'commons-beanutils', version: '1.9.3' - - compile group: 'io.github.lukehutch', name: 'fast-classpath-scanner', version: '2.4.7' - - compileOnly group: 'org.thymeleaf', name: 'thymeleaf', version: '3.0.0.RELEASE' - testCompile group: 'org.thymeleaf', name: 'thymeleaf', version: '3.0.0.RELEASE' - - testCompile group: 'junit', name: 'junit', version: '4.12' - testCompile group: 'org.apache.httpcomponents', name: 'httpclient', version: '4.5.3', classifier: 'tests' - testCompile group: 'ch.qos.logback', name: 'logback-classic', version: '1.2.3' - -} - -if (isContinuousIntegrationBuild) { - processResources { - filesMatching('com/kenticocloud/delivery/build.properties') { - filter { String line -> - line.replace "0.0.0", project.version - } - filter { String line -> - line.replace "localBuild", repositoryHost - } - } - } -} - -shadowJar { - baseName = 'delivery-sdk-android' - version = project.version - classifier = null - relocate 'org.apache.http', 'shadow.kentico.http' -} - -task androidSourcesJar(type: Jar) { - from sourceSets.main.allSource - baseName = 'delivery-sdk-android' - classifier = 'sources' -} - -task androidJavadocJar(type: Jar, dependsOn: javadoc) { - baseName = 'delivery-sdk-android' - classifier = 'javadoc' - from 'build/docs/javadoc' -} - -task javadocJar(type: Jar, dependsOn: javadoc) { - classifier = 'javadoc' - from 'build/docs/javadoc' -} - -task sourcesJar(type: Jar) { - from sourceSets.main.allSource - classifier = 'sources' -} - -artifacts { - archives jar - archives javadocJar - archives sourcesJar - archives shadowJar - archives androidSourcesJar - archives androidJavadocJar -} - -signing { - required { isContinuousIntegrationBuild && gradle.taskGraph.hasTask("uploadArchives") } - sign configurations.archives - sign configurations.shadow -} - -uploadArchives { - repositories { - mavenDeployer { - //Comment out this step if you do not have the signing key - beforeDeployment { MavenDeployment deployment -> signing.signPom(deployment) } - - repository(url: "https://oss.sonatype.org/service/local/staging/deploy/maven2/") { - authentication(userName: nexusUsername, password: nexusPassword) - } - - snapshotRepository(url: "https://oss.sonatype.org/content/repositories/snapshots/") { - authentication(userName: nexusUsername, password: nexusPassword) - } - - //Use this repository, and comment out the above for viewing the generated POM - //repository(url: "file://localhost/tmp/myRepo/") - - addFilter('android') { artifact, File file -> - file.name.contains('android-') - } - addFilter('java') { artifact, file -> - file.name.contains('java-') - } - pom('java').project { - name 'delivery-sdk-java' - packaging 'jar' - description 'Kentico Cloud Delivery Java SDK https://kenticocloud.com/' - url 'https://github.com/Kentico/delivery-sdk-java' - - scm { - url 'https://github.com/Kentico/delivery-sdk-java' - connection 'scm:https://github.com/Kentico/delivery-sdk-java.git' - developerConnection 'scm:git://github.com/Kentico/delivery-sdk-java.git' - } - - licenses { - license { - name 'MIT License' - url 'http://www.opensource.org/licenses/mit-license.php' - distribution 'repo' - } - } - - developers { - developer { - id 'aweigold' - name 'Adam J. Weigold' - email 'adam@adamweigold.com' - } - } - } - pom('android').project { - name 'delivery-sdk-android' - packaging 'jar' - description 'Kentico Cloud Delivery Android SDK https://kenticocloud.com/' - url 'https://github.com/Kentico/delivery-sdk-java' - - scm { - url 'https://github.com/Kentico/delivery-sdk-java' - connection 'scm:https://github.com/Kentico/delivery-sdk-java.git' - developerConnection 'scm:git://github.com/Kentico/delivery-sdk-java.git' - } - - licenses { - license { - name 'MIT License' - url 'http://www.opensource.org/licenses/mit-license.php' - distribution 'repo' - } - } - - developers { - developer { - id 'aweigold' - name 'Adam J. Weigold' - email 'adam@adamweigold.com' - } - } - } - } - } -} +/* + * MIT License + * + * Copyright (c) 2018 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ + +subprojects { project -> + version '2.0.0-SNAPSHOT' +} \ No newline at end of file diff --git a/delivery/build.gradle b/delivery/build.gradle new file mode 100644 index 00000000..5eaaf50e --- /dev/null +++ b/delivery/build.gradle @@ -0,0 +1,245 @@ +/* + * MIT License + * + * Copyright (c) 2018 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ + +plugins { + id "org.sonarqube" version "2.6.2" +} + +group 'com.kenticocloud' +version '2.0.0-SNAPSHOT' + +apply plugin: 'java' +apply plugin: 'idea' +apply plugin: 'jacoco' +apply plugin: 'maven-publish' +apply plugin: 'signing' + +sourceCompatibility = 1.8 + +repositories { + mavenCentral() +} + +dependencies { + compile group: 'org.slf4j', name: 'slf4j-api', version: '1.7.25' + + compile group: 'com.fasterxml.jackson.core', name: 'jackson-core', version: '2.8.9' + compile group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: '2.8.9' + compile group: 'com.fasterxml.jackson.datatype', name: 'jackson-datatype-jsr310', version: '2.4.0' + + compile group: 'org.apache.httpcomponents', name: 'httpclient', version: '4.5.3' + + compile group: 'commons-beanutils', name: 'commons-beanutils', version: '1.9.3' + + compile group: 'io.github.lukehutch', name: 'fast-classpath-scanner', version: '2.4.7' + + compileOnly group: 'org.thymeleaf', name: 'thymeleaf', version: '3.0.0.RELEASE' + testCompile group: 'org.thymeleaf', name: 'thymeleaf', version: '3.0.0.RELEASE' + + testCompile group: 'junit', name: 'junit', version: '4.12' + testCompile group: 'org.apache.httpcomponents', name: 'httpclient', version: '4.5.3', classifier: 'tests' + testCompile group: 'ch.qos.logback', name: 'logback-classic', version: '1.2.3' + +} + +if (isCI()) { + processResources { + filesMatching('com/kenticocloud/delivery/build.properties') { + filter { String line -> + line.replace "0.0.0", project.version.toString() + } + filter { String line -> + line.replace "localBuild", isCI() ? "maven.org" : "localBuild" + } + } + } +} + +test { + // show standard out and standard error of the test JVM(s) on the console + testLogging.showStandardStreams = true +} + +task sourcesJar(type: Jar) { + from sourceSets.main.allJava + classifier = 'sources' +} + +task javadocJar(type: Jar, dependsOn: javadoc) { + classifier = 'javadoc' + from javadoc.destinationDir +} + +artifacts { + archives jar + archives sourcesJar + archives javadocJar +} + +tasks.withType(Jar) { + from(project.rootProject.projectDir) { + include 'LICENSE' + into 'META-INF' + } +} + +publishing { + publications { + mavenJava(MavenPublication) { + customizePom(pom) + + from components.java + + artifact(sourcesJar) { + classifier = 'sources' + } + artifact(javadocJar) { + classifier = 'javadoc' + } + + // create the signed artifacts + afterEvaluate { + if (enableSigning()) { + // create the sign pom artifact + pom.withXml { + def pomFile = file("${project.buildDir}/generated-pom.xml") + writeTo(pomFile) + def pomAscFile = signing.sign(pomFile).signatureFiles[0] + artifact(pomAscFile) { + classifier = null + extension = 'pom.asc' + } + } + + project.tasks.signArchives.signatureFiles.each { + artifact(it) { + def matcher = it.file =~ /-(sources|javadoc)\.jar\.asc$/ + if (matcher.find()) { + classifier = matcher.group(1) + } else { + classifier = null + } + extension = 'jar.asc' + } + } + } + } + } + } + repositories { + afterEvaluate { + if (enableSigning()) { + maven { + if (project.getVersion().toString().endsWith('SNAPSHOT')) { + url "https://oss.sonatype.org/content/repositories/snapshots/" + } else { + url "https://oss.sonatype.org/service/local/staging/deploy/maven2/" + } + credentials { + username nexusUsername + password nexusPassword + } + } + } + } + } +} + +if (enableSigning()) { + signing { + sign configurations.archives + } +} + +def customizePom(pom) { + pom.withXml { + def root = asNode() + + // eliminate test-scoped dependencies (no need in maven central POMs) + root.dependencies.removeAll { dep -> + dep.scope == "test" + } + + // add all items necessary for maven central publication + root.children().last() + { + resolveStrategy = DELEGATE_FIRST + + description 'Kentico Cloud Delivery Java SDK https://kenticocloud.com/' + name 'delivery' + url 'https://github.com/Kentico/delivery-sdk-java' + organization { + name 'com.kenticocloud' + url 'https://github.com/Kentico' + } + scm { + url 'https://github.com/Kentico/delivery-sdk-java' + connection 'scm:git:git://github.com/Kentico/delivery-sdk-java.git' + developerConnection 'scm:git:ssh://git@github.com:Kentico/delivery-sdk-java.git' + } + issueManagement { + system 'GitHub' + url 'https://github.com/Kentico/delivery-sdk-java/issues' + } + licenses { + license { + name 'MIT License' + url 'http://www.opensource.org/licenses/mit-license.php' + distribution 'repo' + } + } + developers { + developer { + id 'aweigold' + name 'Adam J. Weigold' + email 'adam@adamweigold.com' + } + } + } + } +} + +if (enableSigning()) { + model { + tasks.generatePomFileForMavenJavaPublication { + destination = file("$buildDir/generated-pom.xml") + } + tasks.publishMavenJavaPublicationToMavenLocal { + dependsOn project.tasks.signArchives + } + tasks.publishMavenJavaPublicationToMavenRepository { + dependsOn project.tasks.signArchives + } + } +} + +boolean enableSigning() { + return project.hasProperty("enable.signing") && + project.property("enable.signing").toString().toBoolean() && + isCI() +} + +boolean isCI() { + return System.getenv('CONTINUOUS_INTEGRATION') != null ? + System.getenv('CONTINUOUS_INTEGRATION').toBoolean() : false +} \ No newline at end of file diff --git a/src/main/java/com/kenticocloud/delivery/Asset.java b/delivery/src/main/java/com/kenticocloud/delivery/Asset.java similarity index 100% rename from src/main/java/com/kenticocloud/delivery/Asset.java rename to delivery/src/main/java/com/kenticocloud/delivery/Asset.java diff --git a/src/main/java/com/kenticocloud/delivery/AssetsElement.java b/delivery/src/main/java/com/kenticocloud/delivery/AssetsElement.java similarity index 100% rename from src/main/java/com/kenticocloud/delivery/AssetsElement.java rename to delivery/src/main/java/com/kenticocloud/delivery/AssetsElement.java diff --git a/src/main/java/com/kenticocloud/delivery/BrokenLinkUrlResolver.java b/delivery/src/main/java/com/kenticocloud/delivery/BrokenLinkUrlResolver.java similarity index 100% rename from src/main/java/com/kenticocloud/delivery/BrokenLinkUrlResolver.java rename to delivery/src/main/java/com/kenticocloud/delivery/BrokenLinkUrlResolver.java diff --git a/src/main/java/com/kenticocloud/delivery/CacheManager.java b/delivery/src/main/java/com/kenticocloud/delivery/CacheManager.java similarity index 100% rename from src/main/java/com/kenticocloud/delivery/CacheManager.java rename to delivery/src/main/java/com/kenticocloud/delivery/CacheManager.java diff --git a/src/main/java/com/kenticocloud/delivery/ContentItem.java b/delivery/src/main/java/com/kenticocloud/delivery/ContentItem.java similarity index 100% rename from src/main/java/com/kenticocloud/delivery/ContentItem.java rename to delivery/src/main/java/com/kenticocloud/delivery/ContentItem.java diff --git a/src/main/java/com/kenticocloud/delivery/ContentItemMapping.java b/delivery/src/main/java/com/kenticocloud/delivery/ContentItemMapping.java similarity index 100% rename from src/main/java/com/kenticocloud/delivery/ContentItemMapping.java rename to delivery/src/main/java/com/kenticocloud/delivery/ContentItemMapping.java diff --git a/src/main/java/com/kenticocloud/delivery/ContentItemResponse.java b/delivery/src/main/java/com/kenticocloud/delivery/ContentItemResponse.java similarity index 100% rename from src/main/java/com/kenticocloud/delivery/ContentItemResponse.java rename to delivery/src/main/java/com/kenticocloud/delivery/ContentItemResponse.java diff --git a/src/main/java/com/kenticocloud/delivery/ContentItemsListingResponse.java b/delivery/src/main/java/com/kenticocloud/delivery/ContentItemsListingResponse.java similarity index 100% rename from src/main/java/com/kenticocloud/delivery/ContentItemsListingResponse.java rename to delivery/src/main/java/com/kenticocloud/delivery/ContentItemsListingResponse.java diff --git a/src/main/java/com/kenticocloud/delivery/ContentLinkUrlResolver.java b/delivery/src/main/java/com/kenticocloud/delivery/ContentLinkUrlResolver.java similarity index 100% rename from src/main/java/com/kenticocloud/delivery/ContentLinkUrlResolver.java rename to delivery/src/main/java/com/kenticocloud/delivery/ContentLinkUrlResolver.java diff --git a/src/main/java/com/kenticocloud/delivery/ContentType.java b/delivery/src/main/java/com/kenticocloud/delivery/ContentType.java similarity index 100% rename from src/main/java/com/kenticocloud/delivery/ContentType.java rename to delivery/src/main/java/com/kenticocloud/delivery/ContentType.java diff --git a/src/main/java/com/kenticocloud/delivery/ContentTypesListingResponse.java b/delivery/src/main/java/com/kenticocloud/delivery/ContentTypesListingResponse.java similarity index 100% rename from src/main/java/com/kenticocloud/delivery/ContentTypesListingResponse.java rename to delivery/src/main/java/com/kenticocloud/delivery/ContentTypesListingResponse.java diff --git a/src/main/java/com/kenticocloud/delivery/DateTimeElement.java b/delivery/src/main/java/com/kenticocloud/delivery/DateTimeElement.java similarity index 100% rename from src/main/java/com/kenticocloud/delivery/DateTimeElement.java rename to delivery/src/main/java/com/kenticocloud/delivery/DateTimeElement.java diff --git a/src/main/java/com/kenticocloud/delivery/DelegatingRichTextElementResolver.java b/delivery/src/main/java/com/kenticocloud/delivery/DelegatingRichTextElementResolver.java similarity index 100% rename from src/main/java/com/kenticocloud/delivery/DelegatingRichTextElementResolver.java rename to delivery/src/main/java/com/kenticocloud/delivery/DelegatingRichTextElementResolver.java diff --git a/src/main/java/com/kenticocloud/delivery/DeliveryClient.java b/delivery/src/main/java/com/kenticocloud/delivery/DeliveryClient.java similarity index 98% rename from src/main/java/com/kenticocloud/delivery/DeliveryClient.java rename to delivery/src/main/java/com/kenticocloud/delivery/DeliveryClient.java index 4aa97b36..21b17fad 100644 --- a/src/main/java/com/kenticocloud/delivery/DeliveryClient.java +++ b/delivery/src/main/java/com/kenticocloud/delivery/DeliveryClient.java @@ -64,7 +64,7 @@ public class DeliveryClient { String packageId = buildProps.getProperty("Package-Id"); repositoryHost = repositoryHost == null ? "localBuild" : repositoryHost; version = version == null ? "0.0.0" : version; - packageId = packageId == null ? "com.kenticocloud:delivery-sdk-java" : packageId; + packageId = packageId == null ? "com.kenticocloud:delivery" : packageId; sdkId = String.format( "%s;%s;%s", repositoryHost, @@ -73,7 +73,7 @@ public class DeliveryClient { logger.info("SDK ID: {}", sdkId); } catch (IOException e) { logger.info("Jar manifest read error, setting developer build SDK ID"); - sdkId = "localBuild;com.kenticocloud:delivery-sdk-java;0.0.0"; + sdkId = "localBuild;com.kenticocloud:delivery;0.0.0"; } } @@ -214,6 +214,7 @@ public List getItems(Class tClass) throws IOException { public Page getPageOfItems(Class tClass, List params) throws IOException { ContentItemsListingResponse response = getItems(params); + response.setStronglyTypedContentItemConverter(stronglyTypedContentItemConverter); return new Page<>(response, tClass, this); } @@ -226,6 +227,7 @@ public Page getNextPage(Page currentPage) throws IOException { requestBuilder = addHeaders(requestBuilder); HttpUriRequest httpUriRequest = requestBuilder.build(); ContentItemsListingResponse response = executeRequest(httpUriRequest, ContentItemsListingResponse.class); + response.setStronglyTypedContentItemConverter(stronglyTypedContentItemConverter); RichTextElementConverter converter = new RichTextElementConverter( getContentLinkUrlResolver(), getBrokenLinkUrlResolver(), diff --git a/src/main/java/com/kenticocloud/delivery/DeliveryOptions.java b/delivery/src/main/java/com/kenticocloud/delivery/DeliveryOptions.java similarity index 100% rename from src/main/java/com/kenticocloud/delivery/DeliveryOptions.java rename to delivery/src/main/java/com/kenticocloud/delivery/DeliveryOptions.java diff --git a/src/main/java/com/kenticocloud/delivery/DeliveryParameterBuilder.java b/delivery/src/main/java/com/kenticocloud/delivery/DeliveryParameterBuilder.java similarity index 100% rename from src/main/java/com/kenticocloud/delivery/DeliveryParameterBuilder.java rename to delivery/src/main/java/com/kenticocloud/delivery/DeliveryParameterBuilder.java diff --git a/src/main/java/com/kenticocloud/delivery/Element.java b/delivery/src/main/java/com/kenticocloud/delivery/Element.java similarity index 100% rename from src/main/java/com/kenticocloud/delivery/Element.java rename to delivery/src/main/java/com/kenticocloud/delivery/Element.java diff --git a/src/main/java/com/kenticocloud/delivery/ElementMapping.java b/delivery/src/main/java/com/kenticocloud/delivery/ElementMapping.java similarity index 100% rename from src/main/java/com/kenticocloud/delivery/ElementMapping.java rename to delivery/src/main/java/com/kenticocloud/delivery/ElementMapping.java diff --git a/src/main/java/com/kenticocloud/delivery/HttpRequestExecutor.java b/delivery/src/main/java/com/kenticocloud/delivery/HttpRequestExecutor.java similarity index 100% rename from src/main/java/com/kenticocloud/delivery/HttpRequestExecutor.java rename to delivery/src/main/java/com/kenticocloud/delivery/HttpRequestExecutor.java diff --git a/src/main/java/com/kenticocloud/delivery/Image.java b/delivery/src/main/java/com/kenticocloud/delivery/Image.java similarity index 100% rename from src/main/java/com/kenticocloud/delivery/Image.java rename to delivery/src/main/java/com/kenticocloud/delivery/Image.java diff --git a/src/main/java/com/kenticocloud/delivery/InlineContentItemsResolver.java b/delivery/src/main/java/com/kenticocloud/delivery/InlineContentItemsResolver.java similarity index 100% rename from src/main/java/com/kenticocloud/delivery/InlineContentItemsResolver.java rename to delivery/src/main/java/com/kenticocloud/delivery/InlineContentItemsResolver.java diff --git a/src/main/java/com/kenticocloud/delivery/KenticoError.java b/delivery/src/main/java/com/kenticocloud/delivery/KenticoError.java similarity index 100% rename from src/main/java/com/kenticocloud/delivery/KenticoError.java rename to delivery/src/main/java/com/kenticocloud/delivery/KenticoError.java diff --git a/src/main/java/com/kenticocloud/delivery/KenticoErrorException.java b/delivery/src/main/java/com/kenticocloud/delivery/KenticoErrorException.java similarity index 100% rename from src/main/java/com/kenticocloud/delivery/KenticoErrorException.java rename to delivery/src/main/java/com/kenticocloud/delivery/KenticoErrorException.java diff --git a/src/main/java/com/kenticocloud/delivery/Link.java b/delivery/src/main/java/com/kenticocloud/delivery/Link.java similarity index 100% rename from src/main/java/com/kenticocloud/delivery/Link.java rename to delivery/src/main/java/com/kenticocloud/delivery/Link.java diff --git a/src/main/java/com/kenticocloud/delivery/ModularContentElement.java b/delivery/src/main/java/com/kenticocloud/delivery/ModularContentElement.java similarity index 100% rename from src/main/java/com/kenticocloud/delivery/ModularContentElement.java rename to delivery/src/main/java/com/kenticocloud/delivery/ModularContentElement.java diff --git a/src/main/java/com/kenticocloud/delivery/ModularContentProvider.java b/delivery/src/main/java/com/kenticocloud/delivery/ModularContentProvider.java similarity index 100% rename from src/main/java/com/kenticocloud/delivery/ModularContentProvider.java rename to delivery/src/main/java/com/kenticocloud/delivery/ModularContentProvider.java diff --git a/src/main/java/com/kenticocloud/delivery/MultipleChoiceElement.java b/delivery/src/main/java/com/kenticocloud/delivery/MultipleChoiceElement.java similarity index 100% rename from src/main/java/com/kenticocloud/delivery/MultipleChoiceElement.java rename to delivery/src/main/java/com/kenticocloud/delivery/MultipleChoiceElement.java diff --git a/src/main/java/com/kenticocloud/delivery/NumberElement.java b/delivery/src/main/java/com/kenticocloud/delivery/NumberElement.java similarity index 100% rename from src/main/java/com/kenticocloud/delivery/NumberElement.java rename to delivery/src/main/java/com/kenticocloud/delivery/NumberElement.java diff --git a/src/main/java/com/kenticocloud/delivery/Option.java b/delivery/src/main/java/com/kenticocloud/delivery/Option.java similarity index 100% rename from src/main/java/com/kenticocloud/delivery/Option.java rename to delivery/src/main/java/com/kenticocloud/delivery/Option.java diff --git a/src/main/java/com/kenticocloud/delivery/Page.java b/delivery/src/main/java/com/kenticocloud/delivery/Page.java similarity index 100% rename from src/main/java/com/kenticocloud/delivery/Page.java rename to delivery/src/main/java/com/kenticocloud/delivery/Page.java diff --git a/src/main/java/com/kenticocloud/delivery/Pagination.java b/delivery/src/main/java/com/kenticocloud/delivery/Pagination.java similarity index 100% rename from src/main/java/com/kenticocloud/delivery/Pagination.java rename to delivery/src/main/java/com/kenticocloud/delivery/Pagination.java diff --git a/src/main/java/com/kenticocloud/delivery/RichTextElement.java b/delivery/src/main/java/com/kenticocloud/delivery/RichTextElement.java similarity index 100% rename from src/main/java/com/kenticocloud/delivery/RichTextElement.java rename to delivery/src/main/java/com/kenticocloud/delivery/RichTextElement.java diff --git a/src/main/java/com/kenticocloud/delivery/RichTextElementConverter.java b/delivery/src/main/java/com/kenticocloud/delivery/RichTextElementConverter.java similarity index 100% rename from src/main/java/com/kenticocloud/delivery/RichTextElementConverter.java rename to delivery/src/main/java/com/kenticocloud/delivery/RichTextElementConverter.java diff --git a/src/main/java/com/kenticocloud/delivery/RichTextElementResolver.java b/delivery/src/main/java/com/kenticocloud/delivery/RichTextElementResolver.java similarity index 100% rename from src/main/java/com/kenticocloud/delivery/RichTextElementResolver.java rename to delivery/src/main/java/com/kenticocloud/delivery/RichTextElementResolver.java diff --git a/src/main/java/com/kenticocloud/delivery/StringUtils.java b/delivery/src/main/java/com/kenticocloud/delivery/StringUtils.java similarity index 100% rename from src/main/java/com/kenticocloud/delivery/StringUtils.java rename to delivery/src/main/java/com/kenticocloud/delivery/StringUtils.java diff --git a/src/main/java/com/kenticocloud/delivery/StronglyTypedContentItemConverter.java b/delivery/src/main/java/com/kenticocloud/delivery/StronglyTypedContentItemConverter.java similarity index 100% rename from src/main/java/com/kenticocloud/delivery/StronglyTypedContentItemConverter.java rename to delivery/src/main/java/com/kenticocloud/delivery/StronglyTypedContentItemConverter.java diff --git a/src/main/java/com/kenticocloud/delivery/System.java b/delivery/src/main/java/com/kenticocloud/delivery/System.java similarity index 100% rename from src/main/java/com/kenticocloud/delivery/System.java rename to delivery/src/main/java/com/kenticocloud/delivery/System.java diff --git a/src/main/java/com/kenticocloud/delivery/Taxonomy.java b/delivery/src/main/java/com/kenticocloud/delivery/Taxonomy.java similarity index 100% rename from src/main/java/com/kenticocloud/delivery/Taxonomy.java rename to delivery/src/main/java/com/kenticocloud/delivery/Taxonomy.java diff --git a/src/main/java/com/kenticocloud/delivery/TaxonomyElement.java b/delivery/src/main/java/com/kenticocloud/delivery/TaxonomyElement.java similarity index 100% rename from src/main/java/com/kenticocloud/delivery/TaxonomyElement.java rename to delivery/src/main/java/com/kenticocloud/delivery/TaxonomyElement.java diff --git a/src/main/java/com/kenticocloud/delivery/TaxonomyGroup.java b/delivery/src/main/java/com/kenticocloud/delivery/TaxonomyGroup.java similarity index 100% rename from src/main/java/com/kenticocloud/delivery/TaxonomyGroup.java rename to delivery/src/main/java/com/kenticocloud/delivery/TaxonomyGroup.java diff --git a/src/main/java/com/kenticocloud/delivery/TaxonomyGroupListingResponse.java b/delivery/src/main/java/com/kenticocloud/delivery/TaxonomyGroupListingResponse.java similarity index 100% rename from src/main/java/com/kenticocloud/delivery/TaxonomyGroupListingResponse.java rename to delivery/src/main/java/com/kenticocloud/delivery/TaxonomyGroupListingResponse.java diff --git a/src/main/java/com/kenticocloud/delivery/TextElement.java b/delivery/src/main/java/com/kenticocloud/delivery/TextElement.java similarity index 100% rename from src/main/java/com/kenticocloud/delivery/TextElement.java rename to delivery/src/main/java/com/kenticocloud/delivery/TextElement.java diff --git a/src/main/java/com/kenticocloud/delivery/UrlSlugElement.java b/delivery/src/main/java/com/kenticocloud/delivery/UrlSlugElement.java similarity index 100% rename from src/main/java/com/kenticocloud/delivery/UrlSlugElement.java rename to delivery/src/main/java/com/kenticocloud/delivery/UrlSlugElement.java diff --git a/src/main/java/com/kenticocloud/delivery/package-info.java b/delivery/src/main/java/com/kenticocloud/delivery/package-info.java similarity index 100% rename from src/main/java/com/kenticocloud/delivery/package-info.java rename to delivery/src/main/java/com/kenticocloud/delivery/package-info.java diff --git a/src/main/java/com/kenticocloud/delivery/template/RenderingEngineMissingException.java b/delivery/src/main/java/com/kenticocloud/delivery/template/RenderingEngineMissingException.java similarity index 100% rename from src/main/java/com/kenticocloud/delivery/template/RenderingEngineMissingException.java rename to delivery/src/main/java/com/kenticocloud/delivery/template/RenderingEngineMissingException.java diff --git a/src/main/java/com/kenticocloud/delivery/template/TemplateEngine.java b/delivery/src/main/java/com/kenticocloud/delivery/template/TemplateEngine.java similarity index 100% rename from src/main/java/com/kenticocloud/delivery/template/TemplateEngine.java rename to delivery/src/main/java/com/kenticocloud/delivery/template/TemplateEngine.java diff --git a/src/main/java/com/kenticocloud/delivery/template/TemplateEngineConfig.java b/delivery/src/main/java/com/kenticocloud/delivery/template/TemplateEngineConfig.java similarity index 100% rename from src/main/java/com/kenticocloud/delivery/template/TemplateEngineConfig.java rename to delivery/src/main/java/com/kenticocloud/delivery/template/TemplateEngineConfig.java diff --git a/src/main/java/com/kenticocloud/delivery/template/TemplateEngineInlineContentItemsResolver.java b/delivery/src/main/java/com/kenticocloud/delivery/template/TemplateEngineInlineContentItemsResolver.java similarity index 100% rename from src/main/java/com/kenticocloud/delivery/template/TemplateEngineInlineContentItemsResolver.java rename to delivery/src/main/java/com/kenticocloud/delivery/template/TemplateEngineInlineContentItemsResolver.java diff --git a/src/main/java/com/kenticocloud/delivery/template/TemplateEngineModel.java b/delivery/src/main/java/com/kenticocloud/delivery/template/TemplateEngineModel.java similarity index 100% rename from src/main/java/com/kenticocloud/delivery/template/TemplateEngineModel.java rename to delivery/src/main/java/com/kenticocloud/delivery/template/TemplateEngineModel.java diff --git a/src/main/java/com/kenticocloud/delivery/template/ViewResolverConfiguration.java b/delivery/src/main/java/com/kenticocloud/delivery/template/ViewResolverConfiguration.java similarity index 100% rename from src/main/java/com/kenticocloud/delivery/template/ViewResolverConfiguration.java rename to delivery/src/main/java/com/kenticocloud/delivery/template/ViewResolverConfiguration.java diff --git a/src/main/java/com/kenticocloud/delivery/template/thymeleaf/ThymeleafInlineContentItemsResolver.java b/delivery/src/main/java/com/kenticocloud/delivery/template/thymeleaf/ThymeleafInlineContentItemsResolver.java similarity index 100% rename from src/main/java/com/kenticocloud/delivery/template/thymeleaf/ThymeleafInlineContentItemsResolver.java rename to delivery/src/main/java/com/kenticocloud/delivery/template/thymeleaf/ThymeleafInlineContentItemsResolver.java diff --git a/src/main/java/com/kenticocloud/delivery/template/thymeleaf/ThymeleafTemplateEngine.java b/delivery/src/main/java/com/kenticocloud/delivery/template/thymeleaf/ThymeleafTemplateEngine.java similarity index 100% rename from src/main/java/com/kenticocloud/delivery/template/thymeleaf/ThymeleafTemplateEngine.java rename to delivery/src/main/java/com/kenticocloud/delivery/template/thymeleaf/ThymeleafTemplateEngine.java diff --git a/src/main/resources/com/kenticocloud/delivery/build.properties b/delivery/src/main/resources/com/kenticocloud/delivery/build.properties similarity index 96% rename from src/main/resources/com/kenticocloud/delivery/build.properties rename to delivery/src/main/resources/com/kenticocloud/delivery/build.properties index 73929a9d..a11f29f0 100644 --- a/src/main/resources/com/kenticocloud/delivery/build.properties +++ b/delivery/src/main/resources/com/kenticocloud/delivery/build.properties @@ -24,4 +24,4 @@ Repository-Host: localBuild Implementation-Version: 0.0.0 -Package-Id: com.kenticocloud:delivery-sdk-java +Package-Id: com.kenticocloud:delivery diff --git a/src/test/java/com/kenticocloud/delivery/ArticleItem.java b/delivery/src/test/java/com/kenticocloud/delivery/ArticleItem.java similarity index 100% rename from src/test/java/com/kenticocloud/delivery/ArticleItem.java rename to delivery/src/test/java/com/kenticocloud/delivery/ArticleItem.java diff --git a/src/test/java/com/kenticocloud/delivery/CustomItem.java b/delivery/src/test/java/com/kenticocloud/delivery/CustomItem.java similarity index 100% rename from src/test/java/com/kenticocloud/delivery/CustomItem.java rename to delivery/src/test/java/com/kenticocloud/delivery/CustomItem.java diff --git a/src/test/java/com/kenticocloud/delivery/DeliveryClientTest.java b/delivery/src/test/java/com/kenticocloud/delivery/DeliveryClientTest.java similarity index 100% rename from src/test/java/com/kenticocloud/delivery/DeliveryClientTest.java rename to delivery/src/test/java/com/kenticocloud/delivery/DeliveryClientTest.java diff --git a/src/test/java/com/kenticocloud/delivery/DeliveryParameterBuilderTest.java b/delivery/src/test/java/com/kenticocloud/delivery/DeliveryParameterBuilderTest.java similarity index 100% rename from src/test/java/com/kenticocloud/delivery/DeliveryParameterBuilderTest.java rename to delivery/src/test/java/com/kenticocloud/delivery/DeliveryParameterBuilderTest.java diff --git a/src/test/java/com/kenticocloud/delivery/DocsExamplesTest.java b/delivery/src/test/java/com/kenticocloud/delivery/DocsExamplesTest.java similarity index 100% rename from src/test/java/com/kenticocloud/delivery/DocsExamplesTest.java rename to delivery/src/test/java/com/kenticocloud/delivery/DocsExamplesTest.java diff --git a/src/test/java/com/kenticocloud/delivery/JacksonBindingsTest.java b/delivery/src/test/java/com/kenticocloud/delivery/JacksonBindingsTest.java similarity index 100% rename from src/test/java/com/kenticocloud/delivery/JacksonBindingsTest.java rename to delivery/src/test/java/com/kenticocloud/delivery/JacksonBindingsTest.java diff --git a/src/test/java/com/kenticocloud/delivery/RichTextElementConverterTest.java b/delivery/src/test/java/com/kenticocloud/delivery/RichTextElementConverterTest.java similarity index 100% rename from src/test/java/com/kenticocloud/delivery/RichTextElementConverterTest.java rename to delivery/src/test/java/com/kenticocloud/delivery/RichTextElementConverterTest.java diff --git a/src/test/java/com/kenticocloud/delivery/resolvers/BadResolver.java b/delivery/src/test/java/com/kenticocloud/delivery/resolvers/BadResolver.java similarity index 100% rename from src/test/java/com/kenticocloud/delivery/resolvers/BadResolver.java rename to delivery/src/test/java/com/kenticocloud/delivery/resolvers/BadResolver.java diff --git a/src/test/java/com/kenticocloud/delivery/resolvers/GoodResolver.java b/delivery/src/test/java/com/kenticocloud/delivery/resolvers/GoodResolver.java similarity index 100% rename from src/test/java/com/kenticocloud/delivery/resolvers/GoodResolver.java rename to delivery/src/test/java/com/kenticocloud/delivery/resolvers/GoodResolver.java diff --git a/src/test/java/com/kenticocloud/delivery/template/TemplateEngineConfigTest.java b/delivery/src/test/java/com/kenticocloud/delivery/template/TemplateEngineConfigTest.java similarity index 100% rename from src/test/java/com/kenticocloud/delivery/template/TemplateEngineConfigTest.java rename to delivery/src/test/java/com/kenticocloud/delivery/template/TemplateEngineConfigTest.java diff --git a/src/test/java/com/kenticocloud/delivery/template/thymeleaf/ThymeleafTemplateEngineTest.java b/delivery/src/test/java/com/kenticocloud/delivery/template/thymeleaf/ThymeleafTemplateEngineTest.java similarity index 100% rename from src/test/java/com/kenticocloud/delivery/template/thymeleaf/ThymeleafTemplateEngineTest.java rename to delivery/src/test/java/com/kenticocloud/delivery/template/thymeleaf/ThymeleafTemplateEngineTest.java diff --git a/src/test/resources/com/kenticocloud/delivery/DocsExamplesListContentItems.json b/delivery/src/test/resources/com/kenticocloud/delivery/DocsExamplesListContentItems.json similarity index 100% rename from src/test/resources/com/kenticocloud/delivery/DocsExamplesListContentItems.json rename to delivery/src/test/resources/com/kenticocloud/delivery/DocsExamplesListContentItems.json diff --git a/src/test/resources/com/kenticocloud/delivery/DocsExamplesRetrievingContentInSpecificLanguage.json b/delivery/src/test/resources/com/kenticocloud/delivery/DocsExamplesRetrievingContentInSpecificLanguage.json similarity index 100% rename from src/test/resources/com/kenticocloud/delivery/DocsExamplesRetrievingContentInSpecificLanguage.json rename to delivery/src/test/resources/com/kenticocloud/delivery/DocsExamplesRetrievingContentInSpecificLanguage.json diff --git a/src/test/resources/com/kenticocloud/delivery/SampleAssetElement.json b/delivery/src/test/resources/com/kenticocloud/delivery/SampleAssetElement.json similarity index 100% rename from src/test/resources/com/kenticocloud/delivery/SampleAssetElement.json rename to delivery/src/test/resources/com/kenticocloud/delivery/SampleAssetElement.json diff --git a/src/test/resources/com/kenticocloud/delivery/SampleContentItem.json b/delivery/src/test/resources/com/kenticocloud/delivery/SampleContentItem.json similarity index 100% rename from src/test/resources/com/kenticocloud/delivery/SampleContentItem.json rename to delivery/src/test/resources/com/kenticocloud/delivery/SampleContentItem.json diff --git a/src/test/resources/com/kenticocloud/delivery/SampleContentItemList.json b/delivery/src/test/resources/com/kenticocloud/delivery/SampleContentItemList.json similarity index 100% rename from src/test/resources/com/kenticocloud/delivery/SampleContentItemList.json rename to delivery/src/test/resources/com/kenticocloud/delivery/SampleContentItemList.json diff --git a/src/test/resources/com/kenticocloud/delivery/SampleContentItemListWithModularContent.json b/delivery/src/test/resources/com/kenticocloud/delivery/SampleContentItemListWithModularContent.json similarity index 100% rename from src/test/resources/com/kenticocloud/delivery/SampleContentItemListWithModularContent.json rename to delivery/src/test/resources/com/kenticocloud/delivery/SampleContentItemListWithModularContent.json diff --git a/src/test/resources/com/kenticocloud/delivery/SampleContentType.json b/delivery/src/test/resources/com/kenticocloud/delivery/SampleContentType.json similarity index 100% rename from src/test/resources/com/kenticocloud/delivery/SampleContentType.json rename to delivery/src/test/resources/com/kenticocloud/delivery/SampleContentType.json diff --git a/src/test/resources/com/kenticocloud/delivery/SampleContentTypeElementResponse.json b/delivery/src/test/resources/com/kenticocloud/delivery/SampleContentTypeElementResponse.json similarity index 100% rename from src/test/resources/com/kenticocloud/delivery/SampleContentTypeElementResponse.json rename to delivery/src/test/resources/com/kenticocloud/delivery/SampleContentTypeElementResponse.json diff --git a/src/test/resources/com/kenticocloud/delivery/SampleContentTypeList.json b/delivery/src/test/resources/com/kenticocloud/delivery/SampleContentTypeList.json similarity index 100% rename from src/test/resources/com/kenticocloud/delivery/SampleContentTypeList.json rename to delivery/src/test/resources/com/kenticocloud/delivery/SampleContentTypeList.json diff --git a/src/test/resources/com/kenticocloud/delivery/SampleDateTimeElement.json b/delivery/src/test/resources/com/kenticocloud/delivery/SampleDateTimeElement.json similarity index 100% rename from src/test/resources/com/kenticocloud/delivery/SampleDateTimeElement.json rename to delivery/src/test/resources/com/kenticocloud/delivery/SampleDateTimeElement.json diff --git a/src/test/resources/com/kenticocloud/delivery/SampleKenticoError.json b/delivery/src/test/resources/com/kenticocloud/delivery/SampleKenticoError.json similarity index 100% rename from src/test/resources/com/kenticocloud/delivery/SampleKenticoError.json rename to delivery/src/test/resources/com/kenticocloud/delivery/SampleKenticoError.json diff --git a/src/test/resources/com/kenticocloud/delivery/SampleModularContentElement.json b/delivery/src/test/resources/com/kenticocloud/delivery/SampleModularContentElement.json similarity index 100% rename from src/test/resources/com/kenticocloud/delivery/SampleModularContentElement.json rename to delivery/src/test/resources/com/kenticocloud/delivery/SampleModularContentElement.json diff --git a/src/test/resources/com/kenticocloud/delivery/SampleMultipleChoiceElement.json b/delivery/src/test/resources/com/kenticocloud/delivery/SampleMultipleChoiceElement.json similarity index 100% rename from src/test/resources/com/kenticocloud/delivery/SampleMultipleChoiceElement.json rename to delivery/src/test/resources/com/kenticocloud/delivery/SampleMultipleChoiceElement.json diff --git a/src/test/resources/com/kenticocloud/delivery/SampleNumberElement.json b/delivery/src/test/resources/com/kenticocloud/delivery/SampleNumberElement.json similarity index 100% rename from src/test/resources/com/kenticocloud/delivery/SampleNumberElement.json rename to delivery/src/test/resources/com/kenticocloud/delivery/SampleNumberElement.json diff --git a/src/test/resources/com/kenticocloud/delivery/SampleRichTextElement.json b/delivery/src/test/resources/com/kenticocloud/delivery/SampleRichTextElement.json similarity index 100% rename from src/test/resources/com/kenticocloud/delivery/SampleRichTextElement.json rename to delivery/src/test/resources/com/kenticocloud/delivery/SampleRichTextElement.json diff --git a/src/test/resources/com/kenticocloud/delivery/SampleTaxonomyElement.json b/delivery/src/test/resources/com/kenticocloud/delivery/SampleTaxonomyElement.json similarity index 100% rename from src/test/resources/com/kenticocloud/delivery/SampleTaxonomyElement.json rename to delivery/src/test/resources/com/kenticocloud/delivery/SampleTaxonomyElement.json diff --git a/src/test/resources/com/kenticocloud/delivery/SampleTaxonomyGroup.json b/delivery/src/test/resources/com/kenticocloud/delivery/SampleTaxonomyGroup.json similarity index 100% rename from src/test/resources/com/kenticocloud/delivery/SampleTaxonomyGroup.json rename to delivery/src/test/resources/com/kenticocloud/delivery/SampleTaxonomyGroup.json diff --git a/src/test/resources/com/kenticocloud/delivery/SampleTaxonomyGroupListingResponse.json b/delivery/src/test/resources/com/kenticocloud/delivery/SampleTaxonomyGroupListingResponse.json similarity index 100% rename from src/test/resources/com/kenticocloud/delivery/SampleTaxonomyGroupListingResponse.json rename to delivery/src/test/resources/com/kenticocloud/delivery/SampleTaxonomyGroupListingResponse.json diff --git a/src/test/resources/com/kenticocloud/delivery/SampleTextElement.json b/delivery/src/test/resources/com/kenticocloud/delivery/SampleTextElement.json similarity index 100% rename from src/test/resources/com/kenticocloud/delivery/SampleTextElement.json rename to delivery/src/test/resources/com/kenticocloud/delivery/SampleTextElement.json diff --git a/src/test/resources/com/kenticocloud/delivery/SampleUrlSlugElement.json b/delivery/src/test/resources/com/kenticocloud/delivery/SampleUrlSlugElement.json similarity index 100% rename from src/test/resources/com/kenticocloud/delivery/SampleUrlSlugElement.json rename to delivery/src/test/resources/com/kenticocloud/delivery/SampleUrlSlugElement.json diff --git a/src/test/resources/com/kenticocloud/delivery/logback-test.xml b/delivery/src/test/resources/com/kenticocloud/delivery/logback-test.xml similarity index 100% rename from src/test/resources/com/kenticocloud/delivery/logback-test.xml rename to delivery/src/test/resources/com/kenticocloud/delivery/logback-test.xml diff --git a/src/test/resources/customTemplateLocation/item.template b/delivery/src/test/resources/customTemplateLocation/item.template similarity index 100% rename from src/test/resources/customTemplateLocation/item.template rename to delivery/src/test/resources/customTemplateLocation/item.template diff --git a/src/test/resources/kentico/templates/article.html b/delivery/src/test/resources/kentico/templates/article.html similarity index 100% rename from src/test/resources/kentico/templates/article.html rename to delivery/src/test/resources/kentico/templates/article.html diff --git a/src/test/resources/kentico/templates/coffee.html b/delivery/src/test/resources/kentico/templates/coffee.html similarity index 100% rename from src/test/resources/kentico/templates/coffee.html rename to delivery/src/test/resources/kentico/templates/coffee.html diff --git a/gradle.properties b/gradle.properties index c2b32979..794e58fc 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,5 +1,4 @@ signing.keyId=D1115C87 -signing.secretKeyRingFile=./signing.gpg nexusUsername= nexusPassword= diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index c01ce0ac..187d3ef7 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 3f519ba9..9973ec93 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Tue Aug 15 14:07:32 CDT 2017 +#Sat Jul 28 13:25:04 CDT 2018 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-3.5-rc-2-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.9-all.zip diff --git a/settings.gradle b/settings.gradle index 85ad2c40..f5f62f16 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,2 +1,5 @@ rootProject.name = 'delivery-sdk-java' +include "delivery" + +enableFeaturePreview('STABLE_PUBLISHING')