Merge pull request #2412 from linghengqian/fix-error-dep

Removes non-existent `elasticjob-tracing-api` and `elasticjob-error-handler-spi` module
apache · Jul 29, 2024 · 5334fc4 · 5334fc4
2 parents 8bb5fa8 + 6758126
commit 5334fc4
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 14 deletions.
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
@@ -44,16 +44,19 @@ jobs:
         with:
           distribution: 'zulu'
           java-version: ${{ matrix.java }}
+          cache: 'maven'
       - name: Build with Maven in Windows
         if: matrix.os == 'windows-latest'
         run: |
-          ./mvnw --batch-mode --no-transfer-progress '-Dmaven.javadoc.skip=true' clean install
+          ./mvnw --batch-mode --no-transfer-progress '-Dmaven.javadoc.skip=true' clean install -T1C
       - name: Build with Maven in Linux or macOS
         if: matrix.os == 'macos-latest' || matrix.os == 'ubuntu-latest'
         run: |
-          ./mvnw --batch-mode --no-transfer-progress '-Dmaven.javadoc.skip=true' clean install -Pcheck
+          ./mvnw --batch-mode --no-transfer-progress '-Dmaven.javadoc.skip=true' clean install -Pcheck -T1C
       - name: Upload coverage to Codecov
         if: matrix.os == 'ubuntu-latest' && matrix.java == '8'
         uses: codecov/codecov-action@v3
         with:
           file: '**/target/site/jacoco/jacoco.xml'
+      - name: Build Examples with Maven
+        run: ./mvnw clean package -B -f examples/pom.xml -T1C
diff --git a/kernel/pom.xml b/kernel/pom.xml
@@ -32,21 +32,11 @@
             <artifactId>elasticjob-api</artifactId>
             <version>${project.parent.version}</version>
         </dependency>
-        <dependency>
-            <groupId>org.apache.shardingsphere.elasticjob</groupId>
-            <artifactId>elasticjob-error-handler-spi</artifactId>
-            <version>${project.parent.version}</version>
-        </dependency>
         <dependency>
             <groupId>org.apache.shardingsphere.elasticjob</groupId>
             <artifactId>elasticjob-registry-center-zookeeper-curator</artifactId>
             <version>${project.parent.version}</version>
         </dependency>
-        <dependency>
-            <groupId>org.apache.shardingsphere.elasticjob</groupId>
-            <artifactId>elasticjob-tracing-api</artifactId>
-            <version>${project.parent.version}</version>
-        </dependency>
 
         <dependency>
             <groupId>org.apache.shardingsphere.elasticjob</groupId>

diff --git a/...ardingsphere/elasticjob/restful/deserializer/impl/DefaultJsonRequestBodyDeserializer.java b/...ardingsphere/elasticjob/restful/deserializer/impl/DefaultJsonRequestBodyDeserializer.java
@@ -19,7 +19,7 @@
 
 import com.google.gson.Gson;
 import io.netty.handler.codec.http.HttpHeaderValues;
-import org.apache.shardingsphere.elasticjob.infra.json.GsonFactory;
+import org.apache.shardingsphere.elasticjob.kernel.infra.json.GsonFactory;
 import org.apache.shardingsphere.elasticjob.restful.deserializer.RequestBodyDeserializer;
 
 import java.nio.charset.StandardCharsets;

diff --git a/.../shardingsphere/elasticjob/restful/serializer/impl/DefaultJsonResponseBodySerializer.java b/.../shardingsphere/elasticjob/restful/serializer/impl/DefaultJsonResponseBodySerializer.java
@@ -19,7 +19,7 @@
 
 import com.google.gson.Gson;
 import io.netty.handler.codec.http.HttpHeaderValues;
-import org.apache.shardingsphere.elasticjob.infra.json.GsonFactory;
+import org.apache.shardingsphere.elasticjob.kernel.infra.json.GsonFactory;
 import org.apache.shardingsphere.elasticjob.restful.serializer.ResponseBodySerializer;
 
 import java.nio.charset.StandardCharsets;