Skip to content

Commit a237999

Browse files
odrotbohmodrotbohm
committed
DATAMONGO-598 - Upgraded to new build infrastructure.
Fixed test ordering issue in Cross-Store module.
1 parent d8a9752 commit a237999

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

69 files changed

+435
-2392
lines changed

‎pom.xml

Lines changed: 91 additions & 288 deletions
Original file line numberDiff line numberDiff line change
@@ -1,297 +1,100 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
3-
<modelVersion>4.0.0</modelVersion>
4-
<groupId>org.springframework.data</groupId>
5-
<artifactId>spring-data-mongodb-dist</artifactId>
6-
<name>Spring Data MongoDB Distribution</name>
7-
<description>Spring Data project for MongoDB</description>
8-
<url>http://www.springsource.org/spring-data/mongodb</url>
9-
<version>1.2.0.BUILD-SNAPSHOT</version>
10-
<packaging>pom</packaging>
11-
<modules>
12-
<module>spring-data-mongodb</module>
13-
<module>spring-data-mongodb-cross-store</module>
14-
<module>spring-data-mongodb-log4j</module>
15-
<module>spring-data-mongodb-parent</module>
16-
</modules>
2+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
173

18-
<developers>
19-
<developer>
20-
<id>trisberg</id>
21-
<name>Thomas Risberg</name>
22-
<email>trisberg at vmware.com</email>
23-
<organization>SpringSource</organization>
24-
<organizationUrl>http://www.SpringSource.com</organizationUrl>
25-
<roles>
26-
<role>Project Admin</role>
27-
<role>Developer</role>
28-
</roles>
29-
<timezone>-5</timezone>
30-
</developer>
31-
<developer>
32-
<id>mpollack</id>
33-
<name>Mark Pollack</name>
34-
<email>mpollack at vmware.com</email>
35-
<organization>SpringSource</organization>
36-
<organizationUrl>http://www.SpringSource.com</organizationUrl>
37-
<roles>
38-
<role>Project Admin</role>
39-
<role>Developer</role>
40-
</roles>
41-
<timezone>-5</timezone>
42-
</developer>
43-
<developer>
44-
<id>ogierke</id>
45-
<name>Oliver Gierke</name>
46-
<email>ogierke at vmware.com</email>
47-
<organization>SpringSource</organization>
48-
<organizationUrl>http://www.springsource.com</organizationUrl>
49-
<roles>
50-
<role>Developer</role>
51-
</roles>
52-
<timezone>+1</timezone>
53-
</developer>
54-
<developer>
55-
<id>jbrisbin</id>
56-
<name>Jon Brisbin</name>
57-
<email>jbrisbin at vmware.com</email>
58-
<organization>SpringSource</organization>
59-
<organizationUrl>http://www.springsource.com</organizationUrl>
60-
<roles>
61-
<role>Developer</role>
62-
</roles>
63-
<timezone>-6</timezone>
64-
</developer>
65-
</developers>
4+
<modelVersion>4.0.0</modelVersion>
5+
6+
<groupId>org.springframework.data</groupId>
7+
<artifactId>spring-data-mongodb-parent</artifactId>
8+
<version>1.2.0.BUILD-SNAPSHOT</version>
9+
<packaging>pom</packaging>
6610

67-
<licenses>
68-
<license>
69-
<name>Apache License, Version 2.0</name>
70-
<url>http://www.apache.org/licenses/LICENSE-2.0</url>
71-
<comments>
72-
Copyright 2010 the original author or authors.
11+
<name>Spring Data MongoDB</name>
12+
<description>MongoDB support for Spring Data</description>
13+
<url>http://www.springsource.org/spring-data/mongodb</url>
7314

