From af8d48c797f27b6c3fff154bc803eb29e7ecffe3 Mon Sep 17 00:00:00 2001 From: Filip Hrisafov Date: Thu, 7 Sep 2017 17:47:18 +0200 Subject: [PATCH] #1281 Do not depend on deprecated sonatype parent --- build-config/pom.xml | 14 ++------ core-common/pom.xml | 8 +---- integrationtest/pom.xml | 8 +---- parent/pom.xml | 74 +++++++++++++++++++++++++++++++---------- pom.xml | 10 ++---- 5 files changed, 65 insertions(+), 49 deletions(-) diff --git a/build-config/pom.xml b/build-config/pom.xml index f85705884..da667708b 100644 --- a/build-config/pom.xml +++ b/build-config/pom.xml @@ -33,15 +33,7 @@ jar MapStruct Build Configuration - - - - org.apache.maven.plugins - maven-deploy-plugin - - true - - - - + + true + diff --git a/core-common/pom.xml b/core-common/pom.xml index d5555f922..bbc08622a 100644 --- a/core-common/pom.xml +++ b/core-common/pom.xml @@ -35,6 +35,7 @@ true + true @@ -65,13 +66,6 @@ - - org.apache.maven.plugins - maven-deploy-plugin - - true - - diff --git a/integrationtest/pom.xml b/integrationtest/pom.xml index 0b8fb827c..d066c5e59 100644 --- a/integrationtest/pom.xml +++ b/integrationtest/pom.xml @@ -35,6 +35,7 @@ ${project.version} + true @@ -79,13 +80,6 @@ 1.8 - - org.apache.maven.plugins - maven-deploy-plugin - - true - - org.apache.maven.plugins maven-surefire-plugin diff --git a/parent/pom.xml b/parent/pom.xml index 07f19905c..e3cec2119 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -22,13 +22,6 @@ 4.0.0 - - org.sonatype.oss - oss-parent - 7 - - - org.mapstruct mapstruct-parent 1.2.0-SNAPSHOT @@ -44,7 +37,7 @@ 1.0.0 1.2 2.19.1 - 2.10.3 + 3.0.0-M1 4.0.3.RELEASE 0.26.0 7.2 @@ -77,14 +70,27 @@ HEAD + + + sonatype-nexus-staging + Nexus Release Repository + https://oss.sonatype.org/service/local/staging/deploy/maven2/ + + + sonatype-nexus-snapshots + Sonatype Nexus Snapshots + https://oss.sonatype.org/content/repositories/snapshots/ + + + GitHub Issues https://github.com/mapstruct/mapstruct/issues - Jenkins - https://mapstruct.ci.cloudbees.com/ + Travis CI + https://travis-ci.org/mapstruct/mapstruct @@ -317,6 +323,14 @@ org.apache.maven.plugins maven-deploy-plugin 2.8.2 + + true + + + + org.apache.maven.plugins + maven-gpg-plugin + 1.6 org.apache.maven.plugins @@ -352,7 +366,7 @@ org.apache.maven.plugins maven-jar-plugin - 2.4 + 3.0.2 org.apache.maven.plugins @@ -366,14 +380,16 @@ org.apache.maven.plugins maven-release-plugin - 2.5.1 + 2.5.3 - -Psonatype-oss-release -DskipTests ${add.release.arguments} + -DskipTests ${add.release.arguments} clean install false true @{project.version} true + false + release @@ -384,12 +400,12 @@ org.apache.maven.plugins maven-source-plugin - 2.2.1 + 3.0.1 org.apache.maven.plugins maven-site-plugin - 3.3 + 3.6 org.apache.maven.plugins @@ -661,13 +677,24 @@ - sonatype-oss-release + release + + org.apache.maven.plugins + maven-source-plugin + + + attach-sources + + jar-no-fork + + + + org.apache.maven.plugins maven-javadoc-plugin - ${org.apache.maven.plugins.javadoc.version} attach-javadocs @@ -677,6 +704,19 @@ + + org.apache.maven.plugins + maven-gpg-plugin + + + sign-artifacts + verify + + sign + + + + diff --git a/pom.xml b/pom.xml index 63b61ce43..c523ce0b0 100644 --- a/pom.xml +++ b/pom.xml @@ -43,16 +43,12 @@ processor integrationtest + + true + - - org.apache.maven.plugins - maven-deploy-plugin - - true - - com.mycila.maven-license-plugin maven-license-plugin