Merge pull request sofastack#66 from koupleless/youji-dev

add logback
CodeNoobKing · Feb 2, 2024 · 0377a10 · 0377a10
2 parents 5cffd23 + cc897c0
commit 0377a10
Show file tree

Hide file tree

Showing 44 changed files with 719 additions and 27 deletions.
diff --git a/koupleless-runtime/koupleless-adapter-ext/koupleless-adapter-dubbo2.7/pom.xml b/koupleless-runtime/koupleless-adapter-ext/koupleless-adapter-dubbo2.7/pom.xml
@@ -17,7 +17,44 @@
             <groupId>org.apache.dubbo</groupId>
             <artifactId>dubbo-spring-boot-starter</artifactId>
             <version>2.7.23</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.alipay.sofa</groupId>
+            <artifactId>sofa-ark-spi</artifactId>
+            <scope>provided</scope>
         </dependency>
     </dependencies>
 
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>com.alipay.sofa</groupId>
+                <artifactId>sofa-ark-plugin-maven-plugin</artifactId>
+                <version>${sofa.ark.version}</version>
+                <executions>
+                    <execution>
+                        <id>default-cli</id>
+                        <goals>
+                            <goal>ark-plugin</goal>
+                        </goals>
+
+                        <configuration>
+                            <activator>
+                                com.alipay.sofa.koupleless.adapter.Dubbo27AdapterActivator
+                            </activator>
+                            <exported>
+                                <!--                                <mode>override</mode>-->
+                            </exported>
+                            <excludes>
+                                <exclude>*:*:*</exclude>
+                                <exclude>com.alipay.sofa.koupleless:koupleless-adapter-dubbo2.7</exclude>
+                            </excludes>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+
 </project>
diff --git a/...er-dubbo2.7/src/main/java/com/alipay/sofa/koupleless/adapter/Dubbo27AdapterActivator.java b/...er-dubbo2.7/src/main/java/com/alipay/sofa/koupleless/adapter/Dubbo27AdapterActivator.java
@@ -0,0 +1,35 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.alipay.sofa.koupleless.adapter;
+
+import com.alipay.sofa.ark.spi.model.PluginContext;
+import com.alipay.sofa.ark.spi.service.PluginActivator;
+
+/**
+ * @author lvjing2
+ * @since 0.5.5
+ */
+public class Dubbo27AdapterActivator implements PluginActivator {
+    @Override
+    public void start(PluginContext context) {
+    }
+
+    @Override
+    public void stop(PluginContext context) {
+        // no op
+    }
+}
diff --git a/koupleless-runtime/koupleless-base-starter/pom.xml b/koupleless-runtime/koupleless-base-starter/pom.xml
@@ -16,22 +16,29 @@
         <!-- include adapter libs first -->
         <dependency>
             <groupId>com.alipay.sofa.koupleless</groupId>
-            <artifactId>koupleless-adapter-apollo</artifactId>
+            <artifactId>koupleless-adapter-log4j2</artifactId>
             <version>${revision}</version>
         </dependency>
 
         <dependency>
             <groupId>com.alipay.sofa.koupleless</groupId>
-            <artifactId>koupleless-adapter-log4j2</artifactId>
+            <artifactId>koupleless-adapter-dubbo2.6</artifactId>
             <version>${revision}</version>
         </dependency>
 
         <dependency>
             <groupId>com.alipay.sofa.koupleless</groupId>
-            <artifactId>6</artifactId>
+            <artifactId>koupleless-adapter-apollo</artifactId>
             <version>${revision}</version>
         </dependency>
 
+<!--        去除 -->
+<!--        <dependency>-->
+<!--            <groupId>com.alipay.sofa.koupleless</groupId>-->
+<!--            <artifactId>koupleless-adapter-dubbo2.7</artifactId>-->
+<!--            <version>${revision}</version>-->
+<!--        </dependency>-->
+
         <!--  sofa-ark begin  -->
         <dependency>
             <groupId>com.alipay.sofa</groupId>

