1.9.x - PropertyPath is not dealing with properties containing underscore

.travis.yml

@@ -4,10 +4,16 @@ jdk:
 env:
   matrix:
     - PROFILE=ci
-    - PROFILE=spring4-next
+    - PROFILE=spring41
     - PROFILE=spring41-next
+    - PROFILE=spring42-next
+    - PROFILE=querydsl-next
 cache:
   directories:
     - $HOME/.m2
+sudo: false
 install: true
-script: "mvn clean dependency:list test -P${PROFILE} -Dsort"
+script: "mvn clean dependency:list test -P${PROFILE} -Dsort"
+notifications:
+  slack:
+    secure: PWyr3+7uTnHzZSrJY2DrowwdYODlIeFZB6tzuq+i/vYqMlX2GGXGQN9YmqbKPeaVZBdSI7YrI1UDa5cPAAXoTjn/JewkL0RbdTeIS6PGCpcpAb5rFMYtOhEDBrFB/SRiMH4tw86bRNKq/SrUWmpkzDtTzLrw7JceumgyqnrT6GY=

Spring Data Commons.sonargraph

@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<context version="7.1.10.209">
+<context version="7.2.2.230">
     <scope type="Project" name="spring-data-commons">
+        <element type="TypeFilterReferenceOverridden" name="Filter">
+            <element type="IncludeTypePattern" name="**"/>
+        </element>
         <architecture>
             <element type="Layer" name="Web">
                 <element type="TypeFilter" name="Assignment">
@@ -10,16 +13,11 @@
                     <element type="TypeFilter" name="Assignment">
                         <element type="IncludeTypePattern" name="**.config.**"/>
                     </element>
-                    <dependency toName="Project|spring-data-commons::Layer|Core::Subsystem|Geo" type="AllowedDependency"/>
                     <dependency toName="Project|spring-data-commons::Layer|Repositories::Subsystem|Support" type="AllowedDependency"/>
-                    <dependency toName="External|External::Subsystem|Spring" type="AllowedDependency"/>
                 </element>
                 <dependency toName="Project|spring-data-commons::Layer|Application" type="AllowedDependency"/>
                 <dependency toName="Project|spring-data-commons::Layer|Core" type="AllowedDependency"/>
                 <dependency toName="Project|spring-data-commons::Layer|Repositories" type="AllowedDependency"/>
-                <dependency toName="External|External::Subsystem|Logging" type="AllowedDependency"/>
-                <dependency toName="External|External::Subsystem|Reflection" type="AllowedDependency"/>
-                <dependency toName="External|External::Subsystem|Spring" type="AllowedDependency"/>
             </element>
             <element type="Layer" name="Repositories">
                 <element type="TypeFilter" name="Assignment">
@@ -71,6 +69,7 @@
                         <element type="IncludeTypePattern" name="**.config.**"/>
                     </element>
                     <stereotype name="Unrestricted"/>
+                    <dependency toName="Project|spring-data-commons::Layer|Repositories::Subsystem|CDI" type="DisallowedDependency"/>
                 </element>
                 <element type="Subsystem" name="CDI">
                     <element type="TypeFilter" name="Assignment">
@@ -93,13 +92,6 @@
                 <dependency toName="Project|spring-data-commons::Layer|Core" type="AllowedDependency"/>
                 <dependency toName="Project|spring-data-commons::Layer|Mapping" type="AllowedDependency"/>
             </element>
-            <element type="Layer" name="Conversion">
-                <element type="TypeFilter" name="Assignment">
-                    <element type="IncludeTypePattern" name="**.convert.**"/>
-                </element>
-                <dependency toName="Project|spring-data-commons::Layer|Core" type="AllowedDependency"/>
-                <dependency toName="Project|spring-data-commons::Layer|Mapping" type="AllowedDependency"/>
-            </element>
             <element type="Layer" name="Auditing">
                 <element type="TypeFilter" name="Assignment">
                     <element type="IncludeTypePattern" name="**.auditing.**"/>
@@ -114,6 +106,13 @@
                 <dependency toName="Project|spring-data-commons::Layer|Core" type="AllowedDependency"/>
                 <dependency toName="Project|spring-data-commons::Layer|Mapping" type="AllowedDependency"/>
             </element>
