DATAREDIS-569 - Prepare 2.0 development.
Upgarde to Spring Data KeyValue 2.0.
This commit is contained in:
Christoph Strobl
committed by
Mark Paluch
Mark Paluch
parent
1713f6d5e4
commit
186b6dd457
29
pom.xml
29
pom.xml
@@ -5,19 +5,18 @@
|
||||
|
||||
<groupId>org.springframework.data</groupId>
|
||||
<artifactId>spring-data-redis</artifactId>
|
||||
<version>1.8.0.BUILD-SNAPSHOT</version>
|
||||
<version>2.0.0.BUILD-SNAPSHOT</version>
|
||||
|
||||
<name>Spring Data Redis</name>
|
||||
|
||||
<parent>
|
||||
<groupId>org.springframework.data.build</groupId>
|
||||
<artifactId>spring-data-parent</artifactId>
|
||||
<version>1.9.0.BUILD-SNAPSHOT</version>
|
||||
<version>2.0.0.BUILD-SNAPSHOT</version>
|
||||
</parent>
|
||||
|
||||
<properties>
|
||||
<dist.key>DATAREDIS</dist.key>
|
||||
<springdata.keyvalue>1.2.0.BUILD-SNAPSHOT</springdata.keyvalue>
|
||||
<springdata.keyvalue>2.0.0.BUILD-SNAPSHOT</springdata.keyvalue>
|
||||
<jta>1.1</jta>
|
||||
<beanutils>1.9.2</beanutils>
|
||||
<xstream>1.4.8</xstream>
|
||||
@@ -31,26 +30,26 @@
|
||||
|
||||
<dependencyManagement>
|
||||
<dependencies>
|
||||
|
||||
|
||||
<dependency>
|
||||
<groupId>org.apache.commons</groupId>
|
||||
<artifactId>commons-pool2</artifactId>
|
||||
<version>${pool}</version>
|
||||
</dependency>
|
||||
|
||||
|
||||
<dependency>
|
||||
<groupId>com.google.guava</groupId>
|
||||
<artifactId>guava</artifactId>
|
||||
<version>${guava}</version>
|
||||
</dependency>
|
||||
|
||||
|
||||
</dependencies>
|
||||
</dependencyManagement>
|
||||
|
||||
<dependencies>
|
||||
|
||||
<!-- Spring -->
|
||||
|
||||
|
||||
<dependency>
|
||||
<groupId>org.springframework.data</groupId>
|
||||
<artifactId>spring-data-keyvalue</artifactId>
|
||||
@@ -78,14 +77,14 @@
|
||||
</dependency>
|
||||
|
||||
<!-- REDIS Drivers -->
|
||||
|
||||
|
||||
<dependency>
|
||||
<groupId>redis.clients</groupId>
|
||||
<artifactId>jedis</artifactId>
|
||||
<version>${jedis}</version>
|
||||
<optional>true</optional>
|
||||
</dependency>
|
||||
|
||||
|
||||
<dependency>
|
||||
<groupId>org.jredis</groupId>
|
||||
<artifactId>jredis-core-api</artifactId>
|
||||
@@ -221,7 +220,7 @@
|
||||
|
||||
<build>
|
||||
<plugins>
|
||||
|
||||
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-surefire-plugin</artifactId>
|
||||
@@ -242,12 +241,12 @@
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-assembly-plugin</artifactId>
|
||||
</plugin>
|
||||
|
||||
|
||||
<plugin>
|
||||
<groupId>org.codehaus.mojo</groupId>
|
||||
<artifactId>wagon-maven-plugin</artifactId>
|
||||
</plugin>
|
||||
|
||||
|
||||
<plugin>
|
||||
<groupId>org.asciidoctor</groupId>
|
||||
<artifactId>asciidoctor-maven-plugin</artifactId>
|
||||
@@ -261,13 +260,13 @@
|
||||
<id>release</id>
|
||||
<build>
|
||||
<plugins>
|
||||
|
||||
|
||||
<plugin>
|
||||
<groupId>org.jfrog.buildinfo</groupId>
|
||||
<artifactId>artifactory-maven-plugin</artifactId>
|
||||
<inherited>false</inherited>
|
||||
</plugin>
|
||||
|
||||
|
||||
</plugins>
|
||||
</build>
|
||||
</profile>
|
||||
|
||||
41
template.mf
41
template.mf
@@ -1,41 +0,0 @@
|
||||
Bundle-ManifestVersion: 2
|
||||
Bundle-SymbolicName: org.springframework.data.redis
|
||||
Bundle-Name: ${project.name}
|
||||
Bundle-Vendor: Pivotal Software, Inc.
|
||||
Bundle-Version: ${project.version}
|
||||
Bundle-RequiredExecutionEnvironment: J2SE-1.6
|
||||
Export-Template:
|
||||
org.springframework.data.redis.*;version="${project.version}"
|
||||
Import-Package:
|
||||
sun.reflect;version="0";resolution:=optional
|
||||
Import-Template:
|
||||
org.springframework.beans.*;version="${spring:[=.=.=.=,+1.1.0)}",
|
||||
org.springframework.cache.*;version="${spring:[=.=.=.=,+1.1.0)}",
|
||||
org.springframework.context.*;version="${spring:[=.=.=.=,+1.1.0)}",
|
||||
org.springframework.core.*;version="${spring:[=.=.=.=,+1.1.0)}",
|
||||
org.springframework.dao.*;version="${spring:[=.=.=.=,+1.1.0)}",
|
||||
org.springframework.scheduling.*;resolution:="optional";version="${spring:[=.=.=.=,+1.1.0)}",
|
||||
org.springframework.scripting.*;resolution:="optional";version="${spring:[=.=.=.=,+1.1.0)}",
|
||||
org.springframework.util.*;version="${spring:[=.=.=.=,+1.1.0)}",
|
||||
org.springframework.aop.*;version="${spring:[=.=.=.=,+1.1.0)}",
|
||||
org.springframework.cglib.*;version="${spring:[=.=.=.=,+1.1.0)}",
|
||||
org.springframework.oxm.*;resolution:="optional";version="${spring:[=.=.=.=,+1.1.0)}",
|
||||
org.springframework.transaction.support.*;version="${spring:[=.=.=.=,+1.1.0)}",
|
||||
org.springframework.expression.*;version="${spring:[=.=.=.=,+1.1.0)}",
|
||||
org.springframework.data.*;version="0",
|
||||
org.slf4j.*;version="${slf4j:[=.=.=,+1.0.0)}",
|
||||
org.aopalliance.*;version="[1.0.0, 2.0.0)";resolution:=optional,
|
||||
org.apache.commons.logging.*;version="[1.1.1, 2.0.0)",
|
||||
org.w3c.dom.*;version="0",
|
||||
javax.xml.transform.*;resolution:="optional";version="0",
|
||||
javax.enterprise.*;version="${cdi:[=.=.=,+1.0.0)}";resolution:=optional,
|
||||
org.jredis.*;resolution:="optional";version="[1.0.0, 2.0.0)",
|
||||
redis.clients.*;resolution:="optional";version="${jedis}",
|
||||
org.apache.commons.pool2.*;resolution:="optional";version="${pool}",
|
||||
org.codehaus.jackson.*;resolution:="optional";version="[1.6, 2.0.0)",
|
||||
com.fasterxml.jackson.*;resolution:="optional";version="${jackson}",
|
||||
org.apache.commons.beanutils.*;resolution:="optional";version="${beanutils}",
|
||||
redis.*;resolution:="optional";version="[0.2, 1.0)",
|
||||
com.google.common.*;resolution:="optional";version="[11.0.0, 20.0.0)",
|
||||
com.lambdaworks.redis.*;resolution:="optional";version="[3.3, 4)",
|
||||
io.netty.channel.*;resolution:="optional";version="[4.0.0, 5.0.0)"
|
||||
Reference in New Issue
Block a user