diff --git a/.travis.yml b/.travis.yml index b77195632..165902c53 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,16 @@ +sudo: required dist: trusty +env: + global: + - secure: Izz+xWjTzSTMwJZJ0eFGVk0YTWnDWbXfqn3KShzevSeUIm/qxrGs9by/ATc1OouvM209ZLAKu6QBamrOEztfswZFFOgE2bNoF62Wh8X4rpeKBXrrqbsMZigcV4Y1dt/cMxioCLNSdEerQ252RWL8ILNW6zEo5/Tg82/sZmudIjE= + - secure: by3EqA+ceJedtsog127U7eqyZMMokxiSJuFwS9XUQ81BqvThmxNOu6ZS+oE1XC0XHJ5dfzO1bWlzedChP1bSM8Tq+tmeddtnbMgcdLDgQD2tLSncVBZerjJuN4P+wVOVKHjK0uaXKxH3To1q3psSxAPUJF0Hem6BOOeZoFZsui4= + - secure: ipsjLktGbYJhOu6aEuikws80SRfKxQ17I4Vyn92DRh6T/itITBzf8npH5hvPC/A1kUct3ZcxibkMFmC9DZ5qJrMeR2jSYRY2UW3GDAeNBal1flQAItGwcTuDVrxowS5d1QhCT0I/oMZNCScRkgLorZARCd62vGqD8xQCvMXlqis= + - secure: NESSqQhlo74FQix3wQNU1Gatk1igv3w4o0EIfQq5aXEEGoaLdDnF2hGdivkEINYzM3pEU6cpy5+N+njcONGKS9NnBEe8tA2Ngk1cKW+I/rScwS4jCBbA7FpdOagecWB3kb62uL8qS7Iu50v6HrKPjakioFwm9gAu2TE8WLgx0Pg= language: java jdk: - oraclejdk8 +before_install: +- bash .travis/deploy-codesigning.sh install: - java -version && javac -version && mvn -version -B before_script: @@ -10,6 +19,10 @@ script: - mvn clean install -B after_success: - mvn test -Dtest=PerformanceTest -DfailIfNoTests=false -DargLine="-DnumIters=25000" +deploy: + provider: script + script: bash .travis/deploy.sh + skip_cleanup: true cache: directories: - $HOME/.m2 diff --git a/.travis/codesigning.asc.enc b/.travis/codesigning.asc.enc new file mode 100644 index 000000000..a39712f73 Binary files /dev/null and b/.travis/codesigning.asc.enc differ diff --git a/.travis/deploy-codesigning.sh b/.travis/deploy-codesigning.sh new file mode 100644 index 000000000..7f4de9edd --- /dev/null +++ b/.travis/deploy-codesigning.sh @@ -0,0 +1,10 @@ +#!/usr/bin/env bash + +echo "Deploying code signing key..." + +cd ./.travis || exit + +openssl aes-256-cbc -K "$encrypted_1b2eb614f966_key" -iv "$encrypted_1b2eb614f966_iv" -in codesigning.asc.enc -out codesigning.asc -d +gpg --fast-import codesigning.asc + +cd ../ || exit diff --git a/.travis/deploy-settings.xml b/.travis/deploy-settings.xml new file mode 100644 index 000000000..b28d6c12a --- /dev/null +++ b/.travis/deploy-settings.xml @@ -0,0 +1,22 @@ + + + + ossrh + ${env.SONATYPE_USERNAME} + ${env.SONATYPE_PASSWORD} + + + + + ossrh + + true + + + gpg + ${env.GPG_KEY_NAME} + ${env.GPG_PASSPHRASE} + + + + diff --git a/.travis/deploy.sh b/.travis/deploy.sh new file mode 100644 index 000000000..b8d665e59 --- /dev/null +++ b/.travis/deploy.sh @@ -0,0 +1,7 @@ +#!/usr/bin/env bash + +if [[ "${TRAVIS_BRANCH}" = "master" ]] && [[ "${TRAVIS_PULL_REQUEST}" = "false" ]]; +then + echo "About to deploy..." + mvn deploy -B -Prelease-ossrh -DskipTests --settings .travis/deploy-settings.xml +fi diff --git a/bom-dependencies/pom.xml b/bom-dependencies/pom.xml index 235eac652..217924ae9 100644 --- a/bom-dependencies/pom.xml +++ b/bom-dependencies/pom.xml @@ -22,7 +22,7 @@ 4.0.0 - net.sf.dozer + com.github.dozermapper dozer-parent 6.0.0-SNAPSHOT ../ diff --git a/building-tools/pom.xml b/building-tools/pom.xml index 1bf399fd8..250ccd2c5 100644 --- a/building-tools/pom.xml +++ b/building-tools/pom.xml @@ -21,7 +21,7 @@ 4.0.0 - net.sf.dozer + com.github.dozermapper dozer-parent 6.0.0-SNAPSHOT diff --git a/core/pom.xml b/core/pom.xml index 4740fee83..090ee950f 100755 --- a/core/pom.xml +++ b/core/pom.xml @@ -22,13 +22,13 @@ 4.0.0 - net.sf.dozer + com.github.dozermapper dozer-plugins-parent 6.0.0-SNAPSHOT ../plugins-parent - dozer + dozer-core bundle Dozer :: Core diff --git a/osgi-test/pom.xml b/osgi-test/pom.xml index 300d9267b..1d5240124 100644 --- a/osgi-test/pom.xml +++ b/osgi-test/pom.xml @@ -22,7 +22,7 @@ 4.0.0 - net.sf.dozer + com.github.dozermapper dozer-plugins-parent 6.0.0-SNAPSHOT ../plugins-parent diff --git a/plugins-parent/pom.xml b/plugins-parent/pom.xml index 52c1ecb15..d3c22de8c 100644 --- a/plugins-parent/pom.xml +++ b/plugins-parent/pom.xml @@ -22,7 +22,7 @@ 4.0.0 - net.sf.dozer + com.github.dozermapper dozer-parent 6.0.0-SNAPSHOT ../ @@ -57,7 +57,6 @@ 1.6.0 3.0.4 2.3.1 - 2.3 2.3.3 @@ -218,11 +217,6 @@ jaxb2-maven-plugin ${jaxb2-maven-plugin.version} - - org.codehaus.mojo - versions-maven-plugin - ${versions-maven-plugin.version} - org.codehaus.mojo xmlbeans-maven-plugin @@ -342,7 +336,7 @@ findbugs-maven-plugin - net.sf.dozer + com.github.dozermapper building-tools ${building-tools.version} compile @@ -368,7 +362,7 @@ maven-checkstyle-plugin - net.sf.dozer + com.github.dozermapper building-tools ${building-tools.version} compile diff --git a/pom.xml b/pom.xml index b61fa3701..65b2e1857 100644 --- a/pom.xml +++ b/pom.xml @@ -21,20 +21,25 @@ 4.0.0 - net.sf.dozer + + org.sonatype.oss + oss-parent + 9 + + + com.github.dozermapper dozer-parent pom 6.0.0-SNAPSHOT - http://dozer.sourceforge.net Dozer :: Parent Dozer is a powerful Java Bean to Java Bean mapper that recursively copies data from one object to another - 2005 dozer https://github.com/DozerMapper/dozer + 2005 Apache License, Version 2.0 @@ -95,6 +100,8 @@ 3.0.0 1.6 3.0 + 1.6.7 + 2.3 6.0.0-SNAPSHOT @@ -113,11 +120,21 @@ maven-gpg-plugin ${maven-gpg-plugin.version} + + org.codehaus.mojo + versions-maven-plugin + ${versions-maven-plugin.version} + com.mycila license-maven-plugin ${license-maven-plugin.version} + + org.sonatype.plugins + nexus-staging-maven-plugin + ${nexus-staging-maven-plugin.version} + @@ -138,6 +155,7 @@ docs/** website/** + .travis/** LICENSE-HEADER.txt LICENSE.md README.md @@ -178,15 +196,10 @@ - release-sign-artifacts - - - performRelease - true - - + release-ossrh + org.apache.maven.plugins maven-gpg-plugin @@ -200,8 +213,40 @@ + + org.apache.maven.plugins + maven-javadoc-plugin + + + attach-javadocs + + jar + + + + + + org.codehaus.mojo + versions-maven-plugin + + + org.sonatype.plugins + nexus-staging-maven-plugin + true + + ossrh + https://oss.sonatype.org/ + true + + + + + ossrh + https://oss.sonatype.org/content/repositories/snapshots + + diff --git a/proto/pom.xml b/proto/pom.xml index 8abdb9d3a..f5d48cbf5 100755 --- a/proto/pom.xml +++ b/proto/pom.xml @@ -22,7 +22,7 @@ 4.0.0 - net.sf.dozer + com.github.dozermapper dozer-plugins-parent 6.0.0-SNAPSHOT ../plugins-parent diff --git a/spring/pom.xml b/spring/pom.xml index 1c89c8d4e..f6cb6fc6d 100644 --- a/spring/pom.xml +++ b/spring/pom.xml @@ -22,7 +22,7 @@ 4.0.0 - net.sf.dozer + com.github.dozermapper dozer-plugins-parent 6.0.0-SNAPSHOT ../plugins-parent