+            <element type="Layer" name="Conversion">
+                <element type="TypeFilter" name="Assignment">
+                    <element type="IncludeTypePattern" name="**.convert.**"/>
+                </element>
+                <dependency toName="Project|spring-data-commons::Layer|Core" type="AllowedDependency"/>
+                <dependency toName="Project|spring-data-commons::Layer|Mapping" type="AllowedDependency"/>
+            </element>
             <element type="Layer" name="Mapping">
                 <element type="TypeFilter" name="Assignment">
                     <element type="IncludeTypePattern" name="**.mapping.**"/>
@@ -176,6 +175,11 @@
                         <element type="WeakTypePattern" name="**.config.**"/>
                     </element>
                 </element>
+                <element type="Subsystem" name="Querydsl">
+                    <element type="TypeFilter" name="Assignment">
+                        <element type="IncludeTypePattern" name="**.querydsl.**"/>
+                    </element>
+                </element>
                 <dependency toName="Project|spring-data-commons::Layer|Application" type="AllowedDependency"/>
             </element>
             <element type="Layer" name="Application">
@@ -193,12 +197,6 @@
                     <dependency toName="External|External::Subsystem|JAXB" type="AllowedDependency"/>
                     <dependency toName="External|External::Subsystem|Spring" type="AllowedDependency"/>
                 </element>
-                <element type="Subsystem" name="Querydsl">
-                    <element type="TypeFilter" name="Assignment">
-                        <element type="IncludeTypePattern" name="**.querydsl.**"/>
-                    </element>
-                    <dependency toName="Project|spring-data-commons::Layer|Application::Subsystem|Domain" type="AllowedDependency"/>
-                </element>
                 <element type="Subsystem" name="Cross store">
                     <element type="TypeFilter" name="Assignment">
                         <element type="IncludeTypePattern" name="**.crossstore.**"/>
@@ -324,6 +322,11 @@
                     <element type="WeakTypePattern" name="java.**"/>
                 </element>
             </element>
+            <element type="Subsystem" name="Guava">
+                <element type="TypeFilter" name="Assignment">
+                    <element type="IncludeTypePattern" name="com.google.common.**"/>
+                </element>
+            </element>
         </architecture>
     </scope>
     <scope type="Global" name="Global">
@@ -395,58 +398,58 @@
         </item>
     </itemDefinition>
     <attributeConfiguration type="AttributeConfiguration">
-        <property value="disabled" name="ExtendedCyclomaticComplexity"/>
-        <property value="disabled" name="MaxExtendedCyclomaticComplexityPerMethod"/>
-        <property value="disabled" name="NumberOfWarnings"/>
-        <property value="disabled" name="AverageCyclomaticComplexityPerMethod"/>
-        <property value="disabled" name="NumberOfAbstractTypes"/>
-        <property value="disabled" name="JdkVersion"/>
+        <property value="disabled" name="DistributedOverPathContainers"/>
+        <property value="disabled" name="AccumulatedCyclomaticComplexity"/>
         <property value="disabled" name="NumberOfCyclicDirectories"/>
+        <property value="disabled" name="AverageCyclomaticComplexityPerMethod"/>
+        <property value="disabled" name="NumberOfCyclicProjects"/>
+        <property value="disabled" name="NumberOfCyclicSourceFiles"/>
+        <property value="disabled" name="RelativeAverageTypeDependency"/>
+        <property value="disabled" name="NumberOfLayers"/>
         <property value="disabled" name="CyclomaticComplexity"/>
         <property value="disabled" name="NumberOfMethodsWithImplementation"/>
-        <property value="disabled" name="NumberOfIgnoredWarnings"/>
-        <property value="disabled" name="NumberOfNamedInterfaces"/>
-        <property value="disabled" name="NumberOfCyclicProjects"/>
-        <property value="disabled" name="NumberOfRefactorings"/>
-        <property value="disabled" name="DependsUpon"/>
         <property value="disabled" name="NumberOfVerticalSliceGroups"/>
-        <property value="disabled" name="DistributedOverPathContainers"/>
-        <property value="disabled" name="AverageExtendedCyclomaticComplexityPerMethod"/>
-        <property value="disabled" name="AverageTypeDependency"/>
+        <property value="disabled" name="ExtendedCyclomaticComplexity"/>
         <property value="disabled" name="NumberOfDuplicateCodeBlocksWarnings"/>
-        <property value="disabled" name="RelativeAverageTypeDependency"/>
-        <property value="disabled" name="AverageAccumulatedExtendedCyclomaticComplexityPerType"/>
+        <property value="disabled" name="NormalizedCumulativeTypeDependency"/>
+        <property value="disabled" name="AccumulatedExtendedCyclomaticComplexity"/>
         <property value="disabled" name="NumberOfLayerGroups"/>
