From 3f5c615e87d74190d0673645258d1cfe406d106c Mon Sep 17 00:00:00 2001 From: "shaojin.wensj" Date: Thu, 6 Oct 2022 12:46:48 +0800 Subject: [PATCH] fix build error --- .../META-INF/services/com.sun.tools.jconsole.JConsolePlugin | 1 - druid-demo-petclinic/pom.xml | 4 ++-- .../org/springframework/samples/petclinic/owner/Owner.java | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) delete mode 100644 core/src/main/resources/META-INF/services/com.sun.tools.jconsole.JConsolePlugin diff --git a/core/src/main/resources/META-INF/services/com.sun.tools.jconsole.JConsolePlugin b/core/src/main/resources/META-INF/services/com.sun.tools.jconsole.JConsolePlugin deleted file mode 100644 index 61086f8e00..0000000000 --- a/core/src/main/resources/META-INF/services/com.sun.tools.jconsole.JConsolePlugin +++ /dev/null @@ -1 +0,0 @@ -com.alibaba.druid.support.jconsole.DruidPlugin \ No newline at end of file diff --git a/druid-demo-petclinic/pom.xml b/druid-demo-petclinic/pom.xml index 56914d5cd1..96967099de 100644 --- a/druid-demo-petclinic/pom.xml +++ b/druid-demo-petclinic/pom.xml @@ -26,14 +26,14 @@ 0.8.7 0.0.10 0.0.31 - + true com.alibaba druid-spring-boot-starter - 1.2.11 + 1.2.13-SNAPSHOT diff --git a/druid-demo-petclinic/src/main/java/org/springframework/samples/petclinic/owner/Owner.java b/druid-demo-petclinic/src/main/java/org/springframework/samples/petclinic/owner/Owner.java index 52ff1190f0..7851081812 100644 --- a/druid-demo-petclinic/src/main/java/org/springframework/samples/petclinic/owner/Owner.java +++ b/druid-demo-petclinic/src/main/java/org/springframework/samples/petclinic/owner/Owner.java @@ -109,7 +109,7 @@ public Pet getPet(String name) { /** * Return the Pet with the given id, or null if none found for this Owner. - * @param name to test + * @param id to test * @return a pet if pet id is already in use */ public Pet getPet(Integer id) {