DATAMONGO-1448 - Prepare 2.0 development.
Upgraded to Spring Data Build parent 2.0 snapshots and Spring Data Commons 2.0 snapshots. Removed obsolete distribution key property. Removed obsolete template.mf.
This commit is contained in:
committed by
Oliver Gierke
parent
ea9b402547
commit
da5289fc18
20
pom.xml
20
pom.xml
@@ -5,7 +5,7 @@
|
|||||||
|
|
||||||
<groupId>org.springframework.data</groupId>
|
<groupId>org.springframework.data</groupId>
|
||||||
<artifactId>spring-data-mongodb-parent</artifactId>
|
<artifactId>spring-data-mongodb-parent</artifactId>
|
||||||
<version>1.10.0.BUILD-SNAPSHOT</version>
|
<version>2.0.0.BUILD-SNAPSHOT</version>
|
||||||
<packaging>pom</packaging>
|
<packaging>pom</packaging>
|
||||||
|
|
||||||
<name>Spring Data MongoDB</name>
|
<name>Spring Data MongoDB</name>
|
||||||
@@ -15,7 +15,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>org.springframework.data.build</groupId>
|
<groupId>org.springframework.data.build</groupId>
|
||||||
<artifactId>spring-data-parent</artifactId>
|
<artifactId>spring-data-parent</artifactId>
|
||||||
<version>1.9.0.BUILD-SNAPSHOT</version>
|
<version>2.0.0.BUILD-SNAPSHOT</version>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
<modules>
|
<modules>
|
||||||
@@ -28,9 +28,8 @@
|
|||||||
<properties>
|
<properties>
|
||||||
<project.type>multi</project.type>
|
<project.type>multi</project.type>
|
||||||
<dist.id>spring-data-mongodb</dist.id>
|
<dist.id>spring-data-mongodb</dist.id>
|
||||||
<springdata.commons>1.13.0.BUILD-SNAPSHOT</springdata.commons>
|
<springdata.commons>2.0.0.BUILD-SNAPSHOT</springdata.commons>
|
||||||
<mongo>2.14.3</mongo>
|
<mongo>2.14.0</mongo>
|
||||||
<mongo.osgi>2.13.0</mongo.osgi>
|
|
||||||
</properties>
|
</properties>
|
||||||
|
|
||||||
<developers>
|
<developers>
|
||||||
@@ -100,6 +99,17 @@
|
|||||||
</roles>
|
</roles>
|
||||||
<timezone>+1</timezone>
|
<timezone>+1</timezone>
|
||||||
</developer>
|
</developer>
|
||||||
|
<developer>
|
||||||
|
<id>mpaluch</id>
|
||||||
|
<name>Mark Paluch</name>
|
||||||
|
<email>mpaluch at pivotal.io</email>
|
||||||
|
<organization>Pivotal</organization>
|
||||||
|
<organizationUrl>http://www.pivotal.io</organizationUrl>
|
||||||
|
<roles>
|
||||||
|
<role>Developer</role>
|
||||||
|
</roles>
|
||||||
|
<timezone>+1</timezone>
|
||||||
|
</developer>
|
||||||
</developers>
|
</developers>
|
||||||
|
|
||||||
<profiles>
|
<profiles>
|
||||||
|
|||||||
@@ -6,7 +6,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>org.springframework.data</groupId>
|
<groupId>org.springframework.data</groupId>
|
||||||
<artifactId>spring-data-mongodb-parent</artifactId>
|
<artifactId>spring-data-mongodb-parent</artifactId>
|
||||||
<version>1.10.0.BUILD-SNAPSHOT</version>
|
<version>2.0.0.BUILD-SNAPSHOT</version>
|
||||||
<relativePath>../pom.xml</relativePath>
|
<relativePath>../pom.xml</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
@@ -48,7 +48,7 @@
|
|||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.springframework.data</groupId>
|
<groupId>org.springframework.data</groupId>
|
||||||
<artifactId>spring-data-mongodb</artifactId>
|
<artifactId>spring-data-mongodb</artifactId>
|
||||||
<version>1.10.0.BUILD-SNAPSHOT</version>
|
<version>2.0.0.BUILD-SNAPSHOT</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
<dependency>
|
<dependency>
|
||||||
|
|||||||
@@ -1,18 +0,0 @@
|
|||||||
Bundle-SymbolicName: org.springframework.data.mongodb.crossstore
|
|
||||||
Bundle-Name: Spring Data MongoDB Cross Store Support
|
|
||||||
Bundle-Vendor: Pivotal Software, Inc.
|
|
||||||
Bundle-ManifestVersion: 2
|
|
||||||
Import-Package:
|
|
||||||
sun.reflect;version="0";resolution:=optional
|
|
||||||
Export-Template:
|
|
||||||
org.springframework.data.mongodb.crossstore.*;version="${project.version}"
|
|
||||||
Import-Template:
|
|
||||||
com.mongodb.*;version="${mongo.osgi:[=.=.=,+1.0.0)}",
|
|
||||||
javax.persistence.*;version="${jpa:[=.=.=,+1.0.0)}",
|
|
||||||
org.aspectj.*;version="${aspectj:[1.0.0, 2.0.0)}",
|
|
||||||
org.bson.*;version="0",
|
|
||||||
org.slf4j.*;version="${slf4j:[=.=.=,+1.0.0)}",
|
|
||||||
org.springframework.*;version="${spring:[=.=.=.=,+1.0.0)}",
|
|
||||||
org.springframework.data.*;version="${springdata.commons:[=.=.=.=,+1.0.0)}",
|
|
||||||
org.springframework.data.mongodb.*;version="${project.version:[=.=.=.=,+1.0.0)}",
|
|
||||||
org.w3c.dom.*;version="0"
|
|
||||||
@@ -13,7 +13,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>org.springframework.data</groupId>
|
<groupId>org.springframework.data</groupId>
|
||||||
<artifactId>spring-data-mongodb-parent</artifactId>
|
<artifactId>spring-data-mongodb-parent</artifactId>
|
||||||
<version>1.10.0.BUILD-SNAPSHOT</version>
|
<version>2.0.0.BUILD-SNAPSHOT</version>
|
||||||
<relativePath>../pom.xml</relativePath>
|
<relativePath>../pom.xml</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
|
|||||||
@@ -5,7 +5,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>org.springframework.data</groupId>
|
<groupId>org.springframework.data</groupId>
|
||||||
<artifactId>spring-data-mongodb-parent</artifactId>
|
<artifactId>spring-data-mongodb-parent</artifactId>
|
||||||
<version>1.10.0.BUILD-SNAPSHOT</version>
|
<version>2.0.0.BUILD-SNAPSHOT</version>
|
||||||
<relativePath>../pom.xml</relativePath>
|
<relativePath>../pom.xml</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
|
|||||||
@@ -1,9 +0,0 @@
|
|||||||
Bundle-SymbolicName: org.springframework.data.mongodb.log4j
|
|
||||||
Bundle-Name: Spring Data Mongo DB Log4J Appender
|
|
||||||
Bundle-Vendor: Pivotal Software, Inc.
|
|
||||||
Bundle-ManifestVersion: 2
|
|
||||||
Import-Package:
|
|
||||||
sun.reflect;version="0";resolution:=optional
|
|
||||||
Import-Template:
|
|
||||||
com.mongodb.*;version="${mongo.osgi:[=.=.=,+1.0.0)}",
|
|
||||||
org.apache.log4j.*;version="${log4j:[=.=.=,+1.0.0)}"
|
|
||||||
@@ -11,7 +11,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>org.springframework.data</groupId>
|
<groupId>org.springframework.data</groupId>
|
||||||
<artifactId>spring-data-mongodb-parent</artifactId>
|
<artifactId>spring-data-mongodb-parent</artifactId>
|
||||||
<version>1.10.0.BUILD-SNAPSHOT</version>
|
<version>2.0.0.BUILD-SNAPSHOT</version>
|
||||||
<relativePath>../pom.xml</relativePath>
|
<relativePath>../pom.xml</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
|
|||||||
@@ -1,29 +0,0 @@
|
|||||||
Bundle-SymbolicName: org.springframework.data.mongodb
|
|
||||||
Bundle-Name: Spring Data MongoDB Support
|
|
||||||
Bundle-Vendor: Pivotal Software, Inc.
|
|
||||||
Bundle-ManifestVersion: 2
|
|
||||||
Excluded-Imports:
|
|
||||||
lombok.*
|
|
||||||
Import-Package:
|
|
||||||
sun.reflect;version="0";resolution:=optional
|
|
||||||
Export-Template:
|
|
||||||
org.springframework.data.mongodb.*;version="${project.version}"
|
|
||||||
Import-Template:
|
|
||||||
com.fasterxml.jackson.*;version="${jackson:[=.=.=,+1.0.0)}";resolution:=optional,
|
|
||||||
com.google.common.base.*;version="[11.0.0,14.0.0)";resolution:=optional,
|
|
||||||
com.mongodb.*;version="${mongo.osgi:[=.=.=,+1.0.0)}",
|
|
||||||
com.querydsl.*;version="${querydsl:[=.=.=,+1.0.0)}";resolution:=optional,
|
|
||||||
javax.annotation.processing.*;version="0",
|
|
||||||
javax.enterprise.*;version="${cdi:[=.=.=,+1.0.0)}";resolution:=optional,
|
|
||||||
javax.tools.*;version="0",
|
|
||||||
javax.net.*;version="0",
|
|
||||||
javax.validation.*;version="${validation:[=.=.=.=,+1.0.0)}";resolution:=optional,
|
|
||||||
javax.xml.bind.*;version=0,
|
|
||||||
org.aopalliance.*;version="[1.0.0, 2.0.0)";resolution:=optional,
|
|
||||||
org.bson.*;version="0",
|
|
||||||
org.objenesis.*;version="${objenesis:[=.=.=, +1.0.0)}";resolution:=optional,
|
|
||||||
org.slf4j.*;version="${slf4j:[=.=.=,+1.0.0)}",
|
|
||||||
org.springframework.*;version="${spring:[=.=.=.=,+1.0.0)}",
|
|
||||||
org.springframework.data.*;version="${springdata.commons:[=.=.=.=,+1.0.0)}",
|
|
||||||
org.springframework.data.mongodb.*;version="${project.version:[=.=.=.=,+1.0.0)}",
|
|
||||||
org.w3c.dom.*;version="0"
|
|
||||||
Reference in New Issue
Block a user