-        <property value="disabled" name="NumberOfIgnoredViolations"/>
-        <property value="disabled" name="NumberOfFixWarnings"/>
-        <property value="disabled" name="NumberOfExcludedSourceFiles"/>
-        <property value="disabled" name="NumberOfVerticalSlices"/>
-        <property value="disabled" name="AverageAccumulatedCyclomaticComplexityPerType"/>
-        <property value="disabled" name="Timestamp"/>
-        <property value="disabled" name="AverageAssertionUsage"/>
-        <property value="disabled" name="NumberOfCyclicSubsystems"/>
-        <property value="disabled" name="NumberOfCyclicNamespaces"/>
         <property value="disabled" name="NumberOfExcludedTargetFiles"/>
-        <property value="disabled" name="NumberOfCyclicVerticalSliceGroups"/>
-        <property value="disabled" name="AccumulatedExtendedCyclomaticComplexity"/>
-        <property value="disabled" name="NumberOfLayers"/>
-        <property value="disabled" name="NumberOfCyclicSourceFiles"/>
-        <property value="disabled" name="MaxAccumulatedCyclomaticComplexityPerType"/>
-        <property value="disabled" name="MaxAccumulatedExtendedCyclomaticComplexityPerType"/>
+        <property value="disabled" name="NumberOfCyclicLayers"/>
+        <property value="disabled" name="NumberOfRefactorings"/>
+        <property value="disabled" name="NumberOfSubsystems"/>
+        <property value="disabled" name="MaxCyclomaticComplexityPerMethod"/>
+        <property value="disabled" name="NumberOfWorkspaceWarnings"/>
         <property value="disabled" name="NumberOfCyclicLayerGroups"/>
-        <property value="disabled" name="NumberOfAssertions"/>
-        <property value="disabled" name="NumberOfCyclicVerticalSlices"/>
-        <property value="disabled" name="NormalizedCumulativeTypeDependency"/>
-        <property value="disabled" name="AccumulatedCyclomaticComplexity"/>
-        <property value="disabled" name="NumberOfMetricWarnings"/>
-        <property value="disabled" name="NumberOfNameParts"/>
         <property value="disabled" name="NumberOfTasks"/>
-        <property value="disabled" name="NumberOfWorkspaceWarnings"/>
+        <property value="disabled" name="JdkVersion"/>
+        <property value="disabled" name="AverageAccumulatedExtendedCyclomaticComplexityPerType"/>
         <property value="disabled" name="NumberOfAbstractMethods"/>
+        <property value="disabled" name="NumberOfCyclicVerticalSliceGroups"/>
+        <property value="disabled" name="AverageAssertionUsage"/>
+        <property value="disabled" name="NumberOfFixWarnings"/>
+        <property value="disabled" name="Timestamp"/>
+        <property value="disabled" name="NumberOfNameParts"/>
+        <property value="disabled" name="NumberOfAssertions"/>
+        <property value="disabled" name="AverageTypeDependency"/>
+        <property value="disabled" name="NumberOfNamedInterfaces"/>
         <property value="disabled" name="NumberOfTypesWithImplementation"/>
+        <property value="disabled" name="NumberOfAbstractTypes"/>
+        <property value="disabled" name="NumberOfVerticalSlices"/>
+        <property value="disabled" name="NumberOfMetricWarnings"/>
+        <property value="disabled" name="MaxExtendedCyclomaticComplexityPerMethod"/>
+        <property value="disabled" name="DependsUpon"/>
+        <property value="disabled" name="NumberOfExcludedSourceFiles"/>
+        <property value="disabled" name="AverageExtendedCyclomaticComplexityPerMethod"/>
+        <property value="disabled" name="NumberOfCyclicSubsystems"/>
+        <property value="disabled" name="MaxAccumulatedCyclomaticComplexityPerType"/>
+        <property value="disabled" name="MaxAccumulatedExtendedCyclomaticComplexityPerType"/>
+        <property value="disabled" name="NumberOfIgnoredViolations"/>
         <property value="disabled" name="Level"/>
-        <property value="disabled" name="NumberOfSubsystems"/>
-        <property value="disabled" name="NumberOfCyclicLayers"/>
-        <property value="disabled" name="MaxCyclomaticComplexityPerMethod"/>
+        <property value="disabled" name="NumberOfWarnings"/>
+        <property value="disabled" name="NumberOfCyclicNamespaces"/>
+        <property value="disabled" name="NumberOfCyclicVerticalSlices"/>
+        <property value="disabled" name="NumberOfIgnoredWarnings"/>
+        <property value="disabled" name="AverageAccumulatedCyclomaticComplexityPerType"/>
     </attributeConfiguration>
 </context>

