#197 - Upgraded to Spring Boot 1.4 RC1.

Tweaked the output folder for Querydsl type generation to avoid running into a bug in the Maven compiler plugin 3.5.1 [0].

Fixed an issue in a sample script used to demonstrate MongoDB script execution as the new JavaScript engine seems to be more strict.

Switched to the MongoDB starter and excluded the legacy MongoDB Java driver from projects using Querydsl to consistently make use of the current driver only.

[0] https://issues.apache.org/jira/browse/MCOMPILER-271
This commit is contained in:
Oliver Gierke
2016-07-11 13:05:13 +02:00
parent 5bb1b8b77c
commit 9ee13be9b5
8 changed files with 27 additions and 11 deletions

View File

@@ -45,7 +45,7 @@
<dependency>
<groupId>org.springframework.data</groupId>
<artifactId>spring-data-mongodb</artifactId>
<artifactId>spring-data-jpa</artifactId>
</dependency>
</dependencies>

View File

@@ -30,7 +30,6 @@
<properties>
<hibernate.version>5.2.1.Final</hibernate.version>
<spring.version>4.3.0.RELEASE</spring.version>
</properties>
<dependencies>

View File

@@ -32,13 +32,14 @@
<goal>process</goal>
</goals>
<configuration>
<outputDirectory>target/generated-sources/annotations</outputDirectory>
<outputDirectory>target/generated-sources/queries</outputDirectory>
<processor>org.springframework.data.mongodb.repository.support.MongoAnnotationProcessor</processor>
<logOnlyOnError>true</logOnlyOnError>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>

View File

@@ -104,7 +104,7 @@ public class ServersideScriptTests {
operations.getConverter().write(customer, dbo);
String scriptString = String.format(
"object = db.%1$s.findOne('{\"_id\": \"%2$s\"}'); if (object == null) { db.%1s.insert(%3$s); return null; } else { return object; }",
"object = db.%1$s.findOne({\"_id\": \"%2$s\"}); if (object == null) { db.%1s.insert(%3$s); return null; } else { return object; }",
collectionName, id, dbo);
return new ExecutableMongoScript(scriptString);

View File

@@ -29,14 +29,20 @@
<dependencies>
<dependency>
<groupId>org.springframework.data</groupId>
<artifactId>spring-data-mongodb</artifactId>
</dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-data-mongodb</artifactId>
</dependency>
<dependency>
<groupId>com.querydsl</groupId>
<artifactId>querydsl-mongodb</artifactId>
<version>${querydsl.version}</version>
<exclusions>
<exclusion>
<groupId>org.mongodb</groupId>
<artifactId>mongo-java-driver</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>

View File

@@ -12,7 +12,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>1.4.0.M3</version>
<version>1.4.0.RC1</version>
</parent>
<modules>
@@ -34,9 +34,7 @@
<apt.version>1.1.3</apt.version>
<java.version>1.8</java.version>
<querydsl.version>4.1.0</querydsl.version>
<spring-data-releasetrain.version>Hopper-SR2</spring-data-releasetrain.version>
<spring-hateoas.version>0.20.0.RELEASE</spring-hateoas.version>
<querydsl.version>4.1.3</querydsl.version>
</properties>

View File

@@ -29,6 +29,12 @@
<groupId>com.querydsl</groupId>
<artifactId>querydsl-mongodb</artifactId>
<version>${querydsl.version}</version>
<exclusions>
<exclusion>
<groupId>org.mongodb</groupId>
<artifactId>mongo-java-driver</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>

View File

@@ -28,6 +28,12 @@
<groupId>com.querydsl</groupId>
<artifactId>querydsl-mongodb</artifactId>
<version>${querydsl.version}</version>
<exclusions>
<exclusion>
<groupId>org.mongodb</groupId>
<artifactId>mongo-java-driver</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>