diff --git a/build.gradle b/build.gradle index 7ce199f4a..55e6f2d4d 100644 --- a/build.gradle +++ b/build.gradle @@ -1,72 +1,29 @@ -// used for artifact names, building doc upload urls, etc. -description = 'Spring Data Redis' -abbreviation = 'DATAREDIS' - -apply plugin: 'base' - buildscript { repositories { -// add(new org.apache.ivy.plugins.resolver.FileSystemResolver()) { -// name = "local" -// addIvyPattern "e:/work/i21/gradle-plugins/build/repo/[organisation].[module]-ivy-[revision].xml" -// addArtifactPattern "e:/work/i21/gradle-plugins/build/repo/[organisation].[module]-[revision](-[classifier]).[ext]" -// } - - add(new org.apache.ivy.plugins.resolver.URLResolver()) { - name = "GitHub" - addIvyPattern 'http://cloud.github.com/downloads/costin/gradle-stuff/[organization].[module]-[artifact]-[revision].[ext]' - addArtifactPattern 'http://cloud.github.com/downloads/costin/gradle-stuff/[organization].[module]-[revision].[ext]' - } - mavenCentral() - mavenLocal() - mavenRepo name: "springsource-org-release", urls: "http://repository.springsource.com/maven/bundles/release" - mavenRepo name: "springsource-org-external", urls: "http://repository.springsource.com/maven/bundles/external" + maven { url 'http://repo.springsource.org/plugins-release' } } - dependencies { - classpath 'org.springframework:gradle-stuff:0.1-20110421' - classpath 'net.sf.docbook:docbook-xsl:1.75.2:ns-resources@zip' + classpath 'org.springframework.build.gradle:bundlor-plugin:0.1.2' + classpath 'org.springframework.build.gradle:docbook-reference-plugin:0.1.5' } } +description = 'Spring Data Redis' +group = 'org.springframework.data.redis' + repositories { - mavenRepo name: "springsource", urls: "http://repo.springsource.org/libs-snapshot" + maven { url "http://repo.springsource.org/libs-snapshot" } + maven { url "http://repo.springsource.org/ext-release-local" } } - -allprojects { - group = 'org.springframework.data.redis' - version = "$springDataRedisVersion" - - releaseBuild = version.endsWith('RELEASE') - snapshotBuild = version.endsWith('SNAPSHOT') - - - repositories { - mavenLocal() - mavenCentral() - // Public Spring artefacts - mavenRepo name: "springsource-org-release", urls: "http://repository.springsource.com/maven/bundles/release" - mavenRepo name: "spring-release", urls: "http://maven.springframework.org/release" - mavenRepo name: "spring-milestone", urls: "http://maven.springframework.org/milestone" - mavenRepo name: "spring-snapshot", urls: "http://maven.springframework.org/snapshot" - mavenRepo name: "sonatype-snapshot", urls: "http://oss.sonatype.org/content/repositories/snapshots" - mavenRepo name: "jboss", urls: "http://repository.jboss.org/maven2/" - mavenRepo name: "java.net", urls: "http://download.java.net/maven/2/" - mavenRepo name: "ext-snapshots", urls: "http://springframework.svn.sourceforge.net/svnroot/springframework/repos/repo-ext/" - } - -} - - apply plugin: "java" -apply plugin: "maven" -apply plugin: 'eclipse' // `gradle eclipse` to generate .classpath/.project -apply plugin: 'idea' // `gradle idea` to generate .ipr/.iml -apply plugin: 'docbook' -apply plugin: 'bundlor' // all core projects should be OSGi-compliant +apply plugin: 'eclipse' +apply plugin: 'idea' +apply from: "$rootDir/maven.gradle" +apply plugin: 'docbook-reference' +//apply plugin: 'bundlor' -bundlor.useProjectProps = true +//bundlor.ext.useProjectProps = true [compileJava, compileTestJava]*.options*.compilerArgs = ["-Xlint:-serial"] // Common dependencies @@ -83,35 +40,33 @@ dependencies { } compile "org.springframework:spring-context-support:$springVersion" compile "org.springframework:spring-tx:$springVersion" - compile("org.springframework:spring-oxm:$springVersion") { optional = true } + compile("org.springframework:spring-oxm:$springVersion", optional) // Redis Drivers compile "redis.clients:jedis:$jedisVersion" compile "com.github.spullara.redis:client:$srpVersion" - compile("org.jredis:jredis-anthonylauzon:$jredisVersion") { optional = true } - compile("org.idevlab:rjc:$rjcVersion") { optional = true } + compile("org.jredis:jredis-anthonylauzon:$jredisVersion", optional) + compile("org.idevlab:rjc:$rjcVersion", optional) // Mappers - compile("org.codehaus.jackson:jackson-mapper-asl:$jacksonVersion") { optional = true } - compile("commons-beanutils:commons-beanutils-core:1.8.3") { optional = true } + compile("org.codehaus.jackson:jackson-mapper-asl:$jacksonVersion", optional) + compile("commons-beanutils:commons-beanutils-core:1.8.3", optional) // Testing testCompile "junit:junit:$junitVersion" testCompile "org.springframework:spring-test:$springVersion" testCompile "org.mockito:mockito-all:$mockitoVersion" - testCompile("javax.annotation:jsr250-api:1.0") { optional = true } - testCompile("com.thoughtworks.xstream:xstream:1.3") { optional = true } + testCompile("javax.annotation:jsr250-api:1.0", optional) + testCompile("com.thoughtworks.xstream:xstream:1.3", optional) } -javaprojects = rootProject - sourceCompatibility = 1.5 targetCompatibility = 1.5 javadoc { - srcDir = file("${projectDir}/docs/src/api") + ext.srcDir = file("${projectDir}/docs/src/api") destinationDir = file("${buildDir}/api") - tmpDir = file("${buildDir}/api-work") + ext.tmpDir = file("${buildDir}/api-work") configure(options) { stylesheetFile = file("${srcDir}/spring-javadoc.css") @@ -134,82 +89,133 @@ javadoc { } title = "${rootProject.description} ${version} API" - - // collect all the sources that will be included in the javadoc output - source javaprojects.collect {project -> - project.sourceSets.main.allJava - } - - // collect all main classpaths to be able to resolve @see refs, etc. - // this collection also determines the set of projects that this - // task dependsOn, thus the runtimeClasspath is used to ensure all - // projects are included, not just *dependencies* of all classes. - // this is awkward and took me a while to figure out. - classpath = files(javaprojects.collect {project -> - project.sourceSets.main.runtimeClasspath - }) - - // copy the images from the doc-files dir over to the target - doLast { task -> - copy { - from file("${task.srcDir}/doc-files") - into file("${task.destinationDir}/doc-files") - } - } } -ideaProject { - withXml { provider -> - provider.node.component.find { it.@name == 'VcsDirectoryMappings' }.mapping.@vcs = 'Git' - } +jar { + manifest.attributes['Implementation-Title'] = 'spring-data-redis' + manifest.attributes['Implementation-Version'] = project.version + + from("$rootDir/docs/src/info") { + include "license.txt" + include "notice.txt" + into "META-INF" + expand(copyright: new Date().format('yyyy'), version: project.version) + } +} + +task sourcesJar(type: Jar, dependsOn:classes) { + classifier = 'sources' + from sourceSets.main.allJava +} + +task javadocJar(type: Jar) { + classifier = 'javadoc' + from javadoc +} + +reference { + sourceDir = file('docs/src/reference/docbook') +} + +task docsZip(type: Zip) { + group = 'Distribution' + classifier = 'docs' + description = "Builds -${classifier} archive containing api and reference for deployment" + + from('docs/src/info') { + include 'changelog.txt' + } + + from (javadoc) { + into 'api' + } + + from (reference) { + into 'reference' + } +} + +task schemaZip(type: Zip) { + group = 'Distribution' + classifier = 'schema' + description = "Builds -${classifier} archive containing all XSDs for deployment" + + def Properties schemas = new Properties(); + + sourceSets.main.resources.find { + it.path.endsWith('META-INF' + File.separator + 'spring.schemas') + }?.withInputStream { schemas.load(it) } + + ext.paths = [] as Set + + for (def key : schemas.keySet()) { + def shortName = key.replaceAll(/http.*schema.(.*).spring-.*/, '$1') + assert shortName != key + File xsdFile = sourceSets.main.resources.find { + it.path.replace('\\', '/').endsWith(schemas.get(key)) + } + assert xsdFile != null + def input = xsdFile.path + + if (!paths.contains(input)) { + paths.add(input) + into (shortName) { + from input + } + } + } +} + +task distZip(type: Zip, dependsOn: [jar, docsZip, schemaZip, sourcesJar, javadocJar]) { + group = 'Distribution' + classifier = 'dist' + description = "Builds -${classifier} archive, containing all jars and docs, " + + "suitable for community download page." + + ext.zipRootDir = "${project.name}-${project.version}" + + into (zipRootDir) { + from('docs/src/info') { + include 'readme.txt' + include 'license.txt' + include 'notice.txt' + expand(copyright: new Date().format('yyyy'), version: project.version) + } + + from('samples/') { + into 'samples' + exclude '**/build/**' + exclude '**/bin/**' + exclude '**/.settings/**' + exclude '**/.gradle/**' + exclude '**/.*' + } + + from(zipTree(docsZip.archivePath)) { + into "docs" + } + + from(zipTree(schemaZip.archivePath)) { + into "schema" + } + into ("dist") { + from rootProject.collect { project -> project.libsDir } + } + } +} + +artifacts { + archives sourcesJar + archives javadocJar + + archives docsZip + archives schemaZip + archives distZip } task wrapper(type: Wrapper) { - gradleVersion = '1.0-milestone-3' - description = "Generate the Gradle wrapper" - group = "Distribution" -} - -apply from: "$rootDir/maven.gradle" - -assemble.dependsOn = ['jar', 'sourceJar', 'javadocJar'] - -// Distribution tasks -task dist(type: Zip) { - description = "Generate the ZIP Distribution" - group = "Distribution" - dependsOn assemble, subprojects*.tasks*.matching { task -> task.name == 'assemble' } - - evaluationDependsOn(':docs') - - def zipRootDir = "${project.name}-$version" - into(zipRootDir) { - from('/docs/src/info') { - include '*.txt' - } - from('/docs/build/') { - into 'docs' - include 'reference/**/*' - } - from('build/') { - into 'docs' - include 'api/**/*' - } - into('dist') { - from javaprojects.collect {project -> project.libsDir } - } - } - doLast { - ant.checksum(file: archivePath, algorithm: 'SHA1', fileext: '.sha1') - } -} - -task uploadDist(type: org.springframework.gradle.tasks.S3DistroUpload, dependsOn: dist) { - description = "Upload the ZIP Distribution" - group = "Distribution" - archiveFile = dist.archivePath - projectKey = 'DATAKV' - projectName = 'Spring Data Redis' + description = 'Generates gradlew[.bat] scripts' + gradleVersion = '1.0' } defaultTasks 'clean', 'build' \ No newline at end of file diff --git a/docs/build.gradle b/docs/build.gradle deleted file mode 100644 index 641a6a280..000000000 --- a/docs/build.gradle +++ /dev/null @@ -1,99 +0,0 @@ -import org.apache.tools.ant.filters.ReplaceTokens - -// ----------------------------------------------------------------------------- -// Configuration for the docs subproject -// ----------------------------------------------------------------------------- - -apply plugin: 'base' -apply plugin: 'docbook' - -assemble.dependsOn = [rootProject.javadoc, 'reference'] - -[docbookHtml, docbookFoPdf, docbookHtmlSingle]*.group = 'Documentation' -[docbookHtml, docbookFoPdf, docbookHtmlSingle]*.sourceFileName = 'index.xml' -[docbookHtml, docbookFoPdf, docbookHtmlSingle]*.sourceDirectory = new File(projectDir, 'src/reference/docbook') - -docbookHtml.stylesheet = new File(projectDir, 'src/reference/resources/xsl/html-custom.xsl') -docbookHtmlSingle.stylesheet = new File(projectDir, 'src/reference/resources/xsl/html-single-custom.xsl') -docbookFoPdf.stylesheet = new File(projectDir, 'src/reference/resources/xsl/pdf-custom.xsl') - -def imagesDir = new File(projectDir, 'src/reference/resources/images'); -docbookFoPdf.admonGraphicsPath = "${imagesDir}/admon" -docbookFoPdf.imgSrcPath = "${imagesDir}" - -// defined separately to prevent the replacement from taking place (seems to affect the images) -imgSpec = copySpec { - into ('reference') { - from("$projectDir/src/reference/resources") { - include "css/**/*" - } - from("$buildDir/docs") { - include '*.pdf' - } - } - - into ('reference/images') { - from (imagesDir) - } -} - -refSpec = copySpec { - into ('reference') { - from("$buildDir/docs") { - exclude '*.fo' - exclude '*.pdf' - } - } - - p = new Properties() - - for (e in project.properties) { - if (e.key != null && e.value != null) - p.setProperty(e.key, e.value.toString()) - } - - filter(ReplaceTokens, tokens: p) - with(imgSpec) -} - -task reference (type: Copy) { - dependsOn 'docbook' - description = "Builds aggregated DocBook" - group = "Documentation" - destinationDir = buildDir - with(refSpec) -} - - -apiSpec = copySpec { - into('api') { - from(rootProject.javadoc.destinationDir) - } -} - -task docSiteLogin(type: org.springframework.gradle.tasks.Login) { - if (project.hasProperty('sshHost')) { - host = project.property('sshHost') - username = project.property('sshUsername') - key = project.property('sshPrivateKey') - } -} - -infoSpec = copySpec { - from("$projectDir/src/info") { - include 'changelog.txt' - } -} - -// upload task -task uploadDocs(type: org.springframework.gradle.tasks.ScpUpload) { - dependsOn rootProject.javadoc, reference - description = "Upload API Distribution" - group = "Distribution" - remoteDir = "/opt/www/domains/springframework.org/www/htdocs/spring-data/data-redis/docs/${project.version}" - login = docSiteLogin - - with(apiSpec) - with(refSpec) - with(infoSpec) -} \ No newline at end of file diff --git a/docs/src/reference/docbook/appendix/appendix-schema.xml b/docs/src/reference/docbook/appendix/appendix-schema.xml index 227465593..d83c8d350 100644 --- a/docs/src/reference/docbook/appendix/appendix-schema.xml +++ b/docs/src/reference/docbook/appendix/appendix-schema.xml @@ -3,7 +3,7 @@ Spring Data Redis Schema(s) Core schema - + FIXME: REDIS SCHEMA LOCATION/NAME CHANGED diff --git a/docs/src/reference/docbook/index.xml b/docs/src/reference/docbook/index.xml index c91c35ec6..39c58c3a7 100644 --- a/docs/src/reference/docbook/index.xml +++ b/docs/src/reference/docbook/index.xml @@ -6,8 +6,8 @@ Spring Data Redis Reference Documentation - Spring Data Redis @version@ - @version@ + Spring Data Redis ${version} + ${version} Spring Data Redis diff --git a/docs/src/reference/resources/css/highlight.css b/docs/src/reference/resources/css/highlight.css deleted file mode 100644 index ffefef72d..000000000 --- a/docs/src/reference/resources/css/highlight.css +++ /dev/null @@ -1,35 +0,0 @@ -/* - code highlight CSS resemblign the Eclipse IDE default color schema - @author Costin Leau -*/ - -.hl-keyword { - color: #7F0055; - font-weight: bold; -} - -.hl-comment { - color: #3F5F5F; - font-style: italic; -} - -.hl-multiline-comment { - color: #3F5FBF; - font-style: italic; -} - -.hl-tag { - color: #3F7F7F; -} - -.hl-attribute { - color: #7F007F; -} - -.hl-value { - color: #2A00FF; -} - -.hl-string { - color: #2A00FF; -} \ No newline at end of file diff --git a/docs/src/reference/resources/css/manual.css b/docs/src/reference/resources/css/manual.css deleted file mode 100644 index 77569070a..000000000 --- a/docs/src/reference/resources/css/manual.css +++ /dev/null @@ -1,99 +0,0 @@ -@IMPORT url("highlight.css"); - -html { - padding: 0pt; - margin: 0pt; -} - -body { - margin-left: 10%; - margin-right: 10%; - font-family: Arial, Sans-serif; -} - -div { - margin: 0pt; -} - -p { - text-align: justify; -} - -hr { - border: 1px solid gray; - background: gray; -} - -h1,h2,h3,h4 { - color: #234623; - font-family: Arial, Sans-serif; -} - -pre { - line-height: 1.0; - color: black; -} - -pre.programlisting { - font-size: 10pt; - padding: 7pt 3pt; - border: 1pt solid black; - background: #eeeeee; - clear: both; -} - -div.table { - margin: 1em; - padding: 0.5em; - text-align: center; -} - -div.table table { - display: table; - width: 100%; -} - -div.table td { - padding-left: 7px; - padding-right: 7px; -} - -.sidebar { - float: right; - margin: 10px 0 10px 30px; - padding: 10px 20px 20px 20px; - width: 33%; - border: 1px solid black; - background-color: #F4F4F4; - font-size: 14px; -} - -.mediaobject { - padding-top: 30px; - padding-bottom: 30px; -} - -.legalnotice { - font-family: Verdana, Arial, helvetica, sans-serif; - font-size: 12px; - font-style: italic; -} - -p.releaseinfo { - font-size: 100%; - font-weight: bold; - font-family: Verdana, Arial, helvetica, sans-serif; - padding-top: 10px; -} - -p.pubdate { - font-size: 120%; - font-weight: bold; - font-family: Verdana, Arial, helvetica, sans-serif; -} - -span.productname { - font-size: 200%; - font-weight: bold; - font-family: Verdana, Arial, helvetica, sans-serif; -} diff --git a/docs/src/reference/resources/images/admon/blank.png b/docs/src/reference/resources/images/admon/blank.png deleted file mode 100644 index 764bf4f0c..000000000 Binary files a/docs/src/reference/resources/images/admon/blank.png and /dev/null differ diff --git a/docs/src/reference/resources/images/admon/caution.gif b/docs/src/reference/resources/images/admon/caution.gif deleted file mode 100644 index d9f5e5b1b..000000000 Binary files a/docs/src/reference/resources/images/admon/caution.gif and /dev/null differ diff --git a/docs/src/reference/resources/images/admon/caution.png b/docs/src/reference/resources/images/admon/caution.png deleted file mode 100644 index 5b7809ca4..000000000 Binary files a/docs/src/reference/resources/images/admon/caution.png and /dev/null differ diff --git a/docs/src/reference/resources/images/admon/caution.tif b/docs/src/reference/resources/images/admon/caution.tif deleted file mode 100644 index 4a282948c..000000000 Binary files a/docs/src/reference/resources/images/admon/caution.tif and /dev/null differ diff --git a/docs/src/reference/resources/images/admon/draft.png b/docs/src/reference/resources/images/admon/draft.png deleted file mode 100644 index 0084708c9..000000000 Binary files a/docs/src/reference/resources/images/admon/draft.png and /dev/null differ diff --git a/docs/src/reference/resources/images/admon/home.gif b/docs/src/reference/resources/images/admon/home.gif deleted file mode 100644 index 6784f5bb0..000000000 Binary files a/docs/src/reference/resources/images/admon/home.gif and /dev/null differ diff --git a/docs/src/reference/resources/images/admon/home.png b/docs/src/reference/resources/images/admon/home.png deleted file mode 100644 index cbb711de7..000000000 Binary files a/docs/src/reference/resources/images/admon/home.png and /dev/null differ diff --git a/docs/src/reference/resources/images/admon/important.gif b/docs/src/reference/resources/images/admon/important.gif deleted file mode 100644 index 6795d9a81..000000000 Binary files a/docs/src/reference/resources/images/admon/important.gif and /dev/null differ diff --git a/docs/src/reference/resources/images/admon/important.png b/docs/src/reference/resources/images/admon/important.png deleted file mode 100644 index ad57f6f72..000000000 Binary files a/docs/src/reference/resources/images/admon/important.png and /dev/null differ diff --git a/docs/src/reference/resources/images/admon/important.tif b/docs/src/reference/resources/images/admon/important.tif deleted file mode 100644 index 184de6371..000000000 Binary files a/docs/src/reference/resources/images/admon/important.tif and /dev/null differ diff --git a/docs/src/reference/resources/images/admon/next.gif b/docs/src/reference/resources/images/admon/next.gif deleted file mode 100644 index aa1516e69..000000000 Binary files a/docs/src/reference/resources/images/admon/next.gif and /dev/null differ diff --git a/docs/src/reference/resources/images/admon/next.png b/docs/src/reference/resources/images/admon/next.png deleted file mode 100644 index 45835bf89..000000000 Binary files a/docs/src/reference/resources/images/admon/next.png and /dev/null differ diff --git a/docs/src/reference/resources/images/admon/note.gif b/docs/src/reference/resources/images/admon/note.gif deleted file mode 100644 index f329d359e..000000000 Binary files a/docs/src/reference/resources/images/admon/note.gif and /dev/null differ diff --git a/docs/src/reference/resources/images/admon/note.png b/docs/src/reference/resources/images/admon/note.png deleted file mode 100644 index ad57f6f72..000000000 Binary files a/docs/src/reference/resources/images/admon/note.png and /dev/null differ diff --git a/docs/src/reference/resources/images/admon/note.tif b/docs/src/reference/resources/images/admon/note.tif deleted file mode 100644 index 08644d6b5..000000000 Binary files a/docs/src/reference/resources/images/admon/note.tif and /dev/null differ diff --git a/docs/src/reference/resources/images/admon/prev.gif b/docs/src/reference/resources/images/admon/prev.gif deleted file mode 100644 index 64ca8f3c7..000000000 Binary files a/docs/src/reference/resources/images/admon/prev.gif and /dev/null differ diff --git a/docs/src/reference/resources/images/admon/prev.png b/docs/src/reference/resources/images/admon/prev.png deleted file mode 100644 index cf24654f8..000000000 Binary files a/docs/src/reference/resources/images/admon/prev.png and /dev/null differ diff --git a/docs/src/reference/resources/images/admon/tip.gif b/docs/src/reference/resources/images/admon/tip.gif deleted file mode 100644 index 823f2b417..000000000 Binary files a/docs/src/reference/resources/images/admon/tip.gif and /dev/null differ diff --git a/docs/src/reference/resources/images/admon/tip.png b/docs/src/reference/resources/images/admon/tip.png deleted file mode 100644 index ad57f6f72..000000000 Binary files a/docs/src/reference/resources/images/admon/tip.png and /dev/null differ diff --git a/docs/src/reference/resources/images/admon/tip.tif b/docs/src/reference/resources/images/admon/tip.tif deleted file mode 100644 index 4a3d8c75f..000000000 Binary files a/docs/src/reference/resources/images/admon/tip.tif and /dev/null differ diff --git a/docs/src/reference/resources/images/admon/toc-blank.png b/docs/src/reference/resources/images/admon/toc-blank.png deleted file mode 100644 index 6ffad17a0..000000000 Binary files a/docs/src/reference/resources/images/admon/toc-blank.png and /dev/null differ diff --git a/docs/src/reference/resources/images/admon/toc-minus.png b/docs/src/reference/resources/images/admon/toc-minus.png deleted file mode 100644 index abbb020c8..000000000 Binary files a/docs/src/reference/resources/images/admon/toc-minus.png and /dev/null differ diff --git a/docs/src/reference/resources/images/admon/toc-plus.png b/docs/src/reference/resources/images/admon/toc-plus.png deleted file mode 100644 index 941312ce0..000000000 Binary files a/docs/src/reference/resources/images/admon/toc-plus.png and /dev/null differ diff --git a/docs/src/reference/resources/images/admon/up.gif b/docs/src/reference/resources/images/admon/up.gif deleted file mode 100644 index aabc2d016..000000000 Binary files a/docs/src/reference/resources/images/admon/up.gif and /dev/null differ diff --git a/docs/src/reference/resources/images/admon/up.png b/docs/src/reference/resources/images/admon/up.png deleted file mode 100644 index 07634de26..000000000 Binary files a/docs/src/reference/resources/images/admon/up.png and /dev/null differ diff --git a/docs/src/reference/resources/images/admon/warning.gif b/docs/src/reference/resources/images/admon/warning.gif deleted file mode 100644 index c6acdec60..000000000 Binary files a/docs/src/reference/resources/images/admon/warning.gif and /dev/null differ diff --git a/docs/src/reference/resources/images/admon/warning.png b/docs/src/reference/resources/images/admon/warning.png deleted file mode 100644 index ef3e10f40..000000000 Binary files a/docs/src/reference/resources/images/admon/warning.png and /dev/null differ diff --git a/docs/src/reference/resources/images/admon/warning.tif b/docs/src/reference/resources/images/admon/warning.tif deleted file mode 100644 index 7b6611ec7..000000000 Binary files a/docs/src/reference/resources/images/admon/warning.tif and /dev/null differ diff --git a/docs/src/reference/resources/images/callouts/1.png b/docs/src/reference/resources/images/callouts/1.png deleted file mode 100644 index 7d473430b..000000000 Binary files a/docs/src/reference/resources/images/callouts/1.png and /dev/null differ diff --git a/docs/src/reference/resources/images/callouts/10.png b/docs/src/reference/resources/images/callouts/10.png deleted file mode 100644 index 997bbc824..000000000 Binary files a/docs/src/reference/resources/images/callouts/10.png and /dev/null differ diff --git a/docs/src/reference/resources/images/callouts/11.png b/docs/src/reference/resources/images/callouts/11.png deleted file mode 100644 index ce47dac3f..000000000 Binary files a/docs/src/reference/resources/images/callouts/11.png and /dev/null differ diff --git a/docs/src/reference/resources/images/callouts/12.png b/docs/src/reference/resources/images/callouts/12.png deleted file mode 100644 index 31daf4e2f..000000000 Binary files a/docs/src/reference/resources/images/callouts/12.png and /dev/null differ diff --git a/docs/src/reference/resources/images/callouts/13.png b/docs/src/reference/resources/images/callouts/13.png deleted file mode 100644 index 14021a89c..000000000 Binary files a/docs/src/reference/resources/images/callouts/13.png and /dev/null differ diff --git a/docs/src/reference/resources/images/callouts/14.png b/docs/src/reference/resources/images/callouts/14.png deleted file mode 100644 index 64014b75f..000000000 Binary files a/docs/src/reference/resources/images/callouts/14.png and /dev/null differ diff --git a/docs/src/reference/resources/images/callouts/15.png b/docs/src/reference/resources/images/callouts/15.png deleted file mode 100644 index 0d65765fc..000000000 Binary files a/docs/src/reference/resources/images/callouts/15.png and /dev/null differ diff --git a/docs/src/reference/resources/images/callouts/2.png b/docs/src/reference/resources/images/callouts/2.png deleted file mode 100644 index 5d09341b2..000000000 Binary files a/docs/src/reference/resources/images/callouts/2.png and /dev/null differ diff --git a/docs/src/reference/resources/images/callouts/3.png b/docs/src/reference/resources/images/callouts/3.png deleted file mode 100644 index ef7b70047..000000000 Binary files a/docs/src/reference/resources/images/callouts/3.png and /dev/null differ diff --git a/docs/src/reference/resources/images/callouts/4.png b/docs/src/reference/resources/images/callouts/4.png deleted file mode 100644 index adb8364eb..000000000 Binary files a/docs/src/reference/resources/images/callouts/4.png and /dev/null differ diff --git a/docs/src/reference/resources/images/callouts/5.png b/docs/src/reference/resources/images/callouts/5.png deleted file mode 100644 index 4d7eb4600..000000000 Binary files a/docs/src/reference/resources/images/callouts/5.png and /dev/null differ diff --git a/docs/src/reference/resources/images/callouts/6.png b/docs/src/reference/resources/images/callouts/6.png deleted file mode 100644 index 0ba694af6..000000000 Binary files a/docs/src/reference/resources/images/callouts/6.png and /dev/null differ diff --git a/docs/src/reference/resources/images/callouts/7.png b/docs/src/reference/resources/images/callouts/7.png deleted file mode 100644 index 472e96f8a..000000000 Binary files a/docs/src/reference/resources/images/callouts/7.png and /dev/null differ diff --git a/docs/src/reference/resources/images/callouts/8.png b/docs/src/reference/resources/images/callouts/8.png deleted file mode 100644 index 5e60973c2..000000000 Binary files a/docs/src/reference/resources/images/callouts/8.png and /dev/null differ diff --git a/docs/src/reference/resources/images/callouts/9.png b/docs/src/reference/resources/images/callouts/9.png deleted file mode 100644 index a0676d26c..000000000 Binary files a/docs/src/reference/resources/images/callouts/9.png and /dev/null differ diff --git a/docs/src/reference/resources/images/logo.png b/docs/src/reference/resources/images/logo.png deleted file mode 100644 index a9f6d959e..000000000 Binary files a/docs/src/reference/resources/images/logo.png and /dev/null differ diff --git a/docs/src/reference/resources/images/xdev-spring_logo.jpg b/docs/src/reference/resources/images/xdev-spring_logo.jpg deleted file mode 100644 index 622962ee3..000000000 Binary files a/docs/src/reference/resources/images/xdev-spring_logo.jpg and /dev/null differ diff --git a/docs/src/reference/resources/xsl/fopdf.xsl b/docs/src/reference/resources/xsl/fopdf.xsl deleted file mode 100644 index 8582406da..000000000 --- a/docs/src/reference/resources/xsl/fopdf.xsl +++ /dev/null @@ -1,449 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - , - - - - - ( - - ) - - - - Copyright © 2010-2011 - - - - - - - - - - - - - - - - - - - - - - - - - - - - -5em - -5em - - - - - - - - - - - Spring Data Redis () - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 0 - - 1 - 1 - 0 - - - - - - book toc - - - - 2 - - - - - - - - - - 0 - 0 - 0 - - - 5mm - 10mm - 10mm - - 15mm - 10mm - 0mm - - 18mm - 18mm - - - 0pc - - - - - justify - false - - - 11 - 8 - - - 1.4 - - - - - - - 0.8em - - - - - - 17.4cm - - - - 4pt - 4pt - 4pt - 4pt - - - - 0.1pt - 0.1pt - - - - - 1 - - - - - - - - left - bold - - - pt - - - - - - - - - - - - - - - 0.8em - 0.8em - 0.8em - - - pt - - 0.1em - 0.1em - 0.1em - - - 0.6em - 0.6em - 0.6em - - - pt - - 0.1em - 0.1em - 0.1em - - - 0.4em - 0.4em - 0.4em - - - pt - - 0.1em - 0.1em - 0.1em - - - - - bold - - - pt - - false - 0.4em - 0.6em - 0.8em - - - - - - - - - pt - - - - - 1em - 1em - 1em - #444444 - solid - 0.1pt - 0.5em - 0.5em - 0.5em - 0.5em - 0.5em - 0.5em - - - - 1 - - #F0F0F0 - - - - - - 0 - 1 - - - 90 - - - - - '1' - src/docbkx/resources/images/admons/ - - - - - - figure after - example before - equation before - table before - procedure before - - - - 1 - - - - 0.8em - 0.8em - 0.8em - 0.1em - 0.1em - 0.1em - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/docs/src/reference/resources/xsl/highlight-fo.xsl b/docs/src/reference/resources/xsl/highlight-fo.xsl deleted file mode 100644 index f0b5dd941..000000000 --- a/docs/src/reference/resources/xsl/highlight-fo.xsl +++ /dev/null @@ -1,44 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/docs/src/reference/resources/xsl/highlight.xsl b/docs/src/reference/resources/xsl/highlight.xsl deleted file mode 100644 index c63c4765c..000000000 --- a/docs/src/reference/resources/xsl/highlight.xsl +++ /dev/null @@ -1,42 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/docs/src/reference/resources/xsl/html-custom.xsl b/docs/src/reference/resources/xsl/html-custom.xsl deleted file mode 100644 index 575267e3c..000000000 --- a/docs/src/reference/resources/xsl/html-custom.xsl +++ /dev/null @@ -1,145 +0,0 @@ - - - - - - - - - - '5' - '1' - - - 1 - - - 1 - - - 1 - 0 - 1 - - - - images/admon/ - .png - - 120 - images/callouts/ - .png - - - css/manual.css - text/css - book toc,title - - text-align: left - - - - - - - - - - - - - - 3 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Begin Google Analytics code - - - End Google Analytics code - - - - - Begin LoopFuse code - - - End LoopFuse code - - - \ No newline at end of file diff --git a/docs/src/reference/resources/xsl/html-single-custom.xsl b/docs/src/reference/resources/xsl/html-single-custom.xsl deleted file mode 100644 index 264d9a81f..000000000 --- a/docs/src/reference/resources/xsl/html-single-custom.xsl +++ /dev/null @@ -1,142 +0,0 @@ - - - - - - - - - - - 1 - - - 1 - - - 1 - 0 - 1 - - - - images/admon/ - .png - - 120 - images/callouts/ - .png - - - css/manual.css - text/css - book toc,title - - text-align: left - - - - - - - - - - - - - - 2 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -Begin Google Analytics code - - -End Google Analytics code - - - - -Begin LoopFuse code - - -End LoopFuse code - - - \ No newline at end of file diff --git a/docs/src/reference/resources/xsl/html.xsl b/docs/src/reference/resources/xsl/html.xsl deleted file mode 100644 index 2b0f8d6e2..000000000 --- a/docs/src/reference/resources/xsl/html.xsl +++ /dev/null @@ -1,107 +0,0 @@ - - - - - - - - - - - 0 - 0 - 1 - - - - - - book toc - - - - 3 - - - - - 1 - - - - - - - 1 - - - 90 - - - - - 1 - images/admons/ - - - - figure after - example before - equation before - table before - procedure before - - - - , - - - - () - - - - -
-