pom.xml

@@ -1,19 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <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">
 
 	<modelVersion>4.0.0</modelVersion>
 
 	<groupId>org.springframework.data</groupId>
 	<artifactId>spring-data-commons</artifactId>
-	<version>1.9.0.RELEASE</version>
+	<version>1.9.3.BUILD-SNAPSHOT</version>
 
 	<name>Spring Data Core</name>
 
 	<parent>
 		<groupId>org.springframework.data.build</groupId>
 		<artifactId>spring-data-parent</artifactId>
-		<version>1.5.0.RELEASE</version>
-		<relativePath>../spring-data-build/parent/pom.xml</relativePath>
+		<version>1.5.3.BUILD-SNAPSHOT</version>
 	</parent>
 
 	<properties>
@@ -237,8 +236,8 @@
 
 	<repositories>
 		<repository>
-			<id>spring-libs-release</id>
-			<url>http://repo.spring.io/libs-release</url>
+			<id>spring-libs-snapshot</id>
+			<url>http://repo.spring.io/libs-snapshot</url>
 		</repository>
 	</repositories>
 

src/main/asciidoc/dependencies.adoc

@@ -0,0 +1,57 @@
+[[dependencies]]
+= Dependencies
+
+Due to different inception dates of individual Spring Data modules, most of them carry different major and minor version numbers. The easiest way to find compatible ones is by relying on the Spring Data Release Train BOM we ship with the compatible versions defined. In a Maven project you'd declare this dependency in the `<dependencyManagement />` section of your POM:
+
+.Using the Spring Data release train BOM
+====
+[source, xml]
+----
+<dependencyManagement>
+  <dependencies>
+    <dependency>
+      <groupId>org.springframework.data</groupId>
+      <artifactId>spring-data-releasetrain</artifactId>
+      <version>${release-train}</version>
+      <scope>import</scope>
+      <type>pom</type>
+    </dependency>
+  <dependencies>
+</dependencyManagement>
+----
+====
+
+The current release train version is {releasetrainVersion}. The train names are ascending alphabetically and currently available ones are listed https://github.com/spring-projects/spring-data-commons/wiki/Release-planning[here]. The version name follows the following pattern: `${name}-${release}` where release can be one of the following:
+
+* `BUILD-SNAPSHOT` - current snapshots
+* `M1`, `M2` etc. - milestones
+* `RC1`, `RC2` etc. - release candidates
+* `RELEASE` - GA release
+* `SR1`, `SR2` etc. - service releases
+
+A working example of using the BOMs can be found in our https://github.com/spring-projects/spring-data-examples/tree/master/bom[Spring Data examples repository].
+
+If that's in place declare the Spring Data modules you'd like to use without a version in the `<dependencies />` block.
+
+.Declaring a dependency to a Spring Data module
+====
+[source, xml]
+----
+<dependencies>
+  <dependency>
+    <groupId>org.springframework.data</groupId>
+    <artifactId>spring-data-jpa</artifactId>
+  </dependency>
+<dependencies>
+----
+====
+
+[[dependencies.spring-boot]]
+== Dependency management with Spring Boot
+
+Spring Boot already selects a very recent version of Spring Data modules for you. In case you want to upgrade to a newer version nonetheless, simply configure the property `spring-data-releasetrain.version` to the train name and iteration you'd like to use.
+
+[[dependencies.spring-framework]]
+== Spring Framework
+
+The current version of Spring Data modules require Spring Framework in version {springVersion} or better. The modules might also work with an older bugfix version of that minor version. However, using the most recent version within that generation is highly recommended.

src/main/asciidoc/index.adoc

@@ -17,6 +17,7 @@ include::preface.adoc[]
 = Reference documentation
 
 :leveloffset: +1
+include::dependencies.adoc[]
 include::repositories.adoc[]
 include::auditing.adoc[]
 :leveloffset: -1

src/main/asciidoc/preface.adoc

@@ -10,4 +10,4 @@ The Spring Data Commons project applies core Spring concepts to the development
 * Bugtracker - https://jira.spring.io/browse/DATACMNS
 * Release repository - https://repo.spring.io/libs-release
 * Milestone repository - https://repo.spring.io/libs-milestone
-* Snapshot repository - https://repo.spring.io/libs-snapshot
+* Snapshot repository - https://repo.spring.io/libs-snapshot