diff --git a/build.gradle b/build.gradle index 4506b42b2..c5b8aa790 100644 --- a/build.gradle +++ b/build.gradle @@ -45,16 +45,16 @@ configure(javaprojects) { [compileJava, compileTestJava]*.options*.compilerArgs = ["-Xlint:all"] assemble.dependsOn generatePom - - // add tasks for creating source jars and generating poms etc - apply from: "$buildSrcDir/maven-deployment.gradle" - - // add tasks for finding and publishing .xsd files - apply from: "$buildSrcDir/schema-publication.gradle" + + // add tasks for creating source jars and generating poms etc + apply from: "$buildSrcDir/maven-deployment.gradle" + + // add tasks for finding and publishing .xsd files + apply from: "$buildSrcDir/schema-publication.gradle" repositories { // Public Spring artefacts - mavenRepo name: "springsource-org-release", urls: "http://repository.springsource.com/maven/bundles/release" + 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" @@ -111,6 +111,17 @@ ideaProject { // ----------------------------------------------------------------------------- project('docs') { apply from: "$buildSrcDir/docs.gradle" + // javadoc settings + api.options.breakIterator = true + api.options.showFromProtected() + api.options.groups = [ + 'Spring Data Key Value Core': ['org.springframework.data.keyvalue*'], + 'Spring Data Redis Support' : ['org.springframework.data.keyvalue.redis*'], + 'Spring Data Riak Support' : ['org.springframework.data.keyvalue.riak*']] + + api.options.links = [ + "http://static.springframework.org/spring/docs/3.0.x/javadoc-api", + "http://download.oracle.com/javase/6/docs/api/"] } apply from: "$buildSrcDir/dist.gradle" diff --git a/pom.xml b/pom.xml index e22db00df..aff9e42e5 100644 --- a/pom.xml +++ b/pom.xml @@ -1,367 +1,15 @@ - + 4.0.0 - org.springframework.data - spring-data-keyvalue-dist - Spring Data Key-Value Distribution - 1.0.0.M2-SNAPSHOT + org.springframework.data.keyvalue + spring-data-key-value + 1.0.0.M2-BUILD-SNAPSHOT pom - - - src/main/javadoc - false - - + Spring Data Key Value - spring-data-keyvalue-parent spring-data-keyvalue-core spring-data-redis spring-data-riak - - - SpringSource - http://www.SpringSource.org - - - - - mpollack - Mark Pollack - mpollack at vmware.com - SpringSource - http://www.SpringSource.com - - Project Admin - Developer - - -5 - - - cleau - Costin Leau - cleau at vmware.com - SpringSource - http://www.SpringSource.com - - Developer - - +2 - - - jbrisbin - Jon Brisbin - jbrisbin at vmware.com - SpringSource - http://www.SpringSource.com - - Developer - - -6 - - - - - - Apache License, Version 2.0 - http://www.apache.org/licenses/LICENSE-2.0 - - Copyright 2010 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. - - - - - - JIRA - - http://jira.springframework.org/browse/DATAKV - - - - - bamboo - http://build.springframework.org/browse/DATAKV - - - - - scm:git:git://github.com/SpringSource/spring-data-keyvalue.git - - - scm:git:git@github.com:SpringSource/spring-data-keyvalue.git - - http://fisheye.springsource.org/browse/datakv - - - 2010 - - - - - org.springframework.build.aws - org.springframework.build.aws.maven - 2.0.0.RELEASE - - - - - - maven-compiler-plugin - - 1.6 - 1.6 - - - - - com.agilejava.docbkx - docbkx-maven-plugin - 2.0.7 - - - - generate-html - generate-pdf - - 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 - 1 - - - - - version - ${pom.version} - - - - - - - - - - - - - - - - - - - - - - - - maven-javadoc-plugin - 2.7 - - true - true - true -
Spring Data Key-Value
- 1.5 - protected - true - ${javadoc.loc} - ${javadoc.loc}/overview.html - ${javadoc.loc}/javadoc.css - true - - - - Spring Data Key Value Core - org.springframework.data.keyvalue* - - - Spring Data Redis Support - org.springframework.data.keyvalue.redis* - - - Spring Data Riak Support - org.springframework.data.keyvalue.riak* - - - - http://static.springframework.org/spring/docs/3.0.x/javadoc-api - http://download.oracle.com/javase/6/docs/api/ - - - - - - - - - - - maven-source-plugin - - - - org.codehaus.mojo - jxr-maven-plugin - - - - - - - org.codehaus.mojo - findbugs-maven-plugin - 2.3.1 - - - Normal - Default - - ${findbugs.skip} - - - - - - - - org.codehaus.mojo - jdepend-maven-plugin - - - org.apache.maven.plugins - maven-pmd-plugin - - - org.apache.maven.plugins - maven-surefire-report-plugin - 2.6 - - true - - - - - - - - http://www.springsource.com/spring-data - - static.springframework.org - - scp://static.springframework.org/var/www/domains/springframework.org/static/htdocs/spring-data/data-keyvalue/snapshot-site/ - - - - spring-milestone - Spring Milestone Repository - s3://maven.springframework.org/milestone - - - spring-snapshot - Spring Snapshot Repository - s3://maven.springframework.org/snapshot - - - - \ No newline at end of file + diff --git a/spring-data-keyvalue-parent/.project b/spring-data-keyvalue-parent/.project deleted file mode 100644 index 03147c50b..000000000 --- a/spring-data-keyvalue-parent/.project +++ /dev/null @@ -1,17 +0,0 @@ - - - spring-datastore-keyvalue-parent - - - - - - org.maven.ide.eclipse.maven2Builder - - - - - - org.maven.ide.eclipse.maven2Nature - - diff --git a/spring-data-keyvalue-parent/.settings/org.maven.ide.eclipse.prefs b/spring-data-keyvalue-parent/.settings/org.maven.ide.eclipse.prefs deleted file mode 100644 index a8112de66..000000000 --- a/spring-data-keyvalue-parent/.settings/org.maven.ide.eclipse.prefs +++ /dev/null @@ -1,9 +0,0 @@ -#Mon Oct 11 17:02:20 EDT 2010 -activeProfiles= -eclipse.preferences.version=1 -fullBuildGoals=process-test-resources -includeModules=false -resolveWorkspaceProjects=true -resourceFilterGoals=process-resources resources\:testResources -skipCompilerPlugin=true -version=1 diff --git a/spring-data-keyvalue-parent/pom.xml b/spring-data-keyvalue-parent/pom.xml deleted file mode 100644 index e0b82b8d7..000000000 --- a/spring-data-keyvalue-parent/pom.xml +++ /dev/null @@ -1,508 +0,0 @@ - - - 4.0.0 - org.springframework.data - spring-data-keyvalue-parent - Spring Data Key-Value Parent - http://www.springsource.org/spring-data/data-keyvalue - 1.0.0.M2-SNAPSHOT - pom - - - UTF-8 - - 4.8.1 - 1.2.15 - 1.6.1 - 1.8.5 - 1.5.8 - 0.5-groovy-1.7-SNAPSHOT - 3.0.5.RELEASE - - spring-data-keyvalue - Spring Data Key-Value - DATAKV - ${project.version} - snapshot - ${dist.id}-${dist.version} - ${dist.finalName}.zip - target/${dist.fileName} - dist.springframework.org - - - ../src/main/javadoc - - - - - - - strict - - false - - - - fast - - true - true - - - - staging - - - spring-site-staging - file:///${java.io.tmpdir}/spring-data/data-keyvalue/docs - - - - spring-milestone-staging - - file:///${java.io.tmpdir}/spring-data/data-keyvalue/milestone - - - - spring-snapshot-staging - file:///${java.io.tmpdir}/spring-data/data-keyvalue/snapshot - - - - - - bootstrap - - - - - - - - - - - org.springframework - spring-aop - ${org.springframework.version} - - - org.springframework - spring-beans - ${org.springframework.version} - - - org.springframework - spring-core - ${org.springframework.version} - - - commons-logging - commons-logging - - - - - org.springframework - spring-tx - ${org.springframework.version} - - - org.springframework - spring-test - ${org.springframework.version} - test - - - org.springframework - spring-web - ${org.springframework.version} - - - - - org.codehaus.groovy - groovy-all - 1.7.5 - - - - - org.springframework.data - spring-data-keyvalue-core - ${project.version} - - - org.springframework.data - spring-data-redis - ${project.version} - - - - - org.codehaus.jackson - jackson-core-asl - ${org.codehaus.jackson.version} - - - org.codehaus.jackson - jackson-mapper-asl - ${org.codehaus.jackson.version} - - - - - org.slf4j - slf4j-api - ${org.slf4j.version} - - - org.slf4j - jcl-over-slf4j - ${org.slf4j.version} - runtime - - - org.slf4j - slf4j-log4j12 - ${org.slf4j.version} - runtime - - - log4j - log4j - ${log4j.version} - - - javax.mail - mail - - - javax.jms - jms - - - com.sun.jdmk - jmxtools - - - com.sun.jmx - jmxri - - - runtime - - - - javax.annotation - jsr250-api - 1.0 - true - - - - javax.mail - mail - 1.4.1 - - - javax.activation - activation - 1.1.1 - - - - org.mockito - mockito-all - ${org.mockito.version} - test - - - - junit - junit - ${junit.version} - test - - - org.spockframework - spock-spring - ${org.spockframework.version} - - - junit - junit-dep - - - test - - - - - - - - log4j - log4j - ${log4j.version} - test - - - - - - - org.springframework.build.aws - org.springframework.build.aws.maven - 2.0.0.RELEASE - - - - - ${project.basedir}/src/main/java - - **/* - - - **/*.java - - - - ${project.basedir}/src/main/resources - - **/* - - - - - - ${project.basedir}/src/test/java - - **/* - - - **/*.java - - - - ${project.basedir}/src/test/resources - - **/* - - - **/*.java - - - - - - org.apache.maven.plugins - maven-compiler-plugin - - 1.5 - 1.5 - -Xlint:all - true - false - - - - org.apache.maven.plugins - maven-surefire-plugin - - false - - **/*Tests.java - - - **/Abstract*.java - - - junit:junit - - - - org.apache.maven.plugins - maven-jar-plugin - - - ${project.build.outputDirectory}/META-INF/MANIFEST.MF - - - - - - - - - - com.springsource.bundlor - com.springsource.bundlor.maven - 1.0.0.RELEASE - - true - - - - bundlor - compile - - bundlor - - - - - - org.apache.maven.plugins - maven-jar-plugin - 2.3.1 - - - org.spockframework - spock-maven - ${org.spockframework.version} - - - - find-specs - - - - - - - - - - - - - repository.plugin.springsource.release - SpringSource Maven Repository - http://repository.springsource.com/maven/bundles/release - - - spockframework - Spock Framework - http://m2repo.spockframework.org/snapshots - - true - - - - - - repository.springframework.maven.release - Spring Framework Maven Release Repository - http://maven.springframework.org/release - - - repository.springframework.maven.milestone - Spring Framework Maven Milestone Repository - http://maven.springframework.org/milestone - - - repository.springframework.maven.snapshot - Spring Framework Maven Snapshot Repository - http://maven.springframework.org/snapshot - - - spring-ext - Spring External Dependencies Repository - - http://springframework.svn.sourceforge.net/svnroot/springframework/repos/repo-ext/ - - - - spockframework - Spock Framework - http://m2repo.spockframework.org/snapshots - - true - - - - - - - - - org.apache.maven.plugins - maven-project-info-reports-plugin - 2.1 - - false - - - - - - - - http://www.springsource.com/spring-data - - static.springframework.org - - scp://static.springframework.org/var/www/domains/springframework.org/static/htdocs/spring-data/data-keyvalue/snapshot-site/ - - - - spring-milestone - Spring Milestone Repository - s3://maven.springframework.org/milestone - - - spring-snapshot - Spring Snapshot Repository - s3://maven.springframework.org/snapshot - - - - \ No newline at end of file diff --git a/spring-data-redis/build.gradle b/spring-data-redis/build.gradle index f154b205b..ce522c299 100644 --- a/spring-data-redis/build.gradle +++ b/spring-data-redis/build.gradle @@ -9,4 +9,4 @@ dependencies { compile "redis.clients:jedis:$jedisVersion" compile "org.jredis:jredis-anthonylauzon:$jredisVersion" compile "org.springframework:spring-oxm:$springVersion" -} +} \ No newline at end of file