From 1bc4e63c600b5bb52c04911a59d2aa32349e2868 Mon Sep 17 00:00:00 2001 From: noear Date: Wed, 19 Jul 2023 11:04:35 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=20maven=20=E6=A8=A1=E5=9D=97?= =?UTF-8?q?=E7=BB=93=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../metrics-solon-plugin/pom.xml | 2 +- .../solon/extend/metrics/XPluginImp.java | 0 .../metrics/annotation/EnableMetrics.java | 0 .../nami.coder.thrift/pom.xml | 2 +- .../nanoxlsx4j-solon-plugin/pom.xml | 2 +- {solon-projects/_hatch => __hatch}/pom.xml | 2 +- .../solon.boot.reactor-netty/pom.xml | 2 +- .../boot/reactornetty/HttpRequestParser.java | 0 .../boot/reactornetty/RnHttpContext.java | 0 .../boot/reactornetty/RnHttpHandler.java | 0 .../solon/boot/reactornetty/XPluginImp.java | 0 .../solon/solon.boot.reactornetty.properties | 0 .../solon.serialization.avro/pom.xml | 2 +- .../serialization/avro/AvroSerializer.java | 0 .../serialization/avro/AvroStringRender.java | 0 .../solon/serialization/avro/XPluginImp.java | 0 .../solon/solon.serialization.avro.properties | 0 .../solon.serialization.thrift/pom.xml | 2 +- pom.xml | 6 ++-- .../_hatch/openapi-solon-plugin/pom.xml | 30 ------------------- .../solon/weed3_solon_plugin.properties | 1 - 21 files changed, 10 insertions(+), 41 deletions(-) rename {solon-projects/_hatch => __hatch}/metrics-solon-plugin/pom.xml (94%) rename {solon-projects/_hatch => __hatch}/metrics-solon-plugin/src/main/java/org/noear/solon/extend/metrics/XPluginImp.java (100%) rename {solon-projects/_hatch => __hatch}/metrics-solon-plugin/src/main/java/org/noear/solon/extend/metrics/annotation/EnableMetrics.java (100%) rename {solon-projects/_hatch => __hatch}/nami.coder.thrift/pom.xml (93%) rename {solon-projects/_hatch => __hatch}/nanoxlsx4j-solon-plugin/pom.xml (93%) rename {solon-projects/_hatch => __hatch}/pom.xml (93%) rename {solon-projects/_hatch => __hatch}/solon.boot.reactor-netty/pom.xml (93%) rename {solon-projects/_hatch => __hatch}/solon.boot.reactor-netty/src/main/java/org/noear/solon/boot/reactornetty/HttpRequestParser.java (100%) rename {solon-projects/_hatch => __hatch}/solon.boot.reactor-netty/src/main/java/org/noear/solon/boot/reactornetty/RnHttpContext.java (100%) rename {solon-projects/_hatch => __hatch}/solon.boot.reactor-netty/src/main/java/org/noear/solon/boot/reactornetty/RnHttpHandler.java (100%) rename {solon-projects/_hatch => __hatch}/solon.boot.reactor-netty/src/main/java/org/noear/solon/boot/reactornetty/XPluginImp.java (100%) rename {solon-projects/_hatch => __hatch}/solon.boot.reactor-netty/src/main/resources/META-INF/solon/solon.boot.reactornetty.properties (100%) rename {solon-projects/_hatch => __hatch}/solon.serialization.avro/pom.xml (93%) rename {solon-projects/_hatch => __hatch}/solon.serialization.avro/src/main/java/org/noear/solon/serialization/avro/AvroSerializer.java (100%) rename {solon-projects/_hatch => __hatch}/solon.serialization.avro/src/main/java/org/noear/solon/serialization/avro/AvroStringRender.java (100%) rename {solon-projects/_hatch => __hatch}/solon.serialization.avro/src/main/java/org/noear/solon/serialization/avro/XPluginImp.java (100%) rename {solon-projects/_hatch => __hatch}/solon.serialization.avro/src/main/resources/META-INF/solon/solon.serialization.avro.properties (100%) rename {solon-projects/_hatch => __hatch}/solon.serialization.thrift/pom.xml (92%) delete mode 100644 solon-projects/_hatch/openapi-solon-plugin/pom.xml delete mode 100644 solon-projects/_hatch/openapi-solon-plugin/src/main/resources/META-INF/solon/weed3_solon_plugin.properties diff --git a/solon-projects/_hatch/metrics-solon-plugin/pom.xml b/__hatch/metrics-solon-plugin/pom.xml similarity index 94% rename from solon-projects/_hatch/metrics-solon-plugin/pom.xml rename to __hatch/metrics-solon-plugin/pom.xml index 090eade621..c2d427454d 100644 --- a/solon-projects/_hatch/metrics-solon-plugin/pom.xml +++ b/__hatch/metrics-solon-plugin/pom.xml @@ -8,7 +8,7 @@ org.noear solon-parent 2.4.0-SNAPSHOT - ../../../solon-parent/pom.xml + ../../solon-parent/pom.xml metrics-solon-plugin diff --git a/solon-projects/_hatch/metrics-solon-plugin/src/main/java/org/noear/solon/extend/metrics/XPluginImp.java b/__hatch/metrics-solon-plugin/src/main/java/org/noear/solon/extend/metrics/XPluginImp.java similarity index 100% rename from solon-projects/_hatch/metrics-solon-plugin/src/main/java/org/noear/solon/extend/metrics/XPluginImp.java rename to __hatch/metrics-solon-plugin/src/main/java/org/noear/solon/extend/metrics/XPluginImp.java diff --git a/solon-projects/_hatch/metrics-solon-plugin/src/main/java/org/noear/solon/extend/metrics/annotation/EnableMetrics.java b/__hatch/metrics-solon-plugin/src/main/java/org/noear/solon/extend/metrics/annotation/EnableMetrics.java similarity index 100% rename from solon-projects/_hatch/metrics-solon-plugin/src/main/java/org/noear/solon/extend/metrics/annotation/EnableMetrics.java rename to __hatch/metrics-solon-plugin/src/main/java/org/noear/solon/extend/metrics/annotation/EnableMetrics.java diff --git a/solon-projects/_hatch/nami.coder.thrift/pom.xml b/__hatch/nami.coder.thrift/pom.xml similarity index 93% rename from solon-projects/_hatch/nami.coder.thrift/pom.xml rename to __hatch/nami.coder.thrift/pom.xml index 575d4a1bbc..8a463206e5 100644 --- a/solon-projects/_hatch/nami.coder.thrift/pom.xml +++ b/__hatch/nami.coder.thrift/pom.xml @@ -8,7 +8,7 @@ org.noear solon-parent 2.4.0-SNAPSHOT - ../../../solon-parent/pom.xml + ../../solon-parent/pom.xml org.noear.hatch diff --git a/solon-projects/_hatch/nanoxlsx4j-solon-plugin/pom.xml b/__hatch/nanoxlsx4j-solon-plugin/pom.xml similarity index 93% rename from solon-projects/_hatch/nanoxlsx4j-solon-plugin/pom.xml rename to __hatch/nanoxlsx4j-solon-plugin/pom.xml index 52fa7e19c5..e1b79d0770 100644 --- a/solon-projects/_hatch/nanoxlsx4j-solon-plugin/pom.xml +++ b/__hatch/nanoxlsx4j-solon-plugin/pom.xml @@ -8,7 +8,7 @@ org.noear solon-parent 2.4.0-SNAPSHOT - ../../../solon-parent/pom.xml + ../../solon-parent/pom.xml nanoxlsx4j-solon-plugin diff --git a/solon-projects/_hatch/pom.xml b/__hatch/pom.xml similarity index 93% rename from solon-projects/_hatch/pom.xml rename to __hatch/pom.xml index 2d14517491..a66663a8f4 100644 --- a/solon-projects/_hatch/pom.xml +++ b/__hatch/pom.xml @@ -8,7 +8,7 @@ org.noear solon-parent 2.4.0-SNAPSHOT - ../../solon-parent/pom.xml + ../solon-parent/pom.xml org.noear.bundle diff --git a/solon-projects/_hatch/solon.boot.reactor-netty/pom.xml b/__hatch/solon.boot.reactor-netty/pom.xml similarity index 93% rename from solon-projects/_hatch/solon.boot.reactor-netty/pom.xml rename to __hatch/solon.boot.reactor-netty/pom.xml index e9ae4cdd95..6da54bad36 100644 --- a/solon-projects/_hatch/solon.boot.reactor-netty/pom.xml +++ b/__hatch/solon.boot.reactor-netty/pom.xml @@ -8,7 +8,7 @@ org.noear solon-parent 2.4.0-SNAPSHOT - ../../../solon-parent/pom.xml + ../../solon-parent/pom.xml org.noear.hatch diff --git a/solon-projects/_hatch/solon.boot.reactor-netty/src/main/java/org/noear/solon/boot/reactornetty/HttpRequestParser.java b/__hatch/solon.boot.reactor-netty/src/main/java/org/noear/solon/boot/reactornetty/HttpRequestParser.java similarity index 100% rename from solon-projects/_hatch/solon.boot.reactor-netty/src/main/java/org/noear/solon/boot/reactornetty/HttpRequestParser.java rename to __hatch/solon.boot.reactor-netty/src/main/java/org/noear/solon/boot/reactornetty/HttpRequestParser.java diff --git a/solon-projects/_hatch/solon.boot.reactor-netty/src/main/java/org/noear/solon/boot/reactornetty/RnHttpContext.java b/__hatch/solon.boot.reactor-netty/src/main/java/org/noear/solon/boot/reactornetty/RnHttpContext.java similarity index 100% rename from solon-projects/_hatch/solon.boot.reactor-netty/src/main/java/org/noear/solon/boot/reactornetty/RnHttpContext.java rename to __hatch/solon.boot.reactor-netty/src/main/java/org/noear/solon/boot/reactornetty/RnHttpContext.java diff --git a/solon-projects/_hatch/solon.boot.reactor-netty/src/main/java/org/noear/solon/boot/reactornetty/RnHttpHandler.java b/__hatch/solon.boot.reactor-netty/src/main/java/org/noear/solon/boot/reactornetty/RnHttpHandler.java similarity index 100% rename from solon-projects/_hatch/solon.boot.reactor-netty/src/main/java/org/noear/solon/boot/reactornetty/RnHttpHandler.java rename to __hatch/solon.boot.reactor-netty/src/main/java/org/noear/solon/boot/reactornetty/RnHttpHandler.java diff --git a/solon-projects/_hatch/solon.boot.reactor-netty/src/main/java/org/noear/solon/boot/reactornetty/XPluginImp.java b/__hatch/solon.boot.reactor-netty/src/main/java/org/noear/solon/boot/reactornetty/XPluginImp.java similarity index 100% rename from solon-projects/_hatch/solon.boot.reactor-netty/src/main/java/org/noear/solon/boot/reactornetty/XPluginImp.java rename to __hatch/solon.boot.reactor-netty/src/main/java/org/noear/solon/boot/reactornetty/XPluginImp.java diff --git a/solon-projects/_hatch/solon.boot.reactor-netty/src/main/resources/META-INF/solon/solon.boot.reactornetty.properties b/__hatch/solon.boot.reactor-netty/src/main/resources/META-INF/solon/solon.boot.reactornetty.properties similarity index 100% rename from solon-projects/_hatch/solon.boot.reactor-netty/src/main/resources/META-INF/solon/solon.boot.reactornetty.properties rename to __hatch/solon.boot.reactor-netty/src/main/resources/META-INF/solon/solon.boot.reactornetty.properties diff --git a/solon-projects/_hatch/solon.serialization.avro/pom.xml b/__hatch/solon.serialization.avro/pom.xml similarity index 93% rename from solon-projects/_hatch/solon.serialization.avro/pom.xml rename to __hatch/solon.serialization.avro/pom.xml index 46a149a1e8..0513e196fd 100644 --- a/solon-projects/_hatch/solon.serialization.avro/pom.xml +++ b/__hatch/solon.serialization.avro/pom.xml @@ -8,7 +8,7 @@ org.noear solon-parent 2.4.0-SNAPSHOT - ../../../solon-parent/pom.xml + ../../solon-parent/pom.xml org.noear.hatch diff --git a/solon-projects/_hatch/solon.serialization.avro/src/main/java/org/noear/solon/serialization/avro/AvroSerializer.java b/__hatch/solon.serialization.avro/src/main/java/org/noear/solon/serialization/avro/AvroSerializer.java similarity index 100% rename from solon-projects/_hatch/solon.serialization.avro/src/main/java/org/noear/solon/serialization/avro/AvroSerializer.java rename to __hatch/solon.serialization.avro/src/main/java/org/noear/solon/serialization/avro/AvroSerializer.java diff --git a/solon-projects/_hatch/solon.serialization.avro/src/main/java/org/noear/solon/serialization/avro/AvroStringRender.java b/__hatch/solon.serialization.avro/src/main/java/org/noear/solon/serialization/avro/AvroStringRender.java similarity index 100% rename from solon-projects/_hatch/solon.serialization.avro/src/main/java/org/noear/solon/serialization/avro/AvroStringRender.java rename to __hatch/solon.serialization.avro/src/main/java/org/noear/solon/serialization/avro/AvroStringRender.java diff --git a/solon-projects/_hatch/solon.serialization.avro/src/main/java/org/noear/solon/serialization/avro/XPluginImp.java b/__hatch/solon.serialization.avro/src/main/java/org/noear/solon/serialization/avro/XPluginImp.java similarity index 100% rename from solon-projects/_hatch/solon.serialization.avro/src/main/java/org/noear/solon/serialization/avro/XPluginImp.java rename to __hatch/solon.serialization.avro/src/main/java/org/noear/solon/serialization/avro/XPluginImp.java diff --git a/solon-projects/_hatch/solon.serialization.avro/src/main/resources/META-INF/solon/solon.serialization.avro.properties b/__hatch/solon.serialization.avro/src/main/resources/META-INF/solon/solon.serialization.avro.properties similarity index 100% rename from solon-projects/_hatch/solon.serialization.avro/src/main/resources/META-INF/solon/solon.serialization.avro.properties rename to __hatch/solon.serialization.avro/src/main/resources/META-INF/solon/solon.serialization.avro.properties diff --git a/solon-projects/_hatch/solon.serialization.thrift/pom.xml b/__hatch/solon.serialization.thrift/pom.xml similarity index 92% rename from solon-projects/_hatch/solon.serialization.thrift/pom.xml rename to __hatch/solon.serialization.thrift/pom.xml index 2a609785e0..622ac45012 100644 --- a/solon-projects/_hatch/solon.serialization.thrift/pom.xml +++ b/__hatch/solon.serialization.thrift/pom.xml @@ -8,7 +8,7 @@ org.noear solon-parent 2.4.0-SNAPSHOT - ../../../solon-parent/pom.xml + ../../solon-parent/pom.xml org.noear.hatch diff --git a/pom.xml b/pom.xml index 699b61b95e..0ef5a7ed8c 100644 --- a/pom.xml +++ b/pom.xml @@ -18,9 +18,9 @@ - __release/ - __test + __release - solon-projects/_hatch + __test + __hatch \ No newline at end of file diff --git a/solon-projects/_hatch/openapi-solon-plugin/pom.xml b/solon-projects/_hatch/openapi-solon-plugin/pom.xml deleted file mode 100644 index 482ec7f093..0000000000 --- a/solon-projects/_hatch/openapi-solon-plugin/pom.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - 4.0.0 - - - org.noear - solon-parent - 2.4.0-SNAPSHOT - ../../../solon-parent/pom.xml - - - openapi-solon-plugin - jar - - - - org.noear - solon - - - - - org.noear - weed3 - ${weed3.version} - - - \ No newline at end of file diff --git a/solon-projects/_hatch/openapi-solon-plugin/src/main/resources/META-INF/solon/weed3_solon_plugin.properties b/solon-projects/_hatch/openapi-solon-plugin/src/main/resources/META-INF/solon/weed3_solon_plugin.properties deleted file mode 100644 index 628c2fdd0b..0000000000 --- a/solon-projects/_hatch/openapi-solon-plugin/src/main/resources/META-INF/solon/weed3_solon_plugin.properties +++ /dev/null @@ -1 +0,0 @@ -solon.plugin=org.noear.weed.solon.plugin.XPluginImp \ No newline at end of file