HHH-12390 - Add hibernate-jipijapa for integrating with WildFly

- checkstyle fixups - adjust checkstyle to allow up to 5 newlines at the end of the file (1 to 5) - fixed bad 4.6 Gradle wrapper version (cant load builds)
bziobrowski · Mar 26, 2018 · 93d9162 · 93d9162
1 parent f5bb8a1
commit 93d9162
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 8 deletions.
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/.../src/main/java/org/jboss/as/jpa/hibernate5/management/HibernateEntityCacheStatistics.java b/.../src/main/java/org/jboss/as/jpa/hibernate5/management/HibernateEntityCacheStatistics.java
@@ -88,9 +88,9 @@ org.hibernate.stat.SecondLevelCacheStatistics getStatistics(
 		if ( sessionFactory != null ) {
 			// The entity class name is prefixed by the application scoped persistence unit name
 
-			return sessionFactory.getStatistics().getSecondLevelCacheStatistics( scopedPersistenceUnitName + "." +
-																						 pathAddress.getValue(
-																								 HibernateStatistics.ENTITYCACHE ) );
+			return sessionFactory.getStatistics().getSecondLevelCacheStatistics(
+					scopedPersistenceUnitName + "." + pathAddress.getValue( HibernateStatistics.ENTITYCACHE )
+			);
 		}
 		return null;
 	}

diff --git a/hibernate-jipijapa/src/test/java/org/hibernate/jpa/test/pack/explodedpar/package-info.java b/hibernate-jipijapa/src/test/java/org/hibernate/jpa/test/pack/explodedpar/package-info.java
@@ -8,4 +8,4 @@
 @NamedQuery(name = "allCarpet", query = "select c from Carpet c")
 package org.hibernate.jpa.test.pack.explodedpar;
 
-import org.hibernate.annotations.NamedQuery;
+import org.hibernate.annotations.NamedQuery;
diff --git a/hibernate-jipijapa/src/test/java/org/hibernate/jpa/test/pack/war/package-info.java b/hibernate-jipijapa/src/test/java/org/hibernate/jpa/test/pack/war/package-info.java
@@ -9,4 +9,4 @@
 		query = "select m from ApplicationServer m")
 package org.hibernate.jpa.test.pack.war;
 
-import org.hibernate.annotations.NamedQuery;
+import org.hibernate.annotations.NamedQuery;
diff --git a/shared/config/checkstyle/checkstyle.xml b/shared/config/checkstyle/checkstyle.xml
@@ -75,8 +75,8 @@
     </module>
 
     <module name="RegexpMultiline">
-        <property name="format" value="\S\r?\n(\r?\n)+\z" />
-        <property name="message" value="Only one new line is allowed at the end of a file" />
+        <property name="format" value="\S(r?\n){5,}\z" />
+        <property name="message" value="Files should end with no more than 5 (empty) new lines" />
     </module>