diff --git a/ci/test.sh b/ci/test.sh index 570e22ce..609ca3f7 100755 --- a/ci/test.sh +++ b/ci/test.sh @@ -8,4 +8,4 @@ rm -rf $HOME/.m2/repository/org/springframework/hateoas 2> /dev/null || : cd spring-hateoas-github -./mvnw clean dependency:list test -P${PROFILE} -Dsort +./mvnw clean dependency:list test -Pci -Dsort diff --git a/pom.xml b/pom.xml index 2270ea26..3b70056b 100644 --- a/pom.xml +++ b/pom.xml @@ -69,6 +69,7 @@ UTF-8 1.8 + 0.1.0.RELEASE 1.2.2 1.2.3 0.7.9 @@ -124,9 +125,9 @@ org.apache.maven.plugins maven-javadoc-plugin - 2.10.4 + create-javadoc-jar jar @@ -182,18 +183,9 @@ ${project.build.directory}/shared-resources true true - ${basedir} - 0.1.0.RELEASE - - org.springframework.data.build - spring-data-build-resources - 2.0.0.RELEASE - provided - zip - io.spring.docresources spring-doc-resources @@ -215,62 +207,32 @@ org.apache.maven.plugins maven-dependency-plugin - - unpack-shared-resources - - unpack-dependencies - - generate-resources - unpack-doc-resources unpack-dependencies - generate-resources + prepare-package io.spring.docresources spring-doc-resources - zip - true ${project.build.directory}/refdocs/ - org.springframework.data - spring-data-build-resources zip true - ${shared.resources} - - - - org.apache.maven.plugins - maven-javadoc-plugin - - - aggregate-javadoc - - javadoc - - package - - - - org.apache.maven.plugins maven-resources-plugin copy-asciidoc-resources - generate-resources + prepare-package copy-resources @@ -307,7 +269,7 @@ html - generate-resources + prepare-package process-asciidoc @@ -335,7 +297,7 @@ pdf - generate-resources + prepare-package process-asciidoc @@ -367,6 +329,24 @@ + + + + org.apache.maven.plugins + maven-javadoc-plugin + + + javadoc + prepare-package + + javadoc + + + + + maven-antrun-plugin 1.8 @@ -374,10 +354,13 @@ copy-documentation-resources - generate-resources + prepare-package + + run + - + @@ -387,17 +370,14 @@ - - run - rename-reference-docs - process-resources + prepare-package - + @@ -434,6 +414,7 @@ attach-artifact + package @@ -446,28 +427,6 @@ - - org.apache.maven.plugins - maven-assembly-plugin - 3.1.0 - - - static - - single - - package - - - ${shared.resources}/assemblies/static-resources.xml - - static-resources - false - - - - - @@ -700,6 +659,27 @@ + + + + org.apache.maven.plugins + maven-javadoc-plugin + 2.10.4 + + true +
${project.name}
+ ${source.level} + true + -Xdoclint:none + + http://static.springframework.org/spring/docs/5.1.x/javadoc-api + http://docs.oracle.com/javase/8/docs/api + +
+
+
+
+ org.codehaus.mojo @@ -760,31 +740,6 @@ - - org.apache.maven.plugins - maven-javadoc-plugin - 2.10.4 - - true -
${project.name}
- ${source.level} - true - -Xdoclint:none - - http://static.springframework.org/spring/docs/4.1.x/javadoc-api - http://docs.oracle.com/javase/6/docs/api - -
- - - attach-javadocs - - jar - - - -
- org.apache.maven.plugins maven-surefire-plugin @@ -834,12 +789,6 @@ 2.8.2 - - org.apache.maven.plugins - maven-deploy-plugin - 2.8.2 - -