diff --git a/.travis.deploy.artifacts.sh b/.travis.deploy.artifacts.sh deleted file mode 100644 index d6f9804c..00000000 --- a/.travis.deploy.artifacts.sh +++ /dev/null @@ -1,5 +0,0 @@ -PROJECT_VERSION=$(mvn org.apache.maven.plugins:maven-help-plugin:evaluate -Dexpression=project.version -B | grep -v '\[') -if [[ "$PROJECT_VERSION" =~ .*SNAPSHOT ]] && [[ "${TRAVIS_BRANCH}" =~ ^master$|^[0-9]+\.[0-9]+$ ]] && [[ "${TRAVIS_PULL_REQUEST}" = "false" ]]; -then - mvn deploy -s .travis.maven.settings.xml -DskipTests -B; -fi diff --git a/.travis.maven.settings.xml b/.travis.maven.settings.xml index cd8c4445..4561e311 100644 --- a/.travis.maven.settings.xml +++ b/.travis.maven.settings.xml @@ -7,9 +7,9 @@ - sonatype-nexus-snapshots - ${env.SONATYPE_NEXUS_USERNAME} - ${env.SONATYPE_NEXUS_PASSWORD} + vertx-snapshots-repository + ${env.VERTX_NEXUS_USERNAME} + ${env.VERTX_NEXUS_PASSWORD} diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 50fa323b..00000000 --- a/.travis.yml +++ /dev/null @@ -1,28 +0,0 @@ -language: java -branches: - only: - - master - - /^\d+\.\d+$/ -services: -- docker -jobs: - include: - - stage: test - name: "OpenJDK 8" - jdk: openjdk8 - script: mvn -q clean verify -B && mvn -P testNativeTransport -q clean verify -B -# - if: type != pull_request -# name: "OpenJDK 11" -# jdk: openjdk11 -# script: mvn -q clean verify -B - - stage: deploy - name: "Deploy to Sonatype's snapshots repository" - jdk: openjdk8 - if: type != pull_request AND env(SONATYPE_NEXUS_USERNAME) IS present - script: bash .travis.deploy.artifacts.sh -notifications: - email: - recipients: - - secure: "GPQz+JoRrZ1zEWrScvl8hxDZzr5fZAAGCteqXDygmRQD36vnzKhrB6w6BB8FcVkQC+ZXMVg8eGnHOERs8uy6vM8DMj76hMZaKanQTinFe7Zt9oEInVOTF7GBfcdiQtmEqYQjyhfg9K0sdQjscfr1HPlr3DqYw3WIK7dyl9OxUvY=" - on_success: always - on_failure: always diff --git a/pom.xml b/pom.xml index 4f3b52f6..b8b90972 100644 --- a/pom.xml +++ b/pom.xml @@ -1,50 +1,84 @@ - - io.vertx - vertx-ext-parent - 34 - - - pom - 4.0.0 - - vertx-mysql-postgresql-client-parent - 3.8.6-SNAPSHOT - - Vert.x MySQL/PostgreSQL Client Parent - - - 3.8.6-SNAPSHOT - true - - - - - spring-repo - Spring Repository - https://repo.spring.io/libs-milestone - - - jcenter - https://jcenter.bintray.com/ - - - - - - + + + io.vertx - vertx-dependencies - ${stack.version} - pom - import - - - - - - vertx-mysql-postgresql-client-jasync - vertx-mysql-postgresql-client-scala - + + vertx-ext-parent + + 38 + + + + pom + + 4.0.0 + + vertx-mysql-postgresql-client-parent + + 3.9.17-SNAPSHOT + + Vert.x MySQL/PostgreSQL Client Parent + + + + 3.9.17-SNAPSHOT + + true + + + + + + + + spring-repo + + Spring Repository + + https://repo.spring.io/libs-milestone + + + + + + jcenter + + https://jcenter.bintray.com/ + + + + + + + + + + + + io.vertx + + vertx-dependencies + + ${stack.version} + + pom + + import + + + + + + + + + + vertx-mysql-postgresql-client-jasync + + vertx-mysql-postgresql-client-scala + + + diff --git a/vertx-mysql-postgresql-client-jasync/pom.xml b/vertx-mysql-postgresql-client-jasync/pom.xml index 5988f6c7..e5ede69c 100644 --- a/vertx-mysql-postgresql-client-jasync/pom.xml +++ b/vertx-mysql-postgresql-client-jasync/pom.xml @@ -4,7 +4,7 @@ io.vertx vertx-mysql-postgresql-client-parent ../ - 3.8.6-SNAPSHOT + 3.9.17-SNAPSHOT 4.0.0 @@ -85,7 +85,7 @@ junit junit test - 4.12 + 4.13.1 com.jayway.awaitility diff --git a/vertx-mysql-postgresql-client-scala/pom.xml b/vertx-mysql-postgresql-client-scala/pom.xml index 9ffa192a..3ce97aa8 100644 --- a/vertx-mysql-postgresql-client-scala/pom.xml +++ b/vertx-mysql-postgresql-client-scala/pom.xml @@ -4,13 +4,13 @@ io.vertx vertx-mysql-postgresql-client-parent ../ - 3.8.6-SNAPSHOT + 3.9.17-SNAPSHOT 4.0.0 vertx-mysql-postgresql-client - 3.8.6-SNAPSHOT + 3.9.17-SNAPSHOT Vert.x MySQL/PostgreSQL Client based on Scala @@ -103,7 +103,7 @@ junit junit test - 4.12 + 4.13.1 com.jayway.awaitility