Authors

-

- -

- - - - - - - - - diff --git a/docs/src/reference/resources/xsl/html_chunk.xsl b/docs/src/reference/resources/xsl/html_chunk.xsl deleted file mode 100644 index 29b35d281..000000000 --- a/docs/src/reference/resources/xsl/html_chunk.xsl +++ /dev/null @@ -1,221 +0,0 @@ - - - - - - - - - - '5' - '1' - 0 - 0 - 1 - - - - book toc - qandaset toc - - - 3 - - - 1 - - - - - 1 - 90 - - - - - 1 - images/admons/ - - - - figure after - example before - equation before - table before - procedure before - - - - , - - - - () - - - - - -
-

Authors

-

- -

- - - - - - - - - 1 - - - - - - - - - - -
- -
- - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - -   - - - - - - - - - - - - - - -  |  - - -   - - - - - - - - -toc - - - - - - - - -   - - - - - - - - - - - - -
- - - -   - - - Sponsored by SpringSource - - - -   - - - -
- -
- - - diff --git a/docs/src/reference/resources/xsl/pdf-custom.xsl b/docs/src/reference/resources/xsl/pdf-custom.xsl deleted file mode 100644 index 2b2290622..000000000 --- a/docs/src/reference/resources/xsl/pdf-custom.xsl +++ /dev/null @@ -1,522 +0,0 @@ - - - - - - - - - - - '1' - images/admon/ - .png - - - - - 24pt - - - - - - - - - - - - - - - - - - - - -5em - -5em - - - - - - book toc,title - - - - - - - - - - - - - - - - - please define productname in your docbook file! - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 1 - 0 - 1 - 1 - - - - - 0 - 0 - 0 - - - - false - - - 11 - 8 - - - 1.4 - - - - left - bold - - - pt - - - - - - - - - - - - - - - 0.8em - 0.8em - 0.8em - - - pt - - 0.1em - 0.1em - 0.1em - - - 0.6em - 0.6em - 0.6em - - - pt - - 0.1em - 0.1em - 0.1em - - - 0.4em - 0.4em - 0.4em - - - pt - - 0.1em - 0.1em - 0.1em - - - 0.3em - 0.3em - 0.3em - - - pt - - 0.1em - 0.1em - 0.1em - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 4pt - 4pt - 4pt - 4pt - - - - 0.1pt - 0.1pt - - - - - - - - - - - - - - - - - - pt - - - - - 1em - 1em - 1em - 0.1em - 0.1em - 0.1em - - #444444 - solid - 0.1pt - 0.5em - 0.5em - 0.5em - 0.5em - 0.5em - 0.5em - - - - 1 - - #F0F0F0 - - - - 0.1em - 0.1em - 0.1em - 0.1em - 0.1em - 0.1em - - - - 0.5em - 0.5em - 0.5em - 0.1em - 0.1em - 0.1em - always - - - - - - normal - italic - - - pt - - false - 0.1em - 0.1em - 0.1em - - - - - - 0 - 1 - - - 90 - - - - - - figure after - example after - equation before - table before - procedure before - - - - 1 - - 0pt - - - 3 - - - - - - - - - - - - - - - - - - diff --git a/gradle.properties b/gradle.properties index 7ca1a04e2..5e0f545bf 100644 --- a/gradle.properties +++ b/gradle.properties @@ -30,4 +30,4 @@ srp.range = "[0.2, 1.0)" # -------------------- # Project wide version # -------------------- -springDataRedisVersion=1.0.1.BUILD-SNAPSHOT \ No newline at end of file +version=1.0.1.BUILD-SNAPSHOT \ No newline at end of file diff --git a/maven.gradle b/maven.gradle index 3707b53f1..bc4f261c6 100644 --- a/maven.gradle +++ b/maven.gradle @@ -1,125 +1,59 @@ apply plugin: 'maven' -// Create a source jar for uploading -task sourceJar(type: Jar, dependsOn: jar) { - classifier = 'sources' - from sourceSets.main.allSource -} +ext.optionalDeps = [] +ext.providedDeps = [] -// Create a javadoc jar for uploading -task javadocJar(type: Jar, dependsOn: javadoc) { - classifier = 'javadoc' - from javadoc.destinationDir -} - -artifacts { - archives sourceJar - archives javadocJar -} - -// Configuration for SpringSource s3 maven deployer -configurations { - deployerJars -} -dependencies { - deployerJars "org.springframework.build.aws:org.springframework.build.aws.maven:3.0.0.RELEASE" -} - -// Remove the archive configuration from the runtime configuration, so that anything added to archives -// (such as the source jar) is no longer included in the runtime classpath -configurations.default.extendsFrom = [configurations.runtime] as Set -// Add the main jar into the default configuration -artifacts { 'default' jar } - -gradle.taskGraph.whenReady {graph -> - if (graph.hasTask(uploadArchives)) { - // check properties defined and fail early - s3AccessKey - s3SecretAccessKey - } -} - -def deployer = null - -uploadArchives { - description = "Maven deploy of archives artifacts to SpringSource Maven repos" // url appended below - group = "Distribution" - // Maven deployment - def releaseRepositoryUrl = "file://${project.properties.mavenSyncRepoDir}" - def milestoneRepositoryUrl = 's3://maven.springframework.org/milestone' - def snapshotRepositoryUrl = 's3://maven.springframework.org/snapshot' - - // add a configuration with a classpath that includes our s3 maven deployer - configurations { deployerJars } - dependencies { - deployerJars "org.springframework.build.aws:org.springframework.build.aws.maven:3.0.0.RELEASE" - } - - deployer = repositories.mavenDeployer { - configuration = configurations.deployerJars - // releaseBuild - if (releaseBuild) { - logger.info("Deploying to local Maven repo " + releaseRepositoryUrl) - // "mavenSyncRepoDir" should be set in properties - repository(url: releaseRepositoryUrl) - } else { - s3credentials = [userName: project.properties.s3AccessKey, passphrase: project.properties.s3SecretAccessKey] - repository(url: milestoneRepositoryUrl) { - authentication(s3credentials) - } - snapshotRepository(url: snapshotRepositoryUrl) { - authentication(s3credentials) - } - } - } - - customizePom(deployer.pom) -} +ext.optional = { optionalDeps << it } +ext.provided = { providedDeps << it } install { - customizePom(repositories.mavenInstaller.pom) + repositories.mavenInstaller { + customizePom(pom, project) + } } -def customizePom(pom) { - def optionalDeps = ['log4j','jsr250-api'] - - //pom.scopeMappings.addMapping(10, configurations.provided, 'provided') - pom.whenConfigured { p -> - // Remove test scope dependencies from published poms - p.dependencies = p.dependencies.findAll {it.scope != 'test'} - - // Flag optional deps - def opDeps = configurations.testRuntime.allDependencies.findAll { gradleDep -> - gradleDep.asDynamicObject.hasProperty('optional') && gradleDep.optional +def customizePom(pom, gradleProject) { + pom.whenConfigured { generatedPom -> + // respect 'optional' and 'provided' dependencies + gradleProject.optionalDeps.each { dep -> + generatedPom.dependencies.find { it.artifactId == dep.name }?.optional = true + } + gradleProject.providedDeps.each { dep -> + generatedPom.dependencies.find { it.artifactId == dep.name }?.scope = 'provided' } - p.dependencies.findAll { dep -> - optionalDeps.contains(dep.artifactId) || - dep.groupId.startsWith('org.slf4j') || - opDeps.any { op -> - (dep.groupId == op.group && dep.artifactId == op.name) - } - }*.optional = true - - p.groupId = "org.springframework.data" - } - - pom.project { - licenses { - license { - name 'The Apache Software License, Version 2.0' - url 'http://www.apache.org/licenses/LICENSE-2.0.txt' - distribution 'repo' - } + // eliminate test-scoped dependencies (no need in maven central poms) + generatedPom.dependencies.removeAll { dep -> + dep.scope == 'test' } - - // similar to Spring's configuration - dependencies { - dependency { - artifactId = groupId = 'commons-logging' - scope = 'compile' - optional = 'true' - version = '1.1.1' + + // add all items necessary for maven central publication + generatedPom.project { + name = gradleProject.description + description = gradleProject.description + url = 'http://github.com/SpringSource/spring-data-redis' + organization { + name = 'SpringSource' + url = 'http://www.springsource.org/spring-data/redis' + } + licenses { + license { + name 'The Apache Software License, Version 2.0' + url 'http://www.apache.org/licenses/LICENSE-2.0.txt' + distribution 'repo' + } + } + scm { + url = 'http://github.com/SpringSource/spring-data-redis' + connection = 'scm:git:git://github.com/SpringSource/spring-data-redis' + developerConnection = 'scm:git:git://github.com/SpringSource/spring-data-redis' + } + developers { + developer { + id = 'costin' + name = 'Costin Leau' + email = 'cleau@vmware.com' + } } } } diff --git a/settings.gradle b/settings.gradle index bb02d8dfa..abbba828b 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,5 +1 @@ -rootProject.name = 'spring-data-redis' - -include 'docs' - -docs = findProject(':docs') \ No newline at end of file +rootProject.name = 'spring-data-redis' \ No newline at end of file