From 81aa0406fc9f5db710978363b4cdb1bb8b2f3bbf Mon Sep 17 00:00:00 2001 From: Oliver Gierke Date: Wed, 9 Feb 2011 23:19:57 +0100 Subject: [PATCH] Tweaked the build further in preparation of release. - create 'distribute' profile to run JavaDoc creation, documentation build and assembly - tweaked assembly descriptor to include binary and source jar - added ant-run-plugin and ant build file to trigger S3 upload - added xi:fallback nodes to use local docbook references if built offline - added further project metadata - added CSS and graphics for JavaDoc - added Bundlor plugin and template.mf --- pom.xml | 360 +++++++++++++++---- src/ant/upload-dist.xml | 48 +++ src/assembly/distribution.xml | 12 + src/docbkx/index.xml | 8 +- src/main/javadoc/doc-files/th-background.png | Bin 0 -> 2841 bytes src/main/javadoc/spring-javadoc.css | 178 +++++++++ template.mf | 21 ++ 7 files changed, 547 insertions(+), 80 deletions(-) create mode 100644 src/ant/upload-dist.xml create mode 100644 src/main/javadoc/doc-files/th-background.png create mode 100644 src/main/javadoc/spring-javadoc.css create mode 100644 template.mf diff --git a/pom.xml b/pom.xml index 3f6cf2162..cf2a1228a 100644 --- a/pom.xml +++ b/pom.xml @@ -1,15 +1,19 @@ 4.0.0 - spring-data-jpa - Spring JPA - - org.springframework.data - spring-data-commons-parent - 1.0.0.BUILD-SNAPSHOT - ../spring-data-commons-parent/pom.xml - + org.springframework.data + spring-data-jpa + 1.0.0.BUILD-SNAPSHOT + + Spring JPA + Spring Data module to provide sophisticated support for JPA repositories + http://www.springsource.org/spring-data + 2011 + + SpringSource + http://www.springsource.org + @@ -49,16 +53,19 @@ + 3.0.5.RELEASE 3.6.0.Final 2.0.0 1.6.8 + 4.8.1 + 2.0.0 + 1.5.10 UTF-8 spring-data-jpa Spring Data JPA DATAJPA ${project.version} - milestone ${dist.id}-${dist.version} ${dist.finalName}.zip target/${dist.fileName} @@ -87,6 +94,154 @@ + + + + distribute + + + + org.apache.maven.plugins + maven-javadoc-plugin + 2.5 + + + + javadoc + + package + + + + true +
Spring Data Jpa
+ 1.5 + true + ${project.basedir}/src/main/javadoc + ${project.basedir}/src/main/javadoc/overview.html + ${project.basedir}/src/main/javadoc/spring-javadoc.css + + true + + http://static.springframework.org/spring/docs/3.0.x/javadoc-api + http://download.oracle.com/javase/1.5.0/docs/api + +
+
+ + + com.agilejava.docbkx + docbkx-maven-plugin + 2.0.7 + + + + generate-html + generate-pdf + + package + + + + + org.docbook + docbook-xml + 4.4 + runtime + + + + index.xml + true + ${project.basedir}/src/docbkx/resources/xsl/fopdf.xsl + css/html.css + false + ${project.basedir}/src/docbkx/resources/xsl/html.xsl + 1 + + + version + ${project.version} + + + + + + + + + + + + + + + + + + + + + + + org.apache.maven.plugins + maven-assembly-plugin + 2.2-beta-5 + false + + + distribution + + single + + package + + + ${project.basedir}/src/assembly/distribution.xml + + false + + + + + + org.apache.maven.plugins + maven-antrun-plugin + 1.4 + + + upload-dist + deploy + + + + + + + + + run + + + + + + org.springframework.build + org.springframework.build.aws.ant + 3.0.5.RELEASE + + + net.java.dev.jets3t + jets3t + 0.7.2 + + + +
+
+
@@ -94,13 +249,39 @@ ${project.groupId} spring-data-commons-core - ${project.version} + 1.0.0.BUILD-SNAPSHOT org.springframework spring-orm - ${org.springframework.version} + ${spring.version} + + + + org.springframework + spring-core + ${spring.version} + + + commons-logging + commons-logging + + + + + + + org.slf4j + slf4j-api + ${slf4j.version} + + + + org.slf4j + jcl-over-slf4j + ${slf4j.version} + runtime @@ -117,17 +298,23 @@ org.springframework spring-aspects - ${org.springframework.version} + ${spring.version} true org.springframework spring-test - ${org.springframework.version} + ${spring.version} test + + junit + junit + ${junit.version} + + org.mockito mockito-all @@ -135,6 +322,12 @@ test + + org.hamcrest + hamcrest-all + 1.1 + test + org.hsqldb @@ -150,6 +343,20 @@ true + + org.slf4j + slf4j-log4j12 + ${slf4j.version} + test + + + + log4j + log4j + 1.2.16 + test + + @@ -179,19 +386,41 @@ + + + + + org.springframework.build.aws + org.springframework.build.aws.maven + 2.0.0.RELEASE + + + + + org.apache.maven.plugins + maven-compiler-plugin + 2.3 + + 1.5 + 1.5 + + org.apache.maven.plugins maven-surefire-plugin 2.5 - -javaagent:${settings.localRepository}/org/springframework/org.springframework.instrument/${org.springframework.version}/org.springframework.instrument-${org.springframework.version}.jar -javaagent:${settings.localRepository}/org/apache/openjpa/openjpa/${openjpa.version}/openjpa-${openjpa.version}.jar + + **/*Tests.java + + -javaagent:${settings.localRepository}/org/springframework/spring-instrument/${spring.version}/spring-instrument-${spring.version}.jar -javaagent:${settings.localRepository}/org/apache/openjpa/openjpa/${openjpa.version}/openjpa-${openjpa.version}.jar org.springframework - org.springframework.instrument - ${org.springframework.version} + spring-instrument + ${spring.version} runtime @@ -240,80 +469,34 @@ 1.5 + - com.agilejava.docbkx - docbkx-maven-plugin - 2.0.7 + org.apache.maven.plugins + maven-source-plugin + 2.1.1 + attach-sources - generate-html - generate-pdf + jar - pre-site - - - org.docbook - docbook-xml - 4.4 - runtime - - - - index.xml - true - ${project.basedir}/src/docbkx/resources/xsl/fopdf.xsl - css/html.css - false - ${project.basedir}/src/docbkx/resources/xsl/html.xsl - 1 - - - - version - ${pom.version} - - - - - - - - - - - - - - - - - - - - + - maven-assembly-plugin - 2.2-beta-5 - false + com.springsource.bundlor + com.springsource.bundlor.maven + 1.0.0.RELEASE + + true + - distribution + bundlor - single + bundlor - package - - - ${project.basedir}/src/assembly/distribution.xml - - false - @@ -322,7 +505,7 @@ - http://www.springsource.com/spring-data + http://www.springsource.org/spring-data static.springframework.org scp://static.springframework.org/var/www/domains/springframework.org/static/htdocs/spring-data/data-jpa/snapshot-site/ @@ -339,7 +522,28 @@ + + Bamboo + http://build.springsource.org/browse/SPRINGDATA + + + + JIRA + https://jira.springsource.org/browse/DATAJPA + + + + https://github.com/SpringSource/spring-data-jpa + scm:git:git://github.com/SpringSource/spring-data-jpa.git + scm:git:ssh://git@github.com:SpringSource/spring-data-jpa.git + + + + repository.springframework.maven.milestone + Spring Framework Maven Milestone Repository + http://maven.springframework.org/milestone + jboss JBoss repository diff --git a/src/ant/upload-dist.xml b/src/ant/upload-dist.xml new file mode 100644 index 000000000..e87a9604c --- /dev/null +++ b/src/ant/upload-dist.xml @@ -0,0 +1,48 @@ + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/assembly/distribution.xml b/src/assembly/distribution.xml index 79a3e6e67..d02c8f9a6 100644 --- a/src/assembly/distribution.xml +++ b/src/assembly/distribution.xml @@ -38,4 +38,16 @@ docs/javadoc + + + target/${dist.finalName}.jar + dist + 0644 + + + target/${dist.finalName}-sources.jar + sources + 0644 + + \ No newline at end of file diff --git a/src/docbkx/index.xml b/src/docbkx/index.xml index 37733ea96..993d4e9ae 100644 --- a/src/docbkx/index.xml +++ b/src/docbkx/index.xml @@ -60,7 +60,9 @@ Reference Documentation - + + + @@ -68,7 +70,9 @@ Appendix - + + + diff --git a/src/main/javadoc/doc-files/th-background.png b/src/main/javadoc/doc-files/th-background.png new file mode 100644 index 0000000000000000000000000000000000000000..72d65e771f0dd4ab8840ca15ab9eec9c9e664957 GIT binary patch literal 2841 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 literal 0 HcmV?d00001 diff --git a/src/main/javadoc/spring-javadoc.css b/src/main/javadoc/spring-javadoc.css new file mode 100644 index 000000000..c438fafa5 --- /dev/null +++ b/src/main/javadoc/spring-javadoc.css @@ -0,0 +1,178 @@ +/* stylesheet.css 2008/04/22 nicolekonicki */ + +/* + * + * Spring-specific Javadoc style sheet + * + */ + + + +.code +{ + border: 1px solid black; + background-color: #F4F4F4; + padding: 5px; +} + +body +{ + font: 12px Verdana, Arial, Helvetica, "Bitstream Vera Sans", sans-serif; + background-color: #fff; + color: #333; +} + + +/* Link colors */ +a +{ + color:#2c7b14; + text-decoration:none; +} + +a:hover +{ + text-decoration:underline; +} + +/* Headings */ +h1 +{ + font-size:28px; + color:#007c00; +} + +/* Table colors */ + +table +{ + border:none; +} + +td +{ + border:none; + border-bottom:1px dotted #ddd; +} + +th +{ + border:none; +} + +.TableHeadingColor th +{ + background-color: #efffcb; + background-image: url(doc-files/th-background.png); + background-repeat: repeat-x; + color:#fff; + font-size:14px; + height:26px; +} + +.TableSubHeadingColor +{ + background: #f7ffee; + +} +.TableRowColor +{ + background: #fff; +} + +.TableRowColor a +{ + border-bottom:none; + color:#2c7b14; + font-weight:normal; +} + +tr.TableRowColor:hover +{ + background:#eef2e1; +} + + +/* Font used in left-hand frame lists */ +.FrameTitleFont +{ + font-size: 120%; + font-weight:bold; +} + +.FrameTitleFont a +{ + color: #333; +} + +.FrameHeadingFont +{ + font-weight: bold; + font-size:95%; +} + +.FrameItemFont +{ + line-height:130%; + font-size: 95%; +} + +.FrameItemFont a +{ + color:#333; +} + +.FrameItemFont a:hover +{ + color:#249901; + border-bottom:none; + text-decoration:underline; +} + +/* Navigation bar fonts and colors */ +.NavBarCell1 +{ + background-color:#fff; + border:none; +} + +.NavBarCell1Rev +{ + background-color:#e3faa5; + border:1px solid #9ad00c; + padding:0; + margin:0; +} + +.NavBarCell1 a +{ + color:#333; + text-decoration:none; +} + +.NavBarFont1Rev +{ + +} + +.NavBarCell2 +{ + border:none; +} + +.NavBarCell2 a +{ + color:#249901; + font-size:90%; +} + +.NavBarCell3 +{ + border:none; +} + +/* Override sizes in font tags */ +font +{ + font: inherit !important; +} diff --git a/template.mf b/template.mf new file mode 100644 index 000000000..838534381 --- /dev/null +++ b/template.mf @@ -0,0 +1,21 @@ +Bundle-ManifestVersion: 2 +Bundle-SymbolicName: ${project.artifactId} +Bundle-Name: ${project.name} +Bundle-Vendor: SpringSource +Bundle-Version: ${project.version} +Bundle-RequiredExecutionEnvironment: J2SE-1.5 +Export-Template: + org.springframework.data.jpa.*;version="${project.version}" +Import-Template: + javax.persistence.*;version="${jpa.version:[=.=.=,+1.0.0)}", + org.aopalliance.*;version="[1.0.0,2.0.0)", + org.slf4j.*;version="${slf4j.version:[=.=.=,+1.0.0)}", + org.aspectj.*;version="${aspectj.version:[=.=.=,+1.0.0)}";resolution:=optional, + org.eclipse.persistence.*;version="[2.0.0,3.0.0)";resolution:=optional, + org.hibernate.*;version="[3.5.3,4.0.0)";resolution:=optional, + org.apache.openjpa.persistence.*;version="${openjpa.version:[=.=.=,+1.0.0)}";resolution:=optional, + org.joda.time.*;version="[1.5.0,2.0.0)";resolution:=optional, + org.springframework.*;version="${spring.version:[=.=.=.=,+1.0.0)}", + org.springframework.beans.factory.aspectj;version="${spring.version:[=.=.=.=,+1.0.0)}";resolution:=optional, + org.w3c.*;version="0.0.0" + \ No newline at end of file