74-
Licensed under the Apache License, Version 2.0 (the "License");
75-
you may not use this file except in compliance with the License.
76-
You may obtain a copy of the License at
15+
<parent>
16+
<groupId>org.springframework.data.build</groupId>
17+
<artifactId>spring-data-parent</artifactId>
18+
<version>1.0.0.BUILD-SNAPSHOT</version>
19+
<relativePath>../spring-data-build/parent/pom.xml</relativePath>
20+
</parent>
21+
22+
<modules>
23+
<module>spring-data-mongodb</module>
24+
<module>spring-data-mongodb-cross-store</module>
25+
<module>spring-data-mongodb-log4j</module>
26+
<module>spring-data-mongodb-distribution</module>
27+
</modules>
7728

78-
http://www.apache.org/licenses/LICENSE-2.0
7929

80-
Unless required by applicable law or agreed to in writing, software
81-
distributed under the License is distributed on an "AS IS" BASIS,
82-
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
83-
implied.
84-
See the License for the specific language governing permissions and
85-
limitations under the License.
86-
</comments>
87-
</license>
88-
</licenses>
30+
<properties>
31+
<project.type>multi</project.type>
32+
<dist.name>spring-data-mongodb</dist.name>
33+
<springdata.commons>1.5.0.BUILD-SNAPSHOT</springdata.commons>
34+
<mongo>2.9.2</mongo>
35+
</properties>
36+
37+
<developers>
38+
<developer>
39+
<id>ogierke</id>
40+
<name>Oliver Gierke</name>
41+
<email>ogierke at vmware.com</email>
42+
<organization>SpringSource</organization>
43+
<organizationUrl>http://www.springsource.com</organizationUrl>
44+
<roles>
45+
<role>Project Lean</role>
46+
</roles>
47+
<timezone>+1</timezone>
48+
</developer>
49+
<developer>
50+
<id>trisberg</id>
51+
<name>Thomas Risberg</name>
52+
<email>trisberg at vmware.com</email>
53+
<organization>SpringSource</organization>
54+
<organizationUrl>http://www.springsource.com</organizationUrl>
55+
<roles>
56+
<role>Developer</role>
57+
</roles>
58+
<timezone>-5</timezone>
59+
</developer>
60+
<developer>
61+
<id>mpollack</id>
62+
<name>Mark Pollack</name>
63+
<email>mpollack at vmware.com</email>
64+
<organization>SpringSource</organization>
65+
<organizationUrl>http://www.springsource.com</organizationUrl>
66+
<roles>
67+
<role>Developer</role>
68+
</roles>
69+
<timezone>-5</timezone>
70+
</developer>
71+
<developer>
72+
<id>jbrisbin</id>
73+
<name>Jon Brisbin</name>
74+
<email>jbrisbin at vmware.com</email>
75+
<organization>SpringSource</organization>
76+
<organizationUrl>http://www.springsource.com</organizationUrl>
77+
<roles>
78+
<role>Developer</role>
79+
</roles>
80+
<timezone>-6</timezone>
81+
</developer>
82+
</developers>
8983

90-
<properties>
91-
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
92-
<!-- dist.* properties are used by the antrun tasks below -->
93-
<dist.id>spring-data-mongo</dist.id>
94-
<dist.name>Spring Data Mongo</dist.name>
95-
<dist.key>SDMONGO</dist.key>
96-
<dist.version>${project.version}</dist.version>
97-
<dist.releaseType>snapshot</dist.releaseType>
98-
<dist.finalName>${dist.id}-${dist.version}</dist.finalName>
99-
<dist.fileName>${dist.finalName}.zip</dist.fileName>
100-
<dist.filePath>target/${dist.fileName}</dist.filePath>
101-
<dist.bucketName>dist.springframework.org</dist.bucketName>
102-
<!-- these properties should be in ~/.m2/settings.xml
103-
<dist.accessKey>s3 access key</dist.accessKey>
104-
<dist.secretKey>s3 secret key</dist.secretKey>
105-
-->
106-
</properties>
84+
<dependencies>
85+
<!-- MongoDB -->
86+
<dependency>
87+
<groupId>org.mongodb</groupId>
88+
<artifactId>mongo-java-driver</artifactId>
89+
<version>${mongo}</version>
90+
</dependency>
91+
</dependencies>
10792