diff --git a/koupleless-runtime/pom.xml b/koupleless-runtime/pom.xml
@@ -9,7 +9,7 @@
     <packaging>pom</packaging>
 
     <properties>
-        <revision>0.5.7-SNAPSHOT</revision>
+        <revision>1.0.0-SNAPSHOT</revision>
         <sofa.ark.version>2.2.7</sofa.ark.version>
         <spring.boot.version>2.7.15</spring.boot.version>
         <project.encoding>UTF-8</project.encoding>

diff --git a/samples/dubbo-samples/rpc/dubbo26/pom.xml b/samples/dubbo-samples/rpc/dubbo26/pom.xml
@@ -20,7 +20,7 @@
 		<dubbo.version>2.6.12</dubbo.version>
 		<spring.boot.version>2.7.16</spring.boot.version>
 		<sofa.ark.version>2.2.7</sofa.ark.version>
-		<koupleless.runtime.version>0.5.7-SNAPSHOT</koupleless.runtime.version>
+		<koupleless.runtime.version>1.0.0-SNAPSHOT</koupleless.runtime.version>
 		<disruptor.version>3.4.2</disruptor.version>
 		<maven.compiler.plugin.version>3.8.1</maven.compiler.plugin.version>
 	</properties>

diff --git a/samples/dubbo-samples/rpc/dubbo27/pom.xml b/samples/dubbo-samples/rpc/dubbo27/pom.xml
@@ -20,7 +20,7 @@
 		<dubbo.version>2.7.23</dubbo.version>
 		<spring.boot.version>2.7.16</spring.boot.version>
 		<sofa.ark.version>2.2.7</sofa.ark.version>
-		<koupleless.runtime.version>0.5.7-SNAPSHOT</koupleless.runtime.version>
+		<koupleless.runtime.version>1.0.0-SNAPSHOT</koupleless.runtime.version>
 		<disruptor.version>3.4.2</disruptor.version>
 		<maven.compiler.plugin.version>3.8.1</maven.compiler.plugin.version>
 	</properties>

diff --git a/samples/dubbo-samples/rpc/dubbo3/pom.xml b/samples/dubbo-samples/rpc/dubbo3/pom.xml
@@ -22,7 +22,7 @@
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 		<spring.boot.version>2.7.16</spring.boot.version>
 		<sofa.ark.version>2.2.7</sofa.ark.version>
-		<koupleless.runtime.version>0.5.7-SNAPSHOT</koupleless.runtime.version>
+		<koupleless.runtime.version>1.0.0-SNAPSHOT</koupleless.runtime.version>
 		<disruptor.version>3.4.2</disruptor.version>
 		<maven.compiler.plugin.version>3.8.1</maven.compiler.plugin.version>
 		<dubbo.version>3.1.11</dubbo.version>

diff --git a/samples/feature-samples/pom.xml b/samples/feature-samples/pom.xml
@@ -21,7 +21,7 @@
         <spring.boot.version>2.7.16</spring.boot.version>
         <java.version>1.8</java.version>
         <sofa.ark.version>2.2.7</sofa.ark.version>
-        <koupleless.runtime.version>0.5.7-SNAPSHOT</koupleless.runtime.version>
+        <koupleless.runtime.version>1.0.0-SNAPSHOT</koupleless.runtime.version>
         <disruptor.version>3.4.2</disruptor.version>
         <os.plugin.version>1.7.1</os.plugin.version>
         <protobuf.plugin.version>0.6.1</protobuf.plugin.version>

diff --git a/samples/sofaboot-samples/pom.xml b/samples/sofaboot-samples/pom.xml
@@ -22,7 +22,7 @@
     <properties>
         <java.version>1.8</java.version>
         <sofa.ark.version>2.2.7</sofa.ark.version>
