From ef812581793c2369a296b7c873fd24132bf3e806 Mon Sep 17 00:00:00 2001 From: xuchengsheng Date: Mon, 16 Oct 2023 23:07:31 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9Ejsr=E6=A8=A1=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 2 +- {spring-jsr-330 => spring-jsr}/pom.xml | 17 ++++++++++------- .../spring-jsr250-postConstruct}/pom.xml | 2 +- .../spring-jsr250-preDestroy}/pom.xml | 4 ++-- .../spring-jsr250-resource}/pom.xml | 4 ++-- .../spring-jsr330-inject}/README.md | 0 .../spring-jsr330-inject}/pom.xml | 4 ++-- .../java/com/xcs/spring/InjectApplication.java | 0 .../com/xcs/spring/config/MyConfiguration.java | 0 .../com/xcs/spring/controller/MyController.java | 0 .../java/com/xcs/spring/service/MyService.java | 0 .../spring-jsr330-named}/pom.xml | 4 ++-- .../spring-jsr330-provider}/pom.xml | 11 +++-------- spring-jsr/spring-jsr330-qualifier/pom.xml | 14 ++++++++++++++ spring-jsr/spring-jsr330-scope/pom.xml | 14 ++++++++++++++ spring-jsr/spring-jsr330-singleton/pom.xml | 14 ++++++++++++++ 16 files changed, 65 insertions(+), 25 deletions(-) rename {spring-jsr-330 => spring-jsr}/pom.xml (60%) rename {spring-jsr-330/spring-jsr-provider => spring-jsr/spring-jsr250-postConstruct}/pom.xml (90%) rename {spring-jsr-330/spring-jsr-singleton => spring-jsr/spring-jsr250-preDestroy}/pom.xml (83%) rename {spring-jsr-330/spring-jsr-scope => spring-jsr/spring-jsr250-resource}/pom.xml (84%) rename {spring-jsr-330/spring-jsr-inject => spring-jsr/spring-jsr330-inject}/README.md (100%) rename {spring-jsr-330/spring-jsr-inject => spring-jsr/spring-jsr330-inject}/pom.xml (79%) rename {spring-jsr-330/spring-jsr-inject => spring-jsr/spring-jsr330-inject}/src/main/java/com/xcs/spring/InjectApplication.java (100%) rename {spring-jsr-330/spring-jsr-inject => spring-jsr/spring-jsr330-inject}/src/main/java/com/xcs/spring/config/MyConfiguration.java (100%) rename {spring-jsr-330/spring-jsr-inject => spring-jsr/spring-jsr330-inject}/src/main/java/com/xcs/spring/controller/MyController.java (100%) rename {spring-jsr-330/spring-jsr-inject => spring-jsr/spring-jsr330-inject}/src/main/java/com/xcs/spring/service/MyService.java (100%) rename {spring-jsr-330/spring-jsr-qualifier => spring-jsr/spring-jsr330-named}/pom.xml (79%) rename {spring-jsr-330/spring-jsr-named => spring-jsr/spring-jsr330-provider}/pom.xml (61%) create mode 100644 spring-jsr/spring-jsr330-qualifier/pom.xml create mode 100644 spring-jsr/spring-jsr330-scope/pom.xml create mode 100644 spring-jsr/spring-jsr330-singleton/pom.xml diff --git a/pom.xml b/pom.xml index d60ca15..2798c3d 100644 --- a/pom.xml +++ b/pom.xml @@ -22,7 +22,7 @@ spring-annotation spring-aware spring-interface - spring-jsr-330 + spring-jsr diff --git a/spring-jsr-330/pom.xml b/spring-jsr/pom.xml similarity index 60% rename from spring-jsr-330/pom.xml rename to spring-jsr/pom.xml index a07a730..875f2cb 100644 --- a/spring-jsr-330/pom.xml +++ b/spring-jsr/pom.xml @@ -9,16 +9,19 @@ 4.0.0 - spring-jsr-330 + spring-jsr pom - spring-jsr-inject - spring-jsr-qualifier - spring-jsr-named - spring-jsr-singleton - spring-jsr-scope - spring-jsr-provider + spring-jsr330-inject + spring-jsr330-qualifier + spring-jsr330-named + spring-jsr330-singleton + spring-jsr330-scope + spring-jsr330-provider + spring-jsr250-resource + spring-jsr250-postConstruct + spring-jsr250-preDestroy diff --git a/spring-jsr-330/spring-jsr-provider/pom.xml b/spring-jsr/spring-jsr250-postConstruct/pom.xml similarity index 90% rename from spring-jsr-330/spring-jsr-provider/pom.xml rename to spring-jsr/spring-jsr250-postConstruct/pom.xml index 57be4db..00f85fe 100644 --- a/spring-jsr-330/spring-jsr-provider/pom.xml +++ b/spring-jsr/spring-jsr250-postConstruct/pom.xml @@ -9,7 +9,7 @@ 4.0.0 - spring-jsr-provider + spring-jsr250-postConstruct 11 diff --git a/spring-jsr-330/spring-jsr-singleton/pom.xml b/spring-jsr/spring-jsr250-preDestroy/pom.xml similarity index 83% rename from spring-jsr-330/spring-jsr-singleton/pom.xml rename to spring-jsr/spring-jsr250-preDestroy/pom.xml index 9ad0cca..c9dd4df 100644 --- a/spring-jsr-330/spring-jsr-singleton/pom.xml +++ b/spring-jsr/spring-jsr250-preDestroy/pom.xml @@ -3,13 +3,13 @@ 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"> - spring-jsr-330 + spring-jsr com.xcs.spring 0.0.1-SNAPSHOT 4.0.0 - spring-jsr-singleton + spring-jsr250-preDestroy 11 diff --git a/spring-jsr-330/spring-jsr-scope/pom.xml b/spring-jsr/spring-jsr250-resource/pom.xml similarity index 84% rename from spring-jsr-330/spring-jsr-scope/pom.xml rename to spring-jsr/spring-jsr250-resource/pom.xml index e667218..6be0f62 100644 --- a/spring-jsr-330/spring-jsr-scope/pom.xml +++ b/spring-jsr/spring-jsr250-resource/pom.xml @@ -3,13 +3,13 @@ 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"> - spring-jsr-330 + spring-jsr com.xcs.spring 0.0.1-SNAPSHOT 4.0.0 - spring-jsr-scope + spring-jsr250-resource 11 diff --git a/spring-jsr-330/spring-jsr-inject/README.md b/spring-jsr/spring-jsr330-inject/README.md similarity index 100% rename from spring-jsr-330/spring-jsr-inject/README.md rename to spring-jsr/spring-jsr330-inject/README.md diff --git a/spring-jsr-330/spring-jsr-inject/pom.xml b/spring-jsr/spring-jsr330-inject/pom.xml similarity index 79% rename from spring-jsr-330/spring-jsr-inject/pom.xml rename to spring-jsr/spring-jsr330-inject/pom.xml index 3073354..54ad03c 100644 --- a/spring-jsr-330/spring-jsr-inject/pom.xml +++ b/spring-jsr/spring-jsr330-inject/pom.xml @@ -3,12 +3,12 @@ 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"> - spring-jsr-330 + spring-jsr com.xcs.spring 0.0.1-SNAPSHOT 4.0.0 - spring-jsr-inject + spring-jsr330-inject \ No newline at end of file diff --git a/spring-jsr-330/spring-jsr-inject/src/main/java/com/xcs/spring/InjectApplication.java b/spring-jsr/spring-jsr330-inject/src/main/java/com/xcs/spring/InjectApplication.java similarity index 100% rename from spring-jsr-330/spring-jsr-inject/src/main/java/com/xcs/spring/InjectApplication.java rename to spring-jsr/spring-jsr330-inject/src/main/java/com/xcs/spring/InjectApplication.java diff --git a/spring-jsr-330/spring-jsr-inject/src/main/java/com/xcs/spring/config/MyConfiguration.java b/spring-jsr/spring-jsr330-inject/src/main/java/com/xcs/spring/config/MyConfiguration.java similarity index 100% rename from spring-jsr-330/spring-jsr-inject/src/main/java/com/xcs/spring/config/MyConfiguration.java rename to spring-jsr/spring-jsr330-inject/src/main/java/com/xcs/spring/config/MyConfiguration.java diff --git a/spring-jsr-330/spring-jsr-inject/src/main/java/com/xcs/spring/controller/MyController.java b/spring-jsr/spring-jsr330-inject/src/main/java/com/xcs/spring/controller/MyController.java similarity index 100% rename from spring-jsr-330/spring-jsr-inject/src/main/java/com/xcs/spring/controller/MyController.java rename to spring-jsr/spring-jsr330-inject/src/main/java/com/xcs/spring/controller/MyController.java diff --git a/spring-jsr-330/spring-jsr-inject/src/main/java/com/xcs/spring/service/MyService.java b/spring-jsr/spring-jsr330-inject/src/main/java/com/xcs/spring/service/MyService.java similarity index 100% rename from spring-jsr-330/spring-jsr-inject/src/main/java/com/xcs/spring/service/MyService.java rename to spring-jsr/spring-jsr330-inject/src/main/java/com/xcs/spring/service/MyService.java diff --git a/spring-jsr-330/spring-jsr-qualifier/pom.xml b/spring-jsr/spring-jsr330-named/pom.xml similarity index 79% rename from spring-jsr-330/spring-jsr-qualifier/pom.xml rename to spring-jsr/spring-jsr330-named/pom.xml index 72f63a6..1589620 100644 --- a/spring-jsr-330/spring-jsr-qualifier/pom.xml +++ b/spring-jsr/spring-jsr330-named/pom.xml @@ -3,12 +3,12 @@ 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"> - spring-jsr-330 + spring-jsr com.xcs.spring 0.0.1-SNAPSHOT 4.0.0 - spring-jsr-qualifier + spring-jsr330-named \ No newline at end of file diff --git a/spring-jsr-330/spring-jsr-named/pom.xml b/spring-jsr/spring-jsr330-provider/pom.xml similarity index 61% rename from spring-jsr-330/spring-jsr-named/pom.xml rename to spring-jsr/spring-jsr330-provider/pom.xml index 1a97fcd..0b591c3 100644 --- a/spring-jsr-330/spring-jsr-named/pom.xml +++ b/spring-jsr/spring-jsr330-provider/pom.xml @@ -3,17 +3,12 @@ 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"> - spring-jsr-330 + spring-jsr com.xcs.spring 0.0.1-SNAPSHOT + 4.0.0 - - spring-jsr-named - - - 11 - 11 - + spring-jsr330-provider \ No newline at end of file diff --git a/spring-jsr/spring-jsr330-qualifier/pom.xml b/spring-jsr/spring-jsr330-qualifier/pom.xml new file mode 100644 index 0000000..dd494c2 --- /dev/null +++ b/spring-jsr/spring-jsr330-qualifier/pom.xml @@ -0,0 +1,14 @@ + + + + spring-jsr + com.xcs.spring + 0.0.1-SNAPSHOT + + + 4.0.0 + spring-jsr330-qualifier + + \ No newline at end of file diff --git a/spring-jsr/spring-jsr330-scope/pom.xml b/spring-jsr/spring-jsr330-scope/pom.xml new file mode 100644 index 0000000..80d4a0f --- /dev/null +++ b/spring-jsr/spring-jsr330-scope/pom.xml @@ -0,0 +1,14 @@ + + + + spring-jsr + com.xcs.spring + 0.0.1-SNAPSHOT + + + 4.0.0 + spring-jsr330-scope + + \ No newline at end of file diff --git a/spring-jsr/spring-jsr330-singleton/pom.xml b/spring-jsr/spring-jsr330-singleton/pom.xml new file mode 100644 index 0000000..79287db --- /dev/null +++ b/spring-jsr/spring-jsr330-singleton/pom.xml @@ -0,0 +1,14 @@ + + + + spring-jsr + com.xcs.spring + 0.0.1-SNAPSHOT + + + 4.0.0 + spring-jsr330-singleton + + \ No newline at end of file