Spring/spring-data-jpa
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

DATAJPA-164 - Prepare 1.1.0.RC1.

Browse Source
This commit is contained in:
Oliver Gierke
2012-02-08 19:02:36 +01:00
parent 0c4868dc17
commit 3f1043a0fd
4 changed files with 47 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
pom.xml
View File

@@ -52,7 +52,7 @@
</licenses>
<properties>
<spring.version.30>3.0.6.RELEASE</spring.version.30>
<spring.version.30>3.0.7.RELEASE</spring.version.30>
<spring.version.40>4.0.0.RELEASE</spring.version.40>
<spring.version.range>[${spring.version.30}, ${spring.version.40})</spring.version.range>
<spring.data.commons.version>1.3.0.BUILD-SNAPSHOT</spring.data.commons.version>
@@ -279,6 +279,13 @@
<version>${spring.version.range}</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-instrument</artifactId>
<version>${spring.version.range}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
@@ -490,7 +497,7 @@
<includes>
<include>**/*Tests.java</include>
</includes>
<argLine>-javaagent:${settings.localRepository}/org/springframework/spring-instrument/${spring.version.30}/spring-instrument-${spring.version.30}.jar -javaagent:${settings.localRepository}/org/apache/openjpa/openjpa/${openjpa.version}/openjpa-${openjpa.version}.jar</argLine>
<argLine>-javaagent:${settings.localRepository}/org/springframework/spring-instrument/3.1.0.RELEASE/spring-instrument-3.1.0.RELEASE.jar -javaagent:${settings.localRepository}/org/apache/openjpa/openjpa/${openjpa.version}/openjpa-${openjpa.version}.jar</argLine>
</configuration>
<dependencies>
<dependency>
@@ -652,22 +659,15 @@
<repositories>
<repository>
<id>spring-libs-snapshot</id>
<name>Spring Framework Maven Release Repository</name>
<url>http://repo.springsource.org/libs-snapshot</url>
<id>spring-libs-milestone</id>
<url>http://repo.springsource.org/libs-milestone</url>
</repository>
</repositories>
<pluginRepositories>
<pluginRepository>
<id>spring-libs-release</id>
<name>Spring Framework Maven Release Repository</name>
<url>http://repo.springsource.org/lib-release</url>
</pluginRepository>
<pluginRepository>
<id>repository.springsource.maven.bundles.release</id>
<name>SpringSource Maven Bundles Release Repository</name>
<url>http://repository.springsource.com/maven/bundles/release</url>
<id>spring-plugins-release</id>
<url>http://repo.springsource.org/plugins-release</url>
</pluginRepository>
</pluginRepositories>
</project>

1
src/main/java/org/springframework/data/jpa/support/MergingPersistenceUnitManager.java
View File

@@ -61,7 +61,6 @@ public class MergingPersistenceUnitManager extends DefaultPersistenceUnitManager
* (non-Javadoc)
* @see org.springframework.orm.jpa.persistenceunit.DefaultPersistenceUnitManager#isPersistenceUnitOverrideAllowed()
*/
@Override
protected boolean isPersistenceUnitOverrideAllowed() {
return true;
}

29
src/main/resources/changelog.txt
View File

@@ -1,6 +1,35 @@
Spring Data JPA Changelog
=========================
Changes in version 1.1.0.RC1 (2012-02-03)
-----------------------------------------
* Support for locking (DATAJPA-73)
* Added CDI integration for repositories (DATAJPA-136)
* Support for @IdClass in entities (DATAJPA-50)
* Support for LessThanEqual and GreaterThanEquals keywords in query methods (DATAJPA-108)
* Support for True/False as query keywords (DATAJPA-132)
* Queries derivated from methods now correctly bind null values using IS NULL (DATAJPA-121)
* Added PersistenceUnitPostProcessor to scan a package for JPA entities with Spring 3.0 (DATAJPA-123, DATAJPA-124)
* Improve performance for pagination queries if inexistant page is requested (DATAJPA-124)
* Don't apply query hints to count queries for pagination (DATAJPA-54)
* Fixed count query creation for manually declared queries with "order by" clause (DATAJPA-142)
* @OneToOne mappings in AbstractAuditable should rather be @ManyToOne ones (DATAJPA-120)
* Alias detection now works correctly with entity names containing numbers (DATAJPA-110)
* Added @NativeQuery annotation for repositories to trigger native queries (DATAJPA-117)
* Allow customization of NamedQuery to be used in @Query annotation (DATAJPA-129)
* Let deleteAll() use cascading deletes and introduced deleteAllInBatch() (DATAJPA-137)
* Fixed query creation for Comparable values (DATAJPA-99)
* The SimpleJpaRepository's deleteAll() does not call em.clear() anymore (DATAJPA-111)
* JpaMetamodelEntityInformation now deals with mapped superclasses as well (DATAJPA-141)
* MergingPersistenceUnitManager now works with Spring 3.1.0 DefaultPersistenceUnitManager (DATAJPA-138)
* Provide strategy interface to customize the date being set while auditing (DATAJPA-9)
* Improve exception message when crating a query from a method name fails (DATAJPA-159)
* Imporve injection of the EntityManager in QueryDslRepositorySupport (DATAJPA-135, DATAJPA-113)
* Consolidate Expression creation for property references and sort orders (DATAJPA-103)
* Fixed schema errors appearing in STS (DATAJPA-160)
* Change build system to build against Spring 3.0.x / 3.1 / 3.2 (DATAJPA-127)
* Upgraded dependency versions (Spring 3.0.7, Querydsl 2.3.0, Hibernate 3.6.9, EclipseLink 2.3.2, OpenJPA 2.1.1, AspectJ 1.6.12) (DATAJPA-102, DATAJPA-150, DATAJPA-145, DATAJPA-115)
Changes in version 1.0.3.GA (2012-02-03)
----------------------------------------
* MergingPersistenceUnitManager doesnt work with Spring 3.1.0 DefaultPersistenceUnitManager (DATAJPA-138)

5
src/test/java/org/springframework/data/jpa/support/MergingPersistenceUnitManagerUnitTests.java
View File

@@ -25,6 +25,7 @@ import java.util.Arrays;
import javax.persistence.spi.PersistenceUnitInfo;
import org.junit.Ignore;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
@@ -58,7 +59,11 @@ public class MergingPersistenceUnitManagerUnitTests {
verify(newInfo).addJarFileUrl(jarFileUrl);
}
/**
* @FIXME - Reactivate as soon as Spring 3.1.1 gets released
*/
@Test
@Ignore
public void mergesManagedClassesCorrectly() {
MergingPersistenceUnitManager manager = new MergingPersistenceUnitManager();