From 0162456628b2d815e2ff08dd86e7846106b8dfa4 Mon Sep 17 00:00:00 2001
From: Sanne Grinovero <sanne@hibernate.org>
Date: Fri, 24 Jun 2022 21:06:16 +0100
Subject: [PATCH] Apply consistent line endings to all java source files

---
 .gitattributes                                |  3 +-
 .../org/acme/gradle/multi/dao/Product.java    | 70 +++++++++----------
 .../acme/gradle/multi/dao/ProductService.java | 37 +++++-----
 3 files changed, 56 insertions(+), 54 deletions(-)

diff --git a/.gitattributes b/.gitattributes
index c1eacd9de5d15..5479295df22b6 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,5 +1,6 @@
 # ./mvnw fails on Windows in git bash if -Xmx in that file has a trailing CRLF
 .mvn/jvm.config		text eol=lf
-*.java	text eol=lf
 *.xml	text eol=lf
+*.java	text diff=java eol=lf
+*.kt	text diff=kotlin eol=lf
 
diff --git a/integration-tests/gradle/src/main/resources/composite-project-with-dependencies/gradle-dao/src/main/java/org/acme/gradle/multi/dao/Product.java b/integration-tests/gradle/src/main/resources/composite-project-with-dependencies/gradle-dao/src/main/java/org/acme/gradle/multi/dao/Product.java
index 55fdacfa21b9c..df2c4cb2cc3ad 100644
--- a/integration-tests/gradle/src/main/resources/composite-project-with-dependencies/gradle-dao/src/main/java/org/acme/gradle/multi/dao/Product.java
+++ b/integration-tests/gradle/src/main/resources/composite-project-with-dependencies/gradle-dao/src/main/java/org/acme/gradle/multi/dao/Product.java
@@ -1,35 +1,35 @@
-package org.acme.gradle.multi.dao;
-
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.NamedQuery;
-
-@Entity
-@NamedQuery(name = "Product.findAll", query = "SELECT p FROM Product p ORDER BY p.name")
-public class Product {
-	@Id
-	private Integer id;
-	
-	@Column
-	private String name;
-
-	public Integer getId() {
-		return id;
-	}
-
-	public void setId(Integer id) {
-		this.id = id;
-	}
-
-	public String getName() {
-		return name;
-	}
-
-	public void setName(String name) {
-		this.name = name;
-	}
-	
-	
-
-}
+package org.acme.gradle.multi.dao;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.NamedQuery;
+
+@Entity
+@NamedQuery(name = "Product.findAll", query = "SELECT p FROM Product p ORDER BY p.name")
+public class Product {
+
+	@Id
+	private Integer id;
+	
+	@Column
+	private String name;
+
+	public Integer getId() {
+		return id;
+	}
+
+	public void setId(Integer id) {
+		this.id = id;
+	}
+
+	public String getName() {
+		return name;
+	}
+
+	public void setName(String name) {
+		this.name = name;
+	}
+
+}
+
diff --git a/integration-tests/gradle/src/main/resources/composite-project-with-dependencies/gradle-dao/src/main/java/org/acme/gradle/multi/dao/ProductService.java b/integration-tests/gradle/src/main/resources/composite-project-with-dependencies/gradle-dao/src/main/java/org/acme/gradle/multi/dao/ProductService.java
index bdc27e414f890..11e56c22ded60 100644
--- a/integration-tests/gradle/src/main/resources/composite-project-with-dependencies/gradle-dao/src/main/java/org/acme/gradle/multi/dao/ProductService.java
+++ b/integration-tests/gradle/src/main/resources/composite-project-with-dependencies/gradle-dao/src/main/java/org/acme/gradle/multi/dao/ProductService.java
@@ -1,18 +1,19 @@
-package org.acme.gradle.multi.dao;
-
-import java.util.List;
-
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Inject;
-import javax.persistence.EntityManager;
-
-@ApplicationScoped
-public class ProductService {
-	
-	@Inject
-	EntityManager em;
-	
-	public List<Product> getProducts() {
-		return em.createNamedQuery("Product.findAll", Product.class).getResultList();
-	}
-}
+package org.acme.gradle.multi.dao;
+
+import java.util.List;
+
+import javax.enterprise.context.ApplicationScoped;
+import javax.inject.Inject;
+import javax.persistence.EntityManager;
+
+@ApplicationScoped
+public class ProductService {
+	
+	@Inject
+	EntityManager em;
+	
+	public List<Product> getProducts() {
+		return em.createNamedQuery("Product.findAll", Product.class).getResultList();
+	}
+
+}