From b89467daad86141efb3d47a5054f27f706be0cf4 Mon Sep 17 00:00:00 2001 From: Mirko Friedenhagen Date: Tue, 22 Sep 2015 12:04:49 +0200 Subject: [PATCH 1/2] Stupid copy of the POM, the Maven build currently warns about a mismatch between module and the POM. --- foss-parent-spring-boot/pom.xml | 1236 +++++++++++++++++++++++++++++++ pom.xml | 4 +- 2 files changed, 1239 insertions(+), 1 deletion(-) create mode 100644 foss-parent-spring-boot/pom.xml diff --git a/foss-parent-spring-boot/pom.xml b/foss-parent-spring-boot/pom.xml new file mode 100644 index 0000000..543011d --- /dev/null +++ b/foss-parent-spring-boot/pom.xml @@ -0,0 +1,1236 @@ + + + 4.0.0 + + org.springframework.boot + spring-boot-starter-parent + 1.2.5.RELEASE + + net.oneandone.maven.poms + foss-parent-spring-boot + 1-SNAPSHOT + pom + 1-and-1 :: FOSS parent pom + + + Parent POM for 1-and-1 open source projects. + Defines often used dependencies and plugins. + + + http://1and1.github.io/foss-parent + + + 1&1 + https://1and1.github.com/ + + + + 2012 + + + 3.2.3 + + + + scm:git:git://github.com/1and1/foss-parent.git + scm:git:ssh://git@github.com/1and1/foss-parent.git + https://github.com/1and1/foss-parent/ + HEAD + + + + true + UTF-8 + UTF-8 + 1.7 + 1.7 + 7 + target/staging + + + clean + deploy + + + github.com + + + true + true + + + 1.8 + 2.5.4 + 2.2 + 2.11 + 2.15 + /net/oneandone/maven/poms/fossconfigs/checkstyle-ruleset.xml + /net/oneandone/maven/poms/fossconfigs/checkstyle-suppressions.xml + 2.6.1 + 3.3 + 2.10 + 2.8.2 + 1.4 + 2.18.1 + 1.6 + 2.2 + 1.10 + 2.5.2 + 3.4 + 3.4 + 2.8 + 2.6 + 2.10.3 + 2.4 + 2.5.2 + 2.7 + 3.4 + 1.9.4 + 1.1 + 2.4 + 2.18.1 + + + 1.10.b1 + /net/oneandone/maven/poms/fossconfigs/license-header.txt + 1.3 + 3.0.1 + net/oneandone/maven/poms/fossconfigs/findbugs-exclude.xml + 0.11 + github + 0.7.4.201502262128 + 2.0 + 0.3.1 + 2.2 + + + 1.6 + 1.0-beta-3 + 1.2 + 18.0 + 2.3.1 + 3.0 + 2.7 + 1.4 + 1.1.1 + 1.5.1 + 1.7 + 0.10.0 + 1.0 + 1.7.12 + 1.6 + + + 0.90 + 0.90 + 0.90 + 0.90 + 0.90 + 0.90 + + + + + The Apache Software License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + + + + + + + + junit + junit + 4.12 + test + + + org.hamcrest + hamcrest-all + 1.3 + test + + + org.hamcrest + hamcrest-core + 1.3 + test + + + org.mockito + mockito-core + 1.10.19 + test + + + org.mockito + mockito-all + 1.10.19 + test + + + + + joda-time + joda-time + ${joda-time.joda-time.version} + + + joda-time + joda-time-hibernate + ${joda-time.joda-time-hibernate.version} + + + joda-time + joda-time-jsptags + ${joda-time.joda-time-jsptags.version} + + + org.joda + joda-beans + ${org.joda.joda-beans.version} + + + org.joda + joda-convert + ${org.joda.joda-convert.version} + + + org.joda + joda-money + ${org.joda.joda-money.version} + + + org.joda + joda-primitives + ${org.joda.joda-primitives.version} + + + org.codehaus.plexus + plexus-utils + 3.0.22 + + + + + org.slf4j + slf4j-api + ${org.slf4j.version} + + + org.slf4j + jcl-over-slf4j + ${org.slf4j.version} + + + org.slf4j + log4j-over-slf4j + ${org.slf4j.version} + + + org.slf4j + jul-to-slf4j + ${org.slf4j.version} + + + commons-logging + commons-logging + 1.2 + + provided + + + ch.qos.logback + logback-classic + 1.1.3 + + test + + + ch.qos.logback + logback-core + 1.1.3 + + test + + + + + org.apache.maven + maven-artifact + 3.3.3 + + + org.apache.maven + maven-core + 3.3.3 + + + org.apache.maven.plugin-tools + maven-plugin-annotations + 3.4 + + + org.apache.maven + maven-artifact + + + + + org.apache.maven + maven-plugin-api + 3.3.3 + + + org.codehaus.plexus + plexus-component-annotations + 1.6 + + + junit + junit + + + + + org.apache.maven.scm + maven-scm + ${maven-scm-plugin.version} + + + + + com.google.code.gson + gson + ${gson.version} + + + com.google.guava + guava + ${guava.version} + + + com.google.inject + guice + ${guice.version} + + + + + org.apache.httpcomponents + httpclient + 4.4.1 + + + + commons-logging + commons-logging + + + + + org.apache.httpcomponents + httpclient-cache + 4.4.1 + + + org.apache.httpcomponents + httpcore + 4.4.1 + + + + + javax.inject + javax.inject + 1 + + + javax.activation + activation + 1.1.1 + + + javax.mail + mail + 1.5.0-b01 + + + javax.servlet + servlet-api + 3.0-alpha-1 + + + + + + GitHub + https://github.com/1and1/foss-parent/issues/ + + + Travis + https://travis-ci.org/1and1/foss-parent + + + + mifr + Mirko Friedenhagen + 1 & 1 Internet AG + ${project.url} + http://github.com/mfriedenhagen/ + +1 + + developer + project lead + + + + mlhartme + Michael Hartmeier + 1 & 1 Internet AG + ${project.url} + http://github.com/mlhartme/ + +1 + + developer + + + + + + + + org.apache.maven.plugins + maven-antrun-plugin + ${maven-antrun-plugin.version} + + + org.apache.maven.plugins + maven-assembly-plugin + ${maven-assembly-plugin.version} + + + org.apache.maven.plugins + maven-checkstyle-plugin + ${maven-checkstyle-plugin.version} + + false + ${maven-checkstyle-plugin.configLocation} + ${maven-checkstyle-plugin.suppressionsLocation} + + + + net.oneandone.maven.poms + foss-configs + ${foss-configs.version} + + + + + default-check + + check + + + + + + org.apache.maven.plugins + maven-clean-plugin + ${maven-clean-plugin.version} + + + org.apache.maven.plugins + maven-dependency-plugin + ${maven-dependency-plugin.version} + + + default-analyze-only + + analyze-only + + + + + + org.apache.maven.plugins + maven-gpg-plugin + ${maven-gpg-plugin.version} + + + org.apache.maven.plugins + maven-help-plugin + ${maven-help-plugin.version} + + + org.apache.maven.plugins + maven-install-plugin + ${maven-install-plugin.version} + + + org.apache.maven.plugins + maven-resources-plugin + ${maven-resources-plugin.version} + + + org.apache.maven.plugins + maven-compiler-plugin + ${maven-compiler-plugin.version} + + ${oneandone.java.source} + ${oneandone.java.target} + + + + com.mycila.maven-license-plugin + maven-license-plugin + ${maven-license-plugin.version} + +
${maven-license-plugin.header}
+ true + + src/**/*.java + + + + + net.oneandone.maven.poms + foss-configs + ${foss-configs.version} + + + + + org.codehaus.mojo + buildnumber-maven-plugin + ${buildnumber-maven-plugin.version} + + + default-create + + create + + + + UNKNOW_REVISION + true + + + + + + org.apache.maven.plugins + maven-jar-plugin + ${maven-jar-plugin.version} + + + + true + + + ${buildNumber} + + + + + + org.apache.maven.plugins + maven-source-plugin + ${maven-source-plugin.version} + + + default-jar-no-fork + + jar-no-fork + + + + default-test-jar-no-fork + + test-jar-no-fork + + + + + + org.apache.maven.plugins + maven-surefire-plugin + ${maven-surefire-plugin.version} + + + org.apache.maven.plugins + maven-failsafe-plugin + ${maven-failsafe-plugin.version} + + + default-integration-test + + integration-test + + + + default-verify + + verify + + + + + + org.apache.maven.plugins + maven-scm-plugin + ${maven-scm-plugin.version} + + + org.apache.maven.plugins + maven-scm-publish-plugin + ${maven-scm-publish-plugin.version} + true + + ${project.scm.developerConnection} + gh-pages + + + + org.apache.maven.plugins + maven-release-plugin + ${maven-release-plugin.version} + true + + + forked-path + true + + + + org.apache.maven.plugins + maven-javadoc-plugin + ${maven-javadoc-plugin.version} + + true + + http://docs.oracle.com/javase/${oneandone.java.docversion}/docs/api/ + http://junit-team.github.io/junit/javadoc/latest/ + http://www.slf4j.org/apidocs/ + + + + + default-jar + + jar + + + + + + org.apache.maven.plugins + maven-deploy-plugin + ${maven-deploy-plugin.version} + + + org.apache.maven.plugins + maven-changes-plugin + ${maven-changes-plugin.version} + + + default-cli + + + GitHub + + true + + ${project.issueManagement.url}?milestone=${milestone}&state=closed + ${project.scm.url}compare/${project.artifactId}-${previousVersion}...${project.artifactId}-${project.version} + + + + + + + org.apache.maven.plugins + maven-enforcer-plugin + ${maven-enforcer-plugin.version} + + + org.codehaus.mojo + extra-enforcer-rules + ${extra-enforcer-rules.version} + + + + + + true + + + [3.2.5,) + + + 1.7 + + + + true + No Snapshots Allowed! + + + project.version + "Project version must be specified." + .*(\d|-SNAPSHOT)$ + "Project version must end in a number or -SNAPSHOT." + \d.*$ + "Project version must start with a number." + + + project.scm.developerConnection + "project.scm.developerConnection must be specified." + scm:git:ssh://git@${gitHostName}/.*$ + "project.scm.developerConnection must start with + scm:git:ssh://git@${gitHostName}/" + + + + + + + default-enforce + + enforce + + + + + + org.apache.maven.plugins + maven-site-plugin + ${maven-site-plugin.version} + + + default-attach-descriptor + + attach-descriptor + + + + + + org.apache.maven.doxia + doxia-module-markdown + ${doxia-module-markdown.version} + + + + + org.apache.maven.plugins + maven-project-info-reports-plugin + ${maven-project-info-reports-plugin.version} + + + org.apache.maven.plugins + maven-plugin-plugin + ${maven-plugin-plugin.version} + + + org.codehaus.mojo + findbugs-maven-plugin + ${findbugs-maven-plugin.version} + + ${findbugs-maven-plugin.excludeFilterFile} + true + Low + Max + false + false + + + + default-check + + check + + + + + + net.rumati.maven.plugins + velocity-maven-plugin + ${velocity-maven-plugin.version} + + + net.oneandone.maven.poms + foss-configs + ${foss-configs.version} + + + + + org.apache.maven.plugins + maven-invoker-plugin + ${maven-invoker-plugin.version} + + ${project.build.directory}/it + true + true + verify + true + + + + integration-test + + install + run + + + false + false + + + + + + org.codehaus.plexus + plexus-component-metadata + ${plexus-component-metadata.version} + + + org.apache.maven.plugins + maven-pmd-plugin + ${maven-pmd-plugin.version} + + true + 100 + ${oneandone.java.target} + false + + + + default-check + + check + + + + default-cpd-check + + cpd-check + + + + + + org.jacoco + jacoco-maven-plugin + ${jacoco-maven-plugin.version} + true + + + default-prepare-agent + + prepare-agent + + + + default-report + + report + + + + + + + + + CLASS + ${jacoco.check.classRatio} + + + INSTRUCTION + ${jacoco.check.instructionRatio} + + + METHOD + ${jacoco.check.methodRatio} + + + BRANCH + ${jacoco.check.branchRatio} + + + COMPLEXITY + ${jacoco.check.complexityRatio} + + + LINE + ${jacoco.check.lineRatio} + + + + + + + + com.github.github + site-maven-plugin + ${github-site-plugin.version} + + Creating site for ${project.version} + + + + org.codehaus.mojo + versions-maven-plugin + ${versions-maven-plugin.version} + + false + + + commons-logging:commons-logging:*:99.0-does-not-exist + + junit:junit:*:*-beta* + org.apache.httpcomponents:*:*:4.4-alpha* + org.apache.httpcomponents:*:*:4.4-beta* + org.mockito:*:*:*-beta* + + *:*:*:*atlassian* + + + + guice.version + [3.0,4.0-!) + + + com.google.inject + guice + + + + + false + + + + + + + org.apache.maven.plugins + maven-enforcer-plugin + + + org.apache.maven.plugins + maven-failsafe-plugin + + + org.jacoco + jacoco-maven-plugin + + + + + + net.oneandone.maven.poms + foss-configs + ${foss-configs.version} + + + + + + release-sign-artifacts + + + performRelease + true + + + + + + org.apache.maven.plugins + maven-gpg-plugin + + + sign-artifacts + verify + + sign + + + + + + com.mycila.maven-license-plugin + maven-license-plugin + + + + check + + + + + + + + + foss-parent-run-its + + + src/it + + + + + + org.apache.maven.plugins + maven-invoker-plugin + + + + + + + org.apache.maven.plugins + maven-invoker-plugin + ${maven-invoker-plugin.version} + + + + + + foss-parent-jenkins-description + + + env.JOB_URL + + + + + + net.rumati.maven.plugins + velocity-maven-plugin + + + foss-parent-jenkins-description + validate + + velocity + + + + target/jenkins-description.html + + + + + + + + + foss-parent-verification + + + performRelease + true + + + + + + org.codehaus.mojo + buildnumber-maven-plugin + + + org.apache.maven.plugins + maven-checkstyle-plugin + + + org.apache.maven.plugins + maven-dependency-plugin + + + org.apache.maven.plugins + maven-javadoc-plugin + + + org.apache.maven.plugins + maven-pmd-plugin + + + org.apache.maven.plugins + maven-source-plugin + + + org.apache.maven.plugins + maven-site-plugin + + + org.codehaus.mojo + findbugs-maven-plugin + + + org.jacoco + jacoco-maven-plugin + + + + default-check + + check + + + + + + + + + + org.apache.maven.plugins + maven-jxr-plugin + ${maven-jxr-plugin.version} + + + org.apache.maven.plugins + maven-changes-plugin + ${maven-changes-plugin.version} + + + + github-report + + + + + + org.apache.maven.plugins + maven-checkstyle-plugin + ${maven-checkstyle-plugin.version} + + xml + false + ${maven-checkstyle-plugin.configLocation} + ${maven-checkstyle-plugin.suppressionsLocation} + + + + org.apache.maven.plugins + maven-pmd-plugin + ${maven-pmd-plugin.version} + + true + 100 + ${oneandone.java.target} + false + + + + org.apache.maven.plugins + maven-javadoc-plugin + ${maven-javadoc-plugin.version} + + + default + + true + true + false + false + + http://docs.oracle.com/javase/${oneandone.java.docversion}/docs/api/ + http://junit-team.github.io/junit/javadoc/latest/ + http://www.slf4j.org/apidocs/ + + + + javadoc-no-fork + test-javadoc-no-fork + + + + + + org.apache.maven.plugins + maven-surefire-report-plugin + ${maven-surefire-plugin.version} + + + true + + report-only + failsafe-report-only + + + + + + org.codehaus.mojo + jdepend-maven-plugin + ${jdepend-maven-plugin.version} + + + true + + generate-no-fork + + + + + + org.codehaus.mojo + findbugs-maven-plugin + ${findbugs-maven-plugin.version} + + ${findbugs-maven-plugin.excludeFilterFile} + true + Low + Max + false + false + + + + org.jacoco + jacoco-maven-plugin + ${jacoco-maven-plugin.version} + + + org.codehaus.mojo + versions-maven-plugin + ${versions-maven-plugin.version} + + + + + + + + github + maven-reports at github + https://github.com/1and1/foss-parent + + + sonatype-nexus-snapshots + https://oss.sonatype.org/content/repositories/snapshots/ + + + sonatype-nexus-staging + https://oss.sonatype.org/service/local/staging/deploy/maven2/ + + + diff --git a/pom.xml b/pom.xml index 97125b4..7dc87eb 100644 --- a/pom.xml +++ b/pom.xml @@ -25,7 +25,9 @@ 3.2.3 - + + foss-parent-spring-boot + scm:git:git://github.com/1and1/foss-parent.git scm:git:ssh://git@github.com/1and1/foss-parent.git From ba6127af5afe4ba3247daa2f76a4d5ead57b0e59 Mon Sep 17 00:00:00 2001 From: Mirko Friedenhagen Date: Sun, 27 Sep 2015 21:35:14 +0200 Subject: [PATCH 2/2] Use Maven 3.3.3 --- .travis.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 0cb6804..adbc742 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,8 +4,10 @@ env: JOB_URL=http://jenkins.example.com/ci/ jdk: - oraclejdk7 - oraclejdk8 -install: "mvn --activate-profiles foss-parent-verification --show-version --errors --batch-mode validate dependency:go-offline" -script: "mvn --activate-profiles foss-parent-verification --show-version --errors --batch-mode -Dversions.skip=true clean verify site" +install: + - "mvn -N io.takari:maven:wrapper -Dmaven=3.3.3" + - "./mvnw --activate-profiles foss-parent-verification --show-version --errors --batch-mode validate dependency:go-offline" +script: "./mvnw --activate-profiles foss-parent-verification --show-version --errors --batch-mode -Dversions.skip=true clean verify site" cache: directories: - $HOME/.m2