108-
<build>
109-
<extensions>
110-
<extension>
111-
<groupId>org.springframework.build.aws</groupId>
112-
<artifactId>org.springframework.build.aws.maven</artifactId>
113-
<version>3.1.0.RELEASE</version>
114-
</extension>
115-
</extensions>
93+
<repositories>
94+
<repository>
95+
<id>spring-libs-snapshot</id>
96+
<url>http://repo.springsource.org/libs-snapshot-local</url>
97+
</repository>
98+
</repositories>
11699

117-
<plugins>
118-
<plugin>
119-
<groupId>com.agilejava.docbkx</groupId>
120-
<artifactId>docbkx-maven-plugin</artifactId>
121-
<!-- yes it really needs to be this (2.0.7) otherwise pdf generation from a clean build doesn't work -->
122-
<version>2.0.7</version>
123-
<executions>
124-
<execution>
125-
<goals>
126-
<goal>generate-html</goal>
127-
<goal>generate-pdf</goal>
128-
</goals>
129-
<phase>pre-site</phase>
130-
</execution>
131-
</executions>
132-
<dependencies>
133-
<dependency>
134-
<groupId>org.docbook</groupId>
135-
<artifactId>docbook-xml</artifactId>
136-
<version>4.4</version>
137-
<scope>runtime</scope>
138-
</dependency>
139-
</dependencies>
140-
<configuration>
141-
<includes>index.xml</includes>
142-
<xincludeSupported>true</xincludeSupported>
143-
<foCustomization>${project.basedir}/src/docbkx/resources/xsl/fopdf.xsl</foCustomization>
144-
<htmlStylesheet>css/html.css</htmlStylesheet>
145-
<chunkedOutput>false</chunkedOutput>
146-
<htmlCustomization>${project.basedir}/src/docbkx/resources/xsl/html.xsl</htmlCustomization>
147-
<useExtensions>1</useExtensions>
148-
<highlightSource>1</highlightSource>
149-
<highlightDefaultLanguage />
150-
<!-- callouts -->
151-
<entities>
152-
<entity>
153-
<name>version</name>
154-
<value>${project.version}</value>
155-
</entity>
156-
</entities>
157-
<postProcess>
158-
<copy todir="${project.basedir}/target/site/reference">
159-
<fileset dir="${project.basedir}/target/docbkx">
160-
<include name="**/*.html" />
161-
<include name="**/*.pdf" />
162-
</fileset>
163-
</copy>
164-
<copy todir="${project.basedir}/target/site/reference/html">
165-
<fileset dir="${project.basedir}/src/docbkx/resources">
166-
<include name="**/*.css" />
167-
<include name="**/*.png" />
168-
<include name="**/*.gif" />
169-
<include name="**/*.jpg" />
170-
</fileset>
171-
</copy>
172-
<copy todir="${project.basedir}/target/site/reference/html">
173-
<fileset dir="${project.basedir}/src/docbkx/resources/images">
174-
<include name="*.png" />
175-
</fileset>
176-
</copy>
177-
<move file="${project.basedir}/target/site/reference/pdf/index.pdf" tofile="${project.basedir}/target/site/reference/pdf/spring-data-mongo-reference.pdf" failonerror="false" />
178-
</postProcess>
179-
</configuration>
180-
</plugin>
181-
182-
<plugin>
183-
<artifactId>maven-javadoc-plugin</artifactId>
184-
<version>2.5</version>
185-
<configuration>
186-
<aggregate>true</aggregate>
187-
<breakiterator>true</breakiterator>
188-
<header>Spring Data Document</header>
189-
<source>1.5</source>
190-
<quiet>true</quiet>
191-
<javadocDirectory>${project.basedir}/src/main/javadoc</javadocDirectory>
192-
<overview>${project.basedir}/src/main/javadoc/overview.html</overview>
193-
<stylesheetfile>${project.basedir}/src/main/javadoc/spring-javadoc.css</stylesheetfile>
194-
<!-- copies doc-files subdirectory which contains image resources -->
195-
<docfilessubdirs>true</docfilessubdirs>
196-
<links>
197-
<link>http://static.springframework.org/spring/docs/3.0.x/javadoc-api</link>
198-
<link>http://download.oracle.com/javase/1.5.0/docs/api</link>
199-
<link>http://api.mongodb.org/java/2.3</link>
200-
</links>
201-
</configuration>
202-
</plugin>
203-
<plugin><!--
204-
run `mvn package assembly:assembly` to trigger assembly creation.
205-
see http://www.sonatype.com/books/mvnref-book/reference/assemblies-set-dist-assemblies.html -->
206-
<artifactId>maven-assembly-plugin</artifactId>
207-
<version>2.2-beta-5</version>
208-
<inherited>false</inherited>
209-
<executions>
210-
<execution>
211-
<id>distribution</id>
212-
<goals>
213-
<goal>single</goal>
214-
</goals>
215-
<phase>package</phase>
216-
<configuration>
217-
<descriptors>
218-
<descriptor>${project.basedir}/src/assembly/distribution.xml</descriptor>
219-
</descriptors>
220-
<appendAssemblyId>false</appendAssemblyId>
221-
</configuration>
222-
</execution>
223-
</executions>
224-
</plugin>
225-
<plugin>
226-
<groupId>org.apache.maven.plugins</groupId>
227-
<artifactId>maven-antrun-plugin</artifactId>
228-
<version>1.4</version>
229-
<executions>
230-
<execution>
231-
<id>upload-dist</id>
232-
<phase>deploy</phase>
233-
<configuration>
234-
<tasks>
235-
<ant antfile="${basedir}/src/ant/upload-dist.xml">
236-
<target name="upload-dist" />
237-
</ant>
238-
</tasks>
239-
</configuration>
240-
<goals>
241-
<goal>run</goal>
242-
</goals>
243-
</execution>
244-
</executions>
245-
<dependencies>
246-
<dependency>
247-
<groupId>org.springframework.build</groupId>
248-
<artifactId>org.springframework.build.aws.ant</artifactId>
249-
<version>3.0.5.RELEASE</version>
250-
</dependency>
251-
<dependency>
252-
<groupId>net.java.dev.jets3t</groupId>
253-
<artifactId>jets3t</artifactId>
254-
<version>0.7.2</version>
255-
</dependency>
256-
</dependencies>
257-
</plugin>
258-
</plugins>
259-
<!-- the name of this project is 'spring-data-mongo-dist';
260-
make sure the zip file is just 'spring-data-mongo'. -->
261-
<finalName>${dist.finalName}</finalName>
262-
</build>
263-
264-
<pluginRepositories>
265-
<!-- Necessary for the build extension -->
266-
<pluginRepository>
267-
<id>spring-plugins-release</id>
268-
<url>http://repo.springsource.org/plugins-release</url>
269-
</pluginRepository>
270-
</pluginRepositories>
271-
272-
<distributionManagement>
273-
<!-- see 'staging' profile for dry-run deployment settings -->
274-
<downloadUrl>http://www.springsource.com/spring-data</downloadUrl>
275-
<site>
276-
<id>static.springframework.org</id>
277-
<url>
278-
scp://static.springframework.org/var/www/domains/springframework.org/static/htdocs/spring-data/data-mongodb/snapshot-site
279-
</url>
280-
</site>
281-
<repository>
282-
<id>spring-milestone</id>
283-
<name>Spring Milestone Repository</name>
284-
<url>s3://maven.springframework.org/milestone</url>
285-
</repository>
286-
<snapshotRepository>
287-
<id>spring-snapshot</id>
288-
<name>Spring Snapshot Repository</name>
289-
<url>s3://maven.springframework.org/snapshot</url>
290-
</snapshotRepository>
291-
</distributionManagement>
292-
293-
<scm>
294-
<url>https://github.com/SpringSource/spring-data-mongodb</url>
295-
</scm>
296-
297-
</project>
100+
</project>

0 commit comments

Comments
 (0)