diff --git a/pom.xml b/pom.xml index 1c085912..a4f6b471 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 org.springframework.cloud - spring-cloud-parent + spring-cloud-build 1.1.0.BUILD-SNAPSHOT pom Spring Cloud Parent @@ -14,11 +14,73 @@ - spring-cloud-build + spring-cloud-dependencies-parent 1.16.6 + UTF-8 + 1.7 + ${basedir} + ${project.artifactId} + + Pivotal Software, Inc. + http://www.spring.io + + + + Apache License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0 + +Copyright 2014-2015 the original author or authors. + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or +implied. + +See the License for the specific language governing permissions and +limitations under the License. + + + + + https://github.com/spring-cloud/spring-cloud-build + scm:git:git://github.com/spring-cloud/spring-cloud-build.git + scm:git:ssh://git@github.com/spring-cloud/spring-cloud-build.git + HEAD + + + + dsyer + Dave Syer + dsyer at pivotal.io + Pivotal Software, Inc. + http://www.spring.io + + Project lead + + + + sgibb + Spencer Gibb + sgibb at pivotal.io + Pivotal Software, Inc. + http://www.spring.io + + Project lead + + + + + 3.0.0 + @@ -33,27 +95,25 @@ - - - central - - - - org.apache.maven.plugins - maven-gpg-plugin - - - sign-artifacts - verify - - sign - - - - - - - + + https://github.com/spring-cloud + + spring-docs + scp://static.springframework.org/var/www/domains/springframework.org/static/htdocs/spring-cloud/docs/${project.artifactId}/${project.version} + + + + repo.spring.io + Spring Release Repository + https://repo.spring.io/libs-release-local + + + repo.spring.io + Spring Snapshot Repository + https://repo.spring.io/libs-snapshot-local + + + spring @@ -101,5 +161,334 @@ - + + milestone + + + repo.spring.io + Spring Milestone Repository + https://repo.spring.io/libs-milestone-local + + + + + bintray + + + bintray + Jcenter Repository + https://api.bintray.com/maven/spring/jars/org.springframework.cloud:${bintray.package} + + + + + central + + + + org.apache.maven.plugins + maven-gpg-plugin + + + sign-artifacts + verify + + sign + + + + + + + + + sonatype-nexus-snapshots + Sonatype Nexus Snapshots + https://oss.sonatype.org/content/repositories/snapshots/ + + + sonatype-nexus-staging + Nexus Release Repository + https://oss.sonatype.org/service/local/staging/deploy/maven2/ + + + + + java8 + + [1.8,) + + + + + maven-javadoc-plugin + + -Xdoclint:none + + + + + + + imports + + + !windows + + + .google + + + project.packaging + jar + + + + + + org.codehaus.mojo + exec-maven-plugin + + + imports + process-sources + + egrep + + 1 + + + -rm + 1 + + ^import com.google + + --include=*.java + + ${project.basedir} + + + + exec + + + + + + + + + java7 + + + .jdk8 + + + + + + org.codehaus.mojo + animal-sniffer-maven-plugin + 1.14 + + + org.codehaus.mojo.signature + java17 + 1.0 + + + + + enforce-java-7 + test + + check + + + + + + + + + docs + + + + + org.asciidoctor + asciidoctor-maven-plugin + 1.5.2 + + + generate-docs + process-resources + + process-asciidoc + + + ${docs.main}.adoc + html + article + + true + ${project.version} + + + + + + + org.apache.maven.plugins + maven-antrun-plugin + + + ant-contrib + ant-contrib + 1.0b3 + + + ant + ant + + + + + org.apache.ant + ant-nodeps + 1.8.1 + + + org.tigris.antelope + antelopetasks + 3.2.10 + + + org.jruby + jruby-complete + 1.7.17 + + + org.asciidoctor + asciidoctorj + 1.5.2 + + + + + readme + process-resources + + run + + + + + + + + + + + + + package-and-attach-docs-zip + package + + run + + + + + + + + + + + setup-maven-properties + validate + + run + + + true + + + + + + + + + + + + + + + + + + + + org.jfrog.buildinfo + artifactory-maven-plugin + 2.2.1 + + + build-info + + publish + + + + true + docs + + + https://repo.spring.io + libs-release-local + libs-snapshots-local + + + + + + + org.codehaus.mojo + build-helper-maven-plugin + + + attach-zip + + attach-artifact + + + true + + + ${project.build.directory}/${project.artifactId}-${project.version}.zip + zip + + + + + + + + + + + diff --git a/spring-cloud-build/pom.xml b/spring-cloud-build/pom.xml deleted file mode 100644 index d079b553..00000000 --- a/spring-cloud-build/pom.xml +++ /dev/null @@ -1,532 +0,0 @@ - - - 4.0.0 - spring-cloud-build - pom - Spring Cloud Build - Spring Cloud Build - http://projects.spring.io/spring-cloud/ - - org.springframework.cloud - spring-cloud-parent - 1.1.0.BUILD-SNAPSHOT - - - Pivotal Software, Inc. - http://www.spring.io - - - - Apache License, Version 2.0 - http://www.apache.org/licenses/LICENSE-2.0 - -Copyright 2014-2015 the original author or authors. - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or -implied. - -See the License for the specific language governing permissions and -limitations under the License. - - - - - https://github.com/spring-cloud/spring-cloud-build - scm:git:git://github.com/spring-cloud/spring-cloud-build.git - scm:git:ssh://git@github.com/spring-cloud/spring-cloud-build.git - HEAD - - - - dsyer - Dave Syer - dsyer at pivotal.io - Pivotal Software, Inc. - http://www.spring.io - - Project lead - - - - sgibb - Spencer Gibb - sgibb at pivotal.io - Pivotal Software, Inc. - http://www.spring.io - - Project lead - - - - - 3.0.0 - - - UTF-8 - 1.7 - ${basedir} - ${project.artifactId} - - - - - maven-javadoc-plugin - - - javadoc - - jar - - package - - - - true - - - - maven-source-plugin - - - attach-sources - - jar - - package - - - - - - - - org.apache.maven.plugins - maven-antrun-plugin - 1.7 - - - com.google.code.maven-replacer-plugin - replacer - 1.5.3 - - - org.asciidoctor - asciidoctor-maven-plugin - 1.5.2 - - - org.apache.maven.plugins - maven-surefire-plugin - 2.17 - - true - - - - - org.eclipse.m2e - lifecycle-mapping - 1.0.0 - - - - - - - org.codehaus.mojo - - - exec-maven-plugin - - - [1.3.2,) - - - exec - - - - - - - - - org.codehaus.gmavenplus - gmavenplus-plugin - [1.4,) - - testCompile - - - - - - - - - - - - - - - - - org.apache.maven.plugins - maven-javadoc-plugin - 2.10.1 - - - http://docs.oracle.com/javase/7/docs/api/ - http://docs.oracle.com/javaee/7/api/ - http://fasterxml.github.com/jackson-core/javadoc/2.0.0/ - http://docs.spring.io/spring/docs/4.1.x/javadoc-api/ - - true -
${project.name}
- - - - - - https://github.com/spring-cloud - - spring-docs - scp://static.springframework.org/var/www/domains/springframework.org/static/htdocs/spring-cloud/docs/${project.artifactId}/${project.version} - - - - repo.spring.io - Spring Release Repository - https://repo.spring.io/libs-release-local - - - repo.spring.io - Spring Snapshot Repository - https://repo.spring.io/libs-snapshot-local - - - - - milestone - - - repo.spring.io - Spring Milestone Repository - https://repo.spring.io/libs-milestone-local - - - - - bintray - - - bintray - Jcenter Repository - https://api.bintray.com/maven/spring/jars/org.springframework.cloud:${bintray.package} - - - - - central - - - sonatype-nexus-snapshots - Sonatype Nexus Snapshots - https://oss.sonatype.org/content/repositories/snapshots/ - - - sonatype-nexus-staging - Nexus Release Repository - https://oss.sonatype.org/service/local/staging/deploy/maven2/ - - - - - java8 - - [1.8,) - - - - - maven-javadoc-plugin - - -Xdoclint:none - - - - - - - imports - - - !windows - - - .google - - - project.packaging - jar - - - - - - org.codehaus.mojo - exec-maven-plugin - - - imports - process-sources - - egrep - - 1 - - - -rm - 1 - - ^import com.google - - --include=*.java - - ${project.basedir} - - - - exec - - - - - - - - - java7 - - - .jdk8 - - - - - - org.codehaus.mojo - animal-sniffer-maven-plugin - 1.14 - - - org.codehaus.mojo.signature - java17 - 1.0 - - - - - enforce-java-7 - test - - check - - - - - - - - - docs - - - - - org.asciidoctor - asciidoctor-maven-plugin - 1.5.2 - - - generate-docs - process-resources - - process-asciidoc - - - ${docs.main}.adoc - html - article - - true - ${project.version} - - - - - - - org.apache.maven.plugins - maven-antrun-plugin - - - ant-contrib - ant-contrib - 1.0b3 - - - ant - ant - - - - - org.apache.ant - ant-nodeps - 1.8.1 - - - org.tigris.antelope - antelopetasks - 3.2.10 - - - org.jruby - jruby-complete - 1.7.17 - - - org.asciidoctor - asciidoctorj - 1.5.2 - - - - - readme - process-resources - - run - - - - - - - - - - - - - package-and-attach-docs-zip - package - - run - - - - - - - - - - - setup-maven-properties - validate - - run - - - true - - - - - - - - - - - - - - - - - - - - org.jfrog.buildinfo - artifactory-maven-plugin - 2.2.1 - - - build-info - - publish - - - - true - docs - - - https://repo.spring.io - libs-release-local - libs-snapshots-local - - - - - - - org.codehaus.mojo - build-helper-maven-plugin - - - attach-zip - - attach-artifact - - - true - - - ${project.build.directory}/${project.artifactId}-${project.version}.zip - zip - - - - - - - - - - - - diff --git a/spring-cloud-build/Guardfile b/spring-cloud-dependencies-parent/Guardfile similarity index 100% rename from spring-cloud-build/Guardfile rename to spring-cloud-dependencies-parent/Guardfile diff --git a/spring-cloud-build/README.adoc b/spring-cloud-dependencies-parent/README.adoc similarity index 100% rename from spring-cloud-build/README.adoc rename to spring-cloud-dependencies-parent/README.adoc diff --git a/spring-cloud-build/eclipse-code-formatter.xml b/spring-cloud-dependencies-parent/eclipse-code-formatter.xml similarity index 100% rename from spring-cloud-build/eclipse-code-formatter.xml rename to spring-cloud-dependencies-parent/eclipse-code-formatter.xml diff --git a/spring-cloud-dependencies-parent/pom.xml b/spring-cloud-dependencies-parent/pom.xml new file mode 100644 index 00000000..ed8bd4b0 --- /dev/null +++ b/spring-cloud-dependencies-parent/pom.xml @@ -0,0 +1,128 @@ + + + 4.0.0 + org.springframework.cloud + 1.1.0.BUILD-SNAPSHOT + spring-cloud-dependencies-parent + pom + spring-cloud-dependencies-parent + Spring Cloud Build Dependencies + http://projects.spring.io/spring-cloud/ + + Pivotal Software, Inc. + http://www.spring.io + + + + Apache License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0 + +Copyright 2014-2015 the original author or authors. + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or +implied. + +See the License for the specific language governing permissions and +limitations under the License. + + + + + https://github.com/spring-cloud/spring-cloud-build + scm:git:git://github.com/spring-cloud/spring-cloud-build.git + scm:git:ssh://git@github.com/spring-cloud/spring-cloud-build.git + HEAD + + + + dsyer + Dave Syer + dsyer at pivotal.io + Pivotal Software, Inc. + http://www.spring.io + + Project lead + + + + sgibb + Spencer Gibb + sgibb at pivotal.io + Pivotal Software, Inc. + http://www.spring.io + + Project lead + + + + + 3.0.0 + + + UTF-8 + + + https://github.com/spring-cloud + + spring-docs + scp://static.springframework.org/var/www/domains/springframework.org/static/htdocs/spring-cloud/docs/${project.artifactId}/${project.version} + + + + repo.spring.io + Spring Release Repository + https://repo.spring.io/libs-release-local + + + repo.spring.io + Spring Snapshot Repository + https://repo.spring.io/libs-snapshot-local + + + + + milestone + + + repo.spring.io + Spring Milestone Repository + https://repo.spring.io/libs-milestone-local + + + + + bintray + + + bintray + Jcenter Repository + https://api.bintray.com/maven/spring/jars/org.springframework.cloud:${bintray.package} + + + + + central + + + sonatype-nexus-snapshots + Sonatype Nexus Snapshots + https://oss.sonatype.org/content/repositories/snapshots/ + + + sonatype-nexus-staging + Nexus Release Repository + https://oss.sonatype.org/service/local/staging/deploy/maven2/ + + + + +