-        <koupleless.runtime.version>0.5.7-SNAPSHOT</koupleless.runtime.version>
+        <koupleless.runtime.version>1.0.0-SNAPSHOT</koupleless.runtime.version>
         <guice.version>6.0.0</guice.version>
         <guava.version>32.1.3-jre</guava.version>
         <curator.version>2.9.1</curator.version>

diff --git a/samples/springboot-samples/pom.xml b/samples/springboot-samples/pom.xml
@@ -21,7 +21,7 @@
         <spring.boot.version>2.7.16</spring.boot.version>
         <java.version>1.8</java.version>
         <sofa.ark.version>2.2.7</sofa.ark.version>
-        <koupleless.runtime.version>0.5.7-SNAPSHOT</koupleless.runtime.version>
+        <koupleless.runtime.version>1.0.0-SNAPSHOT</koupleless.runtime.version>
         <disruptor.version>3.4.2</disruptor.version>
         <os.plugin.version>1.7.1</os.plugin.version>
         <protobuf.plugin.version>0.6.1</protobuf.plugin.version>

diff --git a/samples/springboot3-samples/db/mybatis/base/pom.xml b/samples/springboot3-samples/db/mybatis/base/pom.xml
@@ -4,7 +4,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>com.alipay.sofa</groupId>
-		<artifactId>springboot-samples</artifactId>
+		<artifactId>springboot3-samples</artifactId>
 		<version>0.0.1-SNAPSHOT</version>
 		<relativePath>../../../pom.xml</relativePath> <!-- lookup parent from repository -->
 	</parent>

diff --git a/samples/springboot3-samples/db/mybatis/biz1/pom.xml b/samples/springboot3-samples/db/mybatis/biz1/pom.xml
@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>com.alipay.sofa</groupId>
-        <artifactId>springboot-samples</artifactId>
+        <artifactId>springboot3-samples</artifactId>
         <version>0.0.1-SNAPSHOT</version>
         <relativePath>../../../pom.xml</relativePath> <!-- lookup parent from repository -->
     </parent>

diff --git a/...ringboot3-samples/logging/README-zh_CN.md → ...t3-samples/logging/log4j2/README-zh_CN.md b/...ringboot3-samples/logging/README-zh_CN.md → ...t3-samples/logging/log4j2/README-zh_CN.md
diff --git a/...les/springboot3-samples/logging/README.md → ...ingboot3-samples/logging/log4j2/README.md b/...les/springboot3-samples/logging/README.md → ...ingboot3-samples/logging/log4j2/README.md
diff --git a/samples/springboot3-samples/logging/log4j2/base/pom.xml b/samples/springboot3-samples/logging/log4j2/base/pom.xml
@@ -4,7 +4,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>com.alipay.sofa</groupId>
-		<artifactId>springboot-samples</artifactId>
+		<artifactId>springboot3-samples</artifactId>
 		<version>0.0.1-SNAPSHOT</version>
 		<relativePath>../../../pom.xml</relativePath> <!-- lookup parent from repository -->
 	</parent>

diff --git a/samples/springboot3-samples/logging/log4j2/biz1/pom.xml b/samples/springboot3-samples/logging/log4j2/biz1/pom.xml
@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>com.alipay.sofa</groupId>
-        <artifactId>springboot-samples</artifactId>
+        <artifactId>springboot3-samples</artifactId>
         <version>0.0.1-SNAPSHOT</version>
         <relativePath>../../../pom.xml</relativePath> <!-- lookup parent from repository -->
     </parent>

diff --git a/samples/springboot3-samples/logging/log4j2/biz2/pom.xml b/samples/springboot3-samples/logging/log4j2/biz2/pom.xml
@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>com.alipay.sofa</groupId>
-        <artifactId>springboot-samples</artifactId>
+        <artifactId>springboot3-samples</artifactId>
         <version>0.0.1-SNAPSHOT</version>
         <relativePath>../../../pom.xml</relativePath> <!-- lookup parent from repository -->
     </parent>