Merge branch '2.3.x' into 2.4.x

Closes spring-projectsgh-25440
mbenson · Feb 25, 2021 · 62737b1 · 62737b1
2 parents d48551f + 04e1ad6
commit 62737b1
Show file tree

Hide file tree

Showing 8 changed files with 0 additions and 246 deletions.
diff --git a/...oot-smoke-tests/spring-boot-smoke-test-jta-jndi/src/main/java/smoketest/jndi/Account.java b/...oot-smoke-tests/spring-boot-smoke-test-jta-jndi/src/main/java/smoketest/jndi/Account.java
diff --git a/...tests/spring-boot-smoke-test-jta-jndi/src/main/java/smoketest/jndi/AccountRepository.java b/...tests/spring-boot-smoke-test-jta-jndi/src/main/java/smoketest/jndi/AccountRepository.java
diff --git a/...ke-tests/spring-boot-smoke-test-jta-jndi/src/main/java/smoketest/jndi/AccountService.java b/...ke-tests/spring-boot-smoke-test-jta-jndi/src/main/java/smoketest/jndi/AccountService.java
diff --git a/...ot-smoke-tests/spring-boot-smoke-test-jta-jndi/src/main/java/smoketest/jndi/Messages.java b/...ot-smoke-tests/spring-boot-smoke-test-jta-jndi/src/main/java/smoketest/jndi/Messages.java
diff --git a/...s/spring-boot-smoke-test-jta-jndi/src/main/java/smoketest/jndi/SampleJndiApplication.java b/...s/spring-boot-smoke-test-jta-jndi/src/main/java/smoketest/jndi/SampleJndiApplication.java
diff --git a/...s/spring-boot-smoke-test-jta-jndi/src/main/java/smoketest/jndi/SampleJndiInitializer.java b/...s/spring-boot-smoke-test-jta-jndi/src/main/java/smoketest/jndi/SampleJndiInitializer.java
diff --git a/...oke-tests/spring-boot-smoke-test-jta-jndi/src/main/java/smoketest/jndi/WebController.java b/...oke-tests/spring-boot-smoke-test-jta-jndi/src/main/java/smoketest/jndi/WebController.java
diff --git a/...oot-smoke-tests/spring-boot-smoke-test-jta-jndi/src/main/resources/application.properties b/...oot-smoke-tests/spring-boot-smoke-test-jta-jndi/src/main/resources/application.properties