diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml new file mode 100644 index 0000000..0ad8c1b --- /dev/null +++ b/.github/workflows/build.yml @@ -0,0 +1,17 @@ +name: Java CI + +on: [push] + +jobs: + build: + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v2 + - name: Set up JDK + uses: actions/setup-java@v2 + with: + java-version: '8' + distribution: 'adopt' + - name: Build with Maven + run: mvn --batch-mode --update-snapshots verify diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml new file mode 100644 index 0000000..aabb249 --- /dev/null +++ b/.github/workflows/publish.yml @@ -0,0 +1,32 @@ +name: publish + +on: + release: + types: [released] + +jobs: + publish: + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v2 + - name: Set up JDK and Maven Central + uses: actions/setup-java@v2 + with: + java-version: '8' + distribution: 'adopt' + server-id: ossrh + server-username: MAVEN_USERNAME + server-password: MAVEN_PASSWORD + - name: 'Get Previous tag' + id: previoustag + uses: "WyriHaximus/github-action-get-previous-tag@v1" + - name: Set version in pom.xml + run: | + sed -i -e "s/0.0.0/${{ steps.previoustag.outputs.tag }}/" pom.xml + cat pom.xml + - name: Publish package + run: mvn --batch-mode deploy + env: + MAVEN_USERNAME: ${{ secrets.OSSRH_USERNAME }} + MAVEN_PASSWORD: ${{ secrets.OSSRH_TOKEN }} diff --git a/.gitignore b/.gitignore index e8cdf10..6e24441 100644 --- a/.gitignore +++ b/.gitignore @@ -59,8 +59,7 @@ fabric.properties **/bin/ *.iml .project - -gettyimagesapi-sdk/.settings/ +.settings/ .classpath .settings/org.eclipse.core.resources.prefs .settings/org.eclipse.m2e.core.prefs diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index a540498..0000000 --- a/.travis.yml +++ /dev/null @@ -1,52 +0,0 @@ -language: java -jdk: # jdk versions to test against - https://www.deps.co/guides/travis-ci-latest-java/ - # Open JDK support: https://adoptopenjdk.net/support.html -- openjdk8 # LTS through at least 2023.09 -# It would be nice to test these, but multiple tests mean that Travis will do multiple -# deploys, only one of which would succeed. -#- openjdk11 # LTS through at least 2022.09 -#- openjdk-ea # early release - allow failures, but be aware that there *are* errors - -matrix: - allow_failures: # https://docs.travis-ci.com/user/build-matrix/#rows-that-are-allowed-to-fail - - jdk: openjdk-ea # allow early access version to fail - -before_install: - ## export GPG details - - echo $GPG_SECRET_KEYS | base64 --decode | $GPG_EXECUTABLE --import - - echo $GPG_OWNERTRUST | base64 --decode | $GPG_EXECUTABLE --import-ownertrust - -install: - mvn --settings .maven.xml install -DskipTests=true -Dgpg.skip -Dmaven.javadoc.skip=true -B -V - -script: - ## Build and release to maven central - mvn clean deploy --settings .maven.xml -DskipTests=true -B -U -P prepare_release - -before_deploy: - # Begin Extract the project version - - mvn help:evaluate -N -Dexpression=project.version|grep -v '\[' - - export project_version=$(mvn help:evaluate -N -Dexpression=project.version|grep -v '\[') - # End Extract - -deploy: - draft: false # set draft to true for testing - creates a draft build accessible only by collaborators - name: $project_version # use the project version extracted in before_deploy as the name - skip_cleanup: true # don't cleanup - we need the artifacts for deploying - - on: - repo: gettyimages/gettyimages-api_java - tags: true # only build tagged commits - - file: - - gettyimagesapi-sdk/target/gettyimagesapi-sdk-$project_version.jar - - - provider: releases # https://docs.travis-ci.com/user/deployment/releases - -# GITHUB_PERSONAL_ACCESS_TOKEN is an environment variable set in Travis-CI -# https://travis-ci.org/gettyimages/gettyimages-api_java/settings -# https://stackoverflow.com/questions/33735992/travis-ci-using-repository-environment-variables-in-travis-yml -# It must be enabled for the branch you're working on. NOTE: you can't use an environment variable because they're not set here. - api_key: - secure: pJkTcxWJUO0eJK6fH5D7Vb3BEQoc9tnKGX5pTa7n6OCqJU3qQHJVVpAphoCW5BfYQl1A7svNYGNZh7l/quzznxhBLS1HoV78AJcM4PnL1L/WuSgSIHDwOUZpZ1xctqMcZFh1+oavR4tRTk/mvcjBmUrcR1nOgctdx19i5/FzN7AlVwQZDZi80pd1Q/XnK0ID71GDQ0Zrb0w3Txi4/xHgsDbkN6By0wdCKd3slnYX6Bdd3zLSSGYmqdWWHMUgWrU8yMXwAP5G0lgksNBKv71JxBx6ZJE0QOeqvbIeIn9zLbRxHQKgbw9gJBeXHmlQBcbE+yJ5SqAfuPguSWQRs9PbCEx4GiXvgnU2G45qIBDm5d+82U+Sag+fLdl1/tktnVX7Hn6rJHGWUme/91wObvQRIV52CmV2+G3e49hR5DkNN7+yd/aL6fBTmT5wLKyabI2wf3birmlRScYtKT7uhi4pbBbolDJKubizegJB/48VhKHj6s4XujTCycorE9ucHLbgaAEDQID3inMvHy/fCH0PucAsToae+Yu+MmbSqqsu/899M2jzckCB42oWwseaFmKfGWTdrIwWkz5Bjp73f9dpcD25zo3q9gIFrbuyv2+XJMkQj2OLpTXXK84RW13YsMD8DmrEQya9rFhJsnN8uujoRBk4L9yCYy/PqfST9DV56vQ= diff --git a/gettyimagesapi-sdk/pom.xml b/gettyimagesapi-sdk/pom.xml deleted file mode 100644 index 86ecaef..0000000 --- a/gettyimagesapi-sdk/pom.xml +++ /dev/null @@ -1,177 +0,0 @@ - - 4.0.0 - - com.gettyimages - gettyimagesapi-sdk - 3.1.3 - gettyimagesapi-sdk - A SDK for Getty Images API - http://api.gettyimages.com - - - UTF-8 - - - - - The MIT License - https://opensource.org/licenses/MIT - - - - - - James Santos - james.santos-calacat@gettyimages.com - - Software Engineer - - - - - - https://github.com/gettyimages/gettyimages-api_java - - - - - ossrh - https://oss.sonatype.org/content/repositories/snapshots - - - ossrh - https://oss.sonatype.org/service/local/staging/deploy/maven2/ - - - - - - org.json - json - 20160810 - - - org.apache.httpcomponents - httpclient - 4.5.2 - - - org.junit.jupiter - junit-jupiter-engine - 5.1.0 - test - - - org.junit.platform - junit-platform-surefire-provider - 1.1.0 - test - - - org.mock-server - mockserver-netty - 3.10.8 - test - - - org.mock-server - mockserver-client-java - 3.10.8 - test - - - - - - org.apache.maven.plugins - maven-compiler-plugin - 3.5.1 - - 1.8 - 1.8 - - - - org.apache.maven.plugins - maven-surefire-plugin - 2.19.1 - - - org.junit.platform - junit-platform-surefire-provider - 1.1.0 - - - org.junit.jupiter - junit-jupiter-engine - 5.1.0 - - - - - - - - prepare_release - - - - org.sonatype.plugins - nexus-staging-maven-plugin - 1.6.8 - true - - ossrh - https://oss.sonatype.org/ - true - - - - org.apache.maven.plugins - maven-source-plugin - 3.0.1 - - - attach-sources - - jar-no-fork - - - - - - org.apache.maven.plugins - maven-javadoc-plugin - 2.10.4 - - 8 - - - - attach-javadocs - - jar - - - - - - org.apache.maven.plugins - maven-gpg-plugin - 1.6 - - - sign-artifacts - verify - - sign - - - - - - - - - diff --git a/pom.xml b/pom.xml index a81173c..63c6c5a 100644 --- a/pom.xml +++ b/pom.xml @@ -3,20 +3,30 @@ 4.0.0 com.gettyimages - gettyimagesapi - 3.1.3 - pom - - gettyimagesapi + gettyimagesapi-sdk + 0.0.0 + gettyimagesapi-sdk + A SDK for Getty Images API http://api.gettyimages.com UTF-8 - - gettyimagesapi-sdk - + + + The MIT License + https://opensource.org/licenses/MIT + + + + Getty Images + https://gettyimages.com + + + + https://github.com/gettyimages/gettyimages-api_java + @@ -28,4 +38,134 @@ https://oss.sonatype.org/service/local/staging/deploy/maven2/ + + + + org.json + json + 20160810 + + + org.apache.httpcomponents + httpclient + 4.5.13 + + + org.junit.jupiter + junit-jupiter-engine + 5.1.0 + test + + + org.junit.platform + junit-platform-surefire-provider + 1.1.0 + test + + + org.mock-server + mockserver-netty + 3.10.8 + test + + + org.mock-server + mockserver-client-java + 3.10.8 + test + + + + + + org.apache.maven.plugins + maven-compiler-plugin + 3.5.1 + + 1.8 + 1.8 + + + + org.apache.maven.plugins + maven-surefire-plugin + 2.19.1 + + + org.junit.platform + junit-platform-surefire-provider + 1.1.0 + + + org.junit.jupiter + junit-jupiter-engine + 5.1.0 + + + + + + + + prepare_release + + + + org.sonatype.plugins + nexus-staging-maven-plugin + 1.6.8 + true + + ossrh + https://oss.sonatype.org/ + true + + + + org.apache.maven.plugins + maven-source-plugin + 3.0.1 + + + attach-sources + + jar-no-fork + + + + + + org.apache.maven.plugins + maven-javadoc-plugin + 2.10.4 + + 8 + + + + attach-javadocs + + jar + + + + + + org.apache.maven.plugins + maven-gpg-plugin + 1.6 + + + sign-artifacts + verify + + sign + + + + + + + + diff --git a/gettyimagesapi-sdk/src/main/java/com/gettyimages/api/AbstractApiRequest.java b/src/main/java/com/gettyimages/api/AbstractApiRequest.java similarity index 100% rename from gettyimagesapi-sdk/src/main/java/com/gettyimages/api/AbstractApiRequest.java rename to src/main/java/com/gettyimages/api/AbstractApiRequest.java diff --git a/gettyimagesapi-sdk/src/main/java/com/gettyimages/api/ApiClient.java b/src/main/java/com/gettyimages/api/ApiClient.java similarity index 100% rename from gettyimagesapi-sdk/src/main/java/com/gettyimages/api/ApiClient.java rename to src/main/java/com/gettyimages/api/ApiClient.java diff --git a/gettyimagesapi-sdk/src/main/java/com/gettyimages/api/Constants.java b/src/main/java/com/gettyimages/api/Constants.java similarity index 100% rename from gettyimagesapi-sdk/src/main/java/com/gettyimages/api/Constants.java rename to src/main/java/com/gettyimages/api/Constants.java diff --git a/gettyimagesapi-sdk/src/main/java/com/gettyimages/api/CredentialType.java b/src/main/java/com/gettyimages/api/CredentialType.java similarity index 100% rename from gettyimagesapi-sdk/src/main/java/com/gettyimages/api/CredentialType.java rename to src/main/java/com/gettyimages/api/CredentialType.java diff --git a/gettyimagesapi-sdk/src/main/java/com/gettyimages/api/Credentials.java b/src/main/java/com/gettyimages/api/Credentials.java similarity index 100% rename from gettyimagesapi-sdk/src/main/java/com/gettyimages/api/Credentials.java rename to src/main/java/com/gettyimages/api/Credentials.java diff --git a/gettyimagesapi-sdk/src/main/java/com/gettyimages/api/CustomRequest/CustomRequest.java b/src/main/java/com/gettyimages/api/CustomRequest/CustomRequest.java similarity index 100% rename from gettyimagesapi-sdk/src/main/java/com/gettyimages/api/CustomRequest/CustomRequest.java rename to src/main/java/com/gettyimages/api/CustomRequest/CustomRequest.java diff --git a/gettyimagesapi-sdk/src/main/java/com/gettyimages/api/Downloads/DownloadImages.java b/src/main/java/com/gettyimages/api/Downloads/DownloadImages.java similarity index 100% rename from gettyimagesapi-sdk/src/main/java/com/gettyimages/api/Downloads/DownloadImages.java rename to src/main/java/com/gettyimages/api/Downloads/DownloadImages.java diff --git a/gettyimagesapi-sdk/src/main/java/com/gettyimages/api/Downloads/DownloadVideos.java b/src/main/java/com/gettyimages/api/Downloads/DownloadVideos.java similarity index 100% rename from gettyimagesapi-sdk/src/main/java/com/gettyimages/api/Downloads/DownloadVideos.java rename to src/main/java/com/gettyimages/api/Downloads/DownloadVideos.java diff --git a/gettyimagesapi-sdk/src/main/java/com/gettyimages/api/Filters/AgeOfPeople.java b/src/main/java/com/gettyimages/api/Filters/AgeOfPeople.java similarity index 100% rename from gettyimagesapi-sdk/src/main/java/com/gettyimages/api/Filters/AgeOfPeople.java rename to src/main/java/com/gettyimages/api/Filters/AgeOfPeople.java diff --git a/gettyimagesapi-sdk/src/main/java/com/gettyimages/api/Filters/CollectionFilter.java b/src/main/java/com/gettyimages/api/Filters/CollectionFilter.java similarity index 100% rename from gettyimagesapi-sdk/src/main/java/com/gettyimages/api/Filters/CollectionFilter.java rename to src/main/java/com/gettyimages/api/Filters/CollectionFilter.java diff --git a/gettyimagesapi-sdk/src/main/java/com/gettyimages/api/Filters/Compositions.java b/src/main/java/com/gettyimages/api/Filters/Compositions.java similarity index 100% rename from gettyimagesapi-sdk/src/main/java/com/gettyimages/api/Filters/Compositions.java rename to src/main/java/com/gettyimages/api/Filters/Compositions.java diff --git a/gettyimagesapi-sdk/src/main/java/com/gettyimages/api/Filters/EditorialGraphicalStyles.java b/src/main/java/com/gettyimages/api/Filters/EditorialGraphicalStyles.java similarity index 100% rename from gettyimagesapi-sdk/src/main/java/com/gettyimages/api/Filters/EditorialGraphicalStyles.java rename to src/main/java/com/gettyimages/api/Filters/EditorialGraphicalStyles.java diff --git a/gettyimagesapi-sdk/src/main/java/com/gettyimages/api/Filters/EditorialSegment.java b/src/main/java/com/gettyimages/api/Filters/EditorialSegment.java similarity index 100% rename from gettyimagesapi-sdk/src/main/java/com/gettyimages/api/Filters/EditorialSegment.java rename to src/main/java/com/gettyimages/api/Filters/EditorialSegment.java diff --git a/gettyimagesapi-sdk/src/main/java/com/gettyimages/api/Filters/EditorialVideoType.java b/src/main/java/com/gettyimages/api/Filters/EditorialVideoType.java similarity index 100% rename from gettyimagesapi-sdk/src/main/java/com/gettyimages/api/Filters/EditorialVideoType.java rename to src/main/java/com/gettyimages/api/Filters/EditorialVideoType.java diff --git a/gettyimagesapi-sdk/src/main/java/com/gettyimages/api/Filters/Ethnicity.java b/src/main/java/com/gettyimages/api/Filters/Ethnicity.java similarity index 100% rename from gettyimagesapi-sdk/src/main/java/com/gettyimages/api/Filters/Ethnicity.java rename to src/main/java/com/gettyimages/api/Filters/Ethnicity.java diff --git a/gettyimagesapi-sdk/src/main/java/com/gettyimages/api/Filters/FileType.java b/src/main/java/com/gettyimages/api/Filters/FileType.java similarity index 100% rename from gettyimagesapi-sdk/src/main/java/com/gettyimages/api/Filters/FileType.java rename to src/main/java/com/gettyimages/api/Filters/FileType.java diff --git a/gettyimagesapi-sdk/src/main/java/com/gettyimages/api/Filters/FormatAvailable.java b/src/main/java/com/gettyimages/api/Filters/FormatAvailable.java similarity index 100% rename from gettyimagesapi-sdk/src/main/java/com/gettyimages/api/Filters/FormatAvailable.java rename to src/main/java/com/gettyimages/api/Filters/FormatAvailable.java diff --git a/gettyimagesapi-sdk/src/main/java/com/gettyimages/api/Filters/FrameRate.java b/src/main/java/com/gettyimages/api/Filters/FrameRate.java similarity index 100% rename from gettyimagesapi-sdk/src/main/java/com/gettyimages/api/Filters/FrameRate.java rename to src/main/java/com/gettyimages/api/Filters/FrameRate.java diff --git a/gettyimagesapi-sdk/src/main/java/com/gettyimages/api/Filters/GraphicalStyles.java b/src/main/java/com/gettyimages/api/Filters/GraphicalStyles.java similarity index 100% rename from gettyimagesapi-sdk/src/main/java/com/gettyimages/api/Filters/GraphicalStyles.java rename to src/main/java/com/gettyimages/api/Filters/GraphicalStyles.java diff --git a/gettyimagesapi-sdk/src/main/java/com/gettyimages/api/Filters/LicenseModel.java b/src/main/java/com/gettyimages/api/Filters/LicenseModel.java similarity index 100% rename from gettyimagesapi-sdk/src/main/java/com/gettyimages/api/Filters/LicenseModel.java rename to src/main/java/com/gettyimages/api/Filters/LicenseModel.java diff --git a/gettyimagesapi-sdk/src/main/java/com/gettyimages/api/Filters/MinimumQualityRank.java b/src/main/java/com/gettyimages/api/Filters/MinimumQualityRank.java similarity index 100% rename from gettyimagesapi-sdk/src/main/java/com/gettyimages/api/Filters/MinimumQualityRank.java rename to src/main/java/com/gettyimages/api/Filters/MinimumQualityRank.java diff --git a/gettyimagesapi-sdk/src/main/java/com/gettyimages/api/Filters/MinimumSize.java b/src/main/java/com/gettyimages/api/Filters/MinimumSize.java similarity index 100% rename from gettyimagesapi-sdk/src/main/java/com/gettyimages/api/Filters/MinimumSize.java rename to src/main/java/com/gettyimages/api/Filters/MinimumSize.java diff --git a/gettyimagesapi-sdk/src/main/java/com/gettyimages/api/Filters/NumberOfPeople.java b/src/main/java/com/gettyimages/api/Filters/NumberOfPeople.java similarity index 100% rename from gettyimagesapi-sdk/src/main/java/com/gettyimages/api/Filters/NumberOfPeople.java rename to src/main/java/com/gettyimages/api/Filters/NumberOfPeople.java diff --git a/gettyimagesapi-sdk/src/main/java/com/gettyimages/api/Filters/Orientation.java b/src/main/java/com/gettyimages/api/Filters/Orientation.java similarity index 100% rename from gettyimagesapi-sdk/src/main/java/com/gettyimages/api/Filters/Orientation.java rename to src/main/java/com/gettyimages/api/Filters/Orientation.java diff --git a/gettyimagesapi-sdk/src/main/java/com/gettyimages/api/Filters/ProductType.java b/src/main/java/com/gettyimages/api/Filters/ProductType.java similarity index 100% rename from gettyimagesapi-sdk/src/main/java/com/gettyimages/api/Filters/ProductType.java rename to src/main/java/com/gettyimages/api/Filters/ProductType.java diff --git a/gettyimagesapi-sdk/src/main/java/com/gettyimages/api/Filters/SortOrder.java b/src/main/java/com/gettyimages/api/Filters/SortOrder.java similarity index 100% rename from gettyimagesapi-sdk/src/main/java/com/gettyimages/api/Filters/SortOrder.java rename to src/main/java/com/gettyimages/api/Filters/SortOrder.java diff --git a/gettyimagesapi-sdk/src/main/java/com/gettyimages/api/HttpClientErrorException.java b/src/main/java/com/gettyimages/api/HttpClientErrorException.java similarity index 100% rename from gettyimagesapi-sdk/src/main/java/com/gettyimages/api/HttpClientErrorException.java rename to src/main/java/com/gettyimages/api/HttpClientErrorException.java diff --git a/gettyimagesapi-sdk/src/main/java/com/gettyimages/api/HttpSystemErrorException.java b/src/main/java/com/gettyimages/api/HttpSystemErrorException.java similarity index 100% rename from gettyimagesapi-sdk/src/main/java/com/gettyimages/api/HttpSystemErrorException.java rename to src/main/java/com/gettyimages/api/HttpSystemErrorException.java diff --git a/gettyimagesapi-sdk/src/main/java/com/gettyimages/api/Images/Images.java b/src/main/java/com/gettyimages/api/Images/Images.java similarity index 100% rename from gettyimagesapi-sdk/src/main/java/com/gettyimages/api/Images/Images.java rename to src/main/java/com/gettyimages/api/Images/Images.java diff --git a/gettyimagesapi-sdk/src/main/java/com/gettyimages/api/SdkException.java b/src/main/java/com/gettyimages/api/SdkException.java similarity index 100% rename from gettyimagesapi-sdk/src/main/java/com/gettyimages/api/SdkException.java rename to src/main/java/com/gettyimages/api/SdkException.java diff --git a/gettyimagesapi-sdk/src/main/java/com/gettyimages/api/Search/SearchImages.java b/src/main/java/com/gettyimages/api/Search/SearchImages.java similarity index 100% rename from gettyimagesapi-sdk/src/main/java/com/gettyimages/api/Search/SearchImages.java rename to src/main/java/com/gettyimages/api/Search/SearchImages.java diff --git a/gettyimagesapi-sdk/src/main/java/com/gettyimages/api/Search/SearchImagesCreative.java b/src/main/java/com/gettyimages/api/Search/SearchImagesCreative.java similarity index 100% rename from gettyimagesapi-sdk/src/main/java/com/gettyimages/api/Search/SearchImagesCreative.java rename to src/main/java/com/gettyimages/api/Search/SearchImagesCreative.java diff --git a/gettyimagesapi-sdk/src/main/java/com/gettyimages/api/Search/SearchImagesEditorial.java b/src/main/java/com/gettyimages/api/Search/SearchImagesEditorial.java similarity index 100% rename from gettyimagesapi-sdk/src/main/java/com/gettyimages/api/Search/SearchImagesEditorial.java rename to src/main/java/com/gettyimages/api/Search/SearchImagesEditorial.java diff --git a/gettyimagesapi-sdk/src/main/java/com/gettyimages/api/Search/SearchVideos.java b/src/main/java/com/gettyimages/api/Search/SearchVideos.java similarity index 100% rename from gettyimagesapi-sdk/src/main/java/com/gettyimages/api/Search/SearchVideos.java rename to src/main/java/com/gettyimages/api/Search/SearchVideos.java diff --git a/gettyimagesapi-sdk/src/main/java/com/gettyimages/api/Search/SearchVideosCreative.java b/src/main/java/com/gettyimages/api/Search/SearchVideosCreative.java similarity index 100% rename from gettyimagesapi-sdk/src/main/java/com/gettyimages/api/Search/SearchVideosCreative.java rename to src/main/java/com/gettyimages/api/Search/SearchVideosCreative.java diff --git a/gettyimagesapi-sdk/src/main/java/com/gettyimages/api/Search/SearchVideosEditorial.java b/src/main/java/com/gettyimages/api/Search/SearchVideosEditorial.java similarity index 100% rename from gettyimagesapi-sdk/src/main/java/com/gettyimages/api/Search/SearchVideosEditorial.java rename to src/main/java/com/gettyimages/api/Search/SearchVideosEditorial.java diff --git a/gettyimagesapi-sdk/src/main/java/com/gettyimages/api/StringHelper.java b/src/main/java/com/gettyimages/api/StringHelper.java similarity index 100% rename from gettyimagesapi-sdk/src/main/java/com/gettyimages/api/StringHelper.java rename to src/main/java/com/gettyimages/api/StringHelper.java diff --git a/gettyimagesapi-sdk/src/main/java/com/gettyimages/api/Token.java b/src/main/java/com/gettyimages/api/Token.java similarity index 100% rename from gettyimagesapi-sdk/src/main/java/com/gettyimages/api/Token.java rename to src/main/java/com/gettyimages/api/Token.java diff --git a/gettyimagesapi-sdk/src/main/java/com/gettyimages/api/Videos/Videos.java b/src/main/java/com/gettyimages/api/Videos/Videos.java similarity index 100% rename from gettyimagesapi-sdk/src/main/java/com/gettyimages/api/Videos/Videos.java rename to src/main/java/com/gettyimages/api/Videos/Videos.java diff --git a/gettyimagesapi-sdk/src/main/java/com/gettyimages/api/WebHelper.java b/src/main/java/com/gettyimages/api/WebHelper.java similarity index 100% rename from gettyimagesapi-sdk/src/main/java/com/gettyimages/api/WebHelper.java rename to src/main/java/com/gettyimages/api/WebHelper.java diff --git a/gettyimagesapi-sdk/src/test/java/AuthFailureTest.java b/src/test/java/AuthFailureTest.java similarity index 100% rename from gettyimagesapi-sdk/src/test/java/AuthFailureTest.java rename to src/test/java/AuthFailureTest.java diff --git a/gettyimagesapi-sdk/src/test/java/CustomRequestTest.java b/src/test/java/CustomRequestTest.java similarity index 100% rename from gettyimagesapi-sdk/src/test/java/CustomRequestTest.java rename to src/test/java/CustomRequestTest.java diff --git a/gettyimagesapi-sdk/src/test/java/DownloadImagesTest.java b/src/test/java/DownloadImagesTest.java similarity index 100% rename from gettyimagesapi-sdk/src/test/java/DownloadImagesTest.java rename to src/test/java/DownloadImagesTest.java diff --git a/gettyimagesapi-sdk/src/test/java/DownloadVideosTest.java b/src/test/java/DownloadVideosTest.java similarity index 100% rename from gettyimagesapi-sdk/src/test/java/DownloadVideosTest.java rename to src/test/java/DownloadVideosTest.java diff --git a/gettyimagesapi-sdk/src/test/java/ImagesTest.java b/src/test/java/ImagesTest.java similarity index 100% rename from gettyimagesapi-sdk/src/test/java/ImagesTest.java rename to src/test/java/ImagesTest.java diff --git a/gettyimagesapi-sdk/src/test/java/SearchImagesCreativeTest.java b/src/test/java/SearchImagesCreativeTest.java similarity index 100% rename from gettyimagesapi-sdk/src/test/java/SearchImagesCreativeTest.java rename to src/test/java/SearchImagesCreativeTest.java diff --git a/gettyimagesapi-sdk/src/test/java/SearchImagesEditorialTest.java b/src/test/java/SearchImagesEditorialTest.java similarity index 100% rename from gettyimagesapi-sdk/src/test/java/SearchImagesEditorialTest.java rename to src/test/java/SearchImagesEditorialTest.java diff --git a/gettyimagesapi-sdk/src/test/java/SearchImagesTest.java b/src/test/java/SearchImagesTest.java similarity index 100% rename from gettyimagesapi-sdk/src/test/java/SearchImagesTest.java rename to src/test/java/SearchImagesTest.java diff --git a/gettyimagesapi-sdk/src/test/java/SearchVideosCreativeTest.java b/src/test/java/SearchVideosCreativeTest.java similarity index 100% rename from gettyimagesapi-sdk/src/test/java/SearchVideosCreativeTest.java rename to src/test/java/SearchVideosCreativeTest.java diff --git a/gettyimagesapi-sdk/src/test/java/SearchVideosEditorialTest.java b/src/test/java/SearchVideosEditorialTest.java similarity index 100% rename from gettyimagesapi-sdk/src/test/java/SearchVideosEditorialTest.java rename to src/test/java/SearchVideosEditorialTest.java diff --git a/gettyimagesapi-sdk/src/test/java/SearchVideosTest.java b/src/test/java/SearchVideosTest.java similarity index 100% rename from gettyimagesapi-sdk/src/test/java/SearchVideosTest.java rename to src/test/java/SearchVideosTest.java diff --git a/gettyimagesapi-sdk/src/test/java/VideosTest.java b/src/test/java/VideosTest.java similarity index 100% rename from gettyimagesapi-sdk/src/test/java/VideosTest.java rename to src/test/java/VideosTest.java diff --git a/gettyimagesapi-sdk/src/test/resources/logback-test.xml b/src/test/resources/logback-test.xml similarity index 100% rename from gettyimagesapi-sdk/src/test/resources/logback-test.xml rename to src/test/resources/logback-test.xml