diff --git a/dubbo-build-tools/pom.xml b/dubbo-build-tools/pom.xml new file mode 100644 index 000000000..28bae806b --- /dev/null +++ b/dubbo-build-tools/pom.xml @@ -0,0 +1,30 @@ + + + + 4.0.0 + + org.apache.dubbo + dubbo-build-tools + 1.0.0 + jar + + + true + + + \ No newline at end of file diff --git a/dubbo-build-tools/src/main/resources/checkstyle-header.txt b/dubbo-build-tools/src/main/resources/checkstyle-header.txt new file mode 100644 index 000000000..d973dceda --- /dev/null +++ b/dubbo-build-tools/src/main/resources/checkstyle-header.txt @@ -0,0 +1,16 @@ +/* + * 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. + */ \ No newline at end of file diff --git a/dubbo-extensions-dependencies-bom/pom.xml b/dubbo-extensions-dependencies-bom/pom.xml index 6aaef824f..37580b953 100644 --- a/dubbo-extensions-dependencies-bom/pom.xml +++ b/dubbo-extensions-dependencies-bom/pom.xml @@ -97,6 +97,7 @@ 6.13.4 4.0.66 + 3.2.13 4.5.14 1.2.0 2.0 @@ -190,7 +191,18 @@ pom import - + + org.apache.dubbo.extensions + dubbo-serialization-jdk + ${revision} + true + + + org.apache.dubbo.extensions + dubbo-remoting-http + ${revision} + true + io.fabric8 kubernetes-client @@ -223,7 +235,11 @@ ${spring.version} test - + + com.alibaba + hessian-lite + ${hession-lite.version} + com.caucho hessian @@ -254,6 +270,7 @@ libthrift ${thrift_version} + redis.clients jedis @@ -325,11 +342,6 @@ fury-core ${apache.fury_version} - - org.apache.fury - fury-core - ${apache.fury_version} - com.fasterxml.jackson.core jackson-core diff --git a/dubbo-metadata-report-extensions/dubbo-metadata-rest/pom.xml b/dubbo-metadata-report-extensions/dubbo-metadata-rest/pom.xml index e2b8f01a7..ffd8851a7 100644 --- a/dubbo-metadata-report-extensions/dubbo-metadata-rest/pom.xml +++ b/dubbo-metadata-report-extensions/dubbo-metadata-rest/pom.xml @@ -153,5 +153,9 @@ dubbo-metrics-metadata compile + + org.apache.dubbo + dubbo + diff --git a/dubbo-metadata-report-extensions/dubbo-metadata-rest/src/main/java/org/apache/dubbo/metadata/extension/rest/annotation/processing/jaxrs/JAXRSServiceRestMetadataResolver.java b/dubbo-metadata-report-extensions/dubbo-metadata-rest/src/main/java/org/apache/dubbo/metadata/extension/rest/annotation/processing/jaxrs/JAXRSServiceRestMetadataResolver.java index aa005a352..69ac60115 100644 --- a/dubbo-metadata-report-extensions/dubbo-metadata-rest/src/main/java/org/apache/dubbo/metadata/extension/rest/annotation/processing/jaxrs/JAXRSServiceRestMetadataResolver.java +++ b/dubbo-metadata-report-extensions/dubbo-metadata-rest/src/main/java/org/apache/dubbo/metadata/extension/rest/annotation/processing/jaxrs/JAXRSServiceRestMetadataResolver.java @@ -34,10 +34,10 @@ import static org.apache.dubbo.metadata.annotation.processing.util.AnnotationUtils.getAnnotation; import static org.apache.dubbo.metadata.annotation.processing.util.AnnotationUtils.getValue; import static org.apache.dubbo.metadata.annotation.processing.util.AnnotationUtils.isAnnotationPresent; -import static org.apache.dubbo.metadata.rest.RestMetadataConstants.JAX_RS.CONSUMES_ANNOTATION_CLASS_NAME; -import static org.apache.dubbo.metadata.rest.RestMetadataConstants.JAX_RS.HTTP_METHOD_ANNOTATION_CLASS_NAME; -import static org.apache.dubbo.metadata.rest.RestMetadataConstants.JAX_RS.PATH_ANNOTATION_CLASS_NAME; -import static org.apache.dubbo.metadata.rest.RestMetadataConstants.JAX_RS.PRODUCES_ANNOTATION_CLASS_NAME; +import static org.apache.dubbo.metadata.extension.rest.api.RestMetadataConstants.JAX_RS.CONSUMES_ANNOTATION_CLASS_NAME; +import static org.apache.dubbo.metadata.extension.rest.api.RestMetadataConstants.JAX_RS.HTTP_METHOD_ANNOTATION_CLASS_NAME; +import static org.apache.dubbo.metadata.extension.rest.api.RestMetadataConstants.JAX_RS.PATH_ANNOTATION_CLASS_NAME; +import static org.apache.dubbo.metadata.extension.rest.api.RestMetadataConstants.JAX_RS.PRODUCES_ANNOTATION_CLASS_NAME; diff --git a/dubbo-metadata-report-extensions/dubbo-metadata-rest/src/main/java/org/apache/dubbo/metadata/extension/rest/api/jaxrs/JAXRSServiceRestMetadataResolver.java b/dubbo-metadata-report-extensions/dubbo-metadata-rest/src/main/java/org/apache/dubbo/metadata/extension/rest/api/jaxrs/JAXRSServiceRestMetadataResolver.java index 61a45a110..87605711b 100644 --- a/dubbo-metadata-report-extensions/dubbo-metadata-rest/src/main/java/org/apache/dubbo/metadata/extension/rest/api/jaxrs/JAXRSServiceRestMetadataResolver.java +++ b/dubbo-metadata-report-extensions/dubbo-metadata-rest/src/main/java/org/apache/dubbo/metadata/extension/rest/api/jaxrs/JAXRSServiceRestMetadataResolver.java @@ -31,10 +31,10 @@ import static org.apache.dubbo.common.utils.AnnotationUtils.getValue; import static org.apache.dubbo.common.utils.AnnotationUtils.isAnnotationPresent; import static org.apache.dubbo.common.utils.PathUtils.buildPath; -import static org.apache.dubbo.metadata.rest.RestMetadataConstants.JAX_RS.CONSUMES_ANNOTATION_CLASS_NAME; -import static org.apache.dubbo.metadata.rest.RestMetadataConstants.JAX_RS.HTTP_METHOD_ANNOTATION_CLASS_NAME; -import static org.apache.dubbo.metadata.rest.RestMetadataConstants.JAX_RS.PATH_ANNOTATION_CLASS_NAME; -import static org.apache.dubbo.metadata.rest.RestMetadataConstants.JAX_RS.PRODUCES_ANNOTATION_CLASS_NAME; +import static org.apache.dubbo.metadata.extension.rest.api.RestMetadataConstants.JAX_RS.CONSUMES_ANNOTATION_CLASS_NAME; +import static org.apache.dubbo.metadata.extension.rest.api.RestMetadataConstants.JAX_RS.HTTP_METHOD_ANNOTATION_CLASS_NAME; +import static org.apache.dubbo.metadata.extension.rest.api.RestMetadataConstants.JAX_RS.PATH_ANNOTATION_CLASS_NAME; +import static org.apache.dubbo.metadata.extension.rest.api.RestMetadataConstants.JAX_RS.PRODUCES_ANNOTATION_CLASS_NAME; /** * JAX-RS {@link ServiceRestMetadataResolver} implementation diff --git a/dubbo-rpc-extensions/dubbo-rpc-hessian/pom.xml b/dubbo-rpc-extensions/dubbo-rpc-hessian/pom.xml index e696e5589..545d27f7a 100644 --- a/dubbo-rpc-extensions/dubbo-rpc-hessian/pom.xml +++ b/dubbo-rpc-extensions/dubbo-rpc-hessian/pom.xml @@ -44,7 +44,7 @@ test - org.apache.dubbo + org.apache.dubbo.extensions dubbo-remoting-http true @@ -57,7 +57,7 @@ httpclient - org.apache.dubbo + org.apache.dubbo.extensions dubbo-serialization-jdk test diff --git a/dubbo-rpc-extensions/dubbo-rpc-http/pom.xml b/dubbo-rpc-extensions/dubbo-rpc-http/pom.xml index 35a6ef96e..ee1da47f1 100644 --- a/dubbo-rpc-extensions/dubbo-rpc-http/pom.xml +++ b/dubbo-rpc-extensions/dubbo-rpc-http/pom.xml @@ -41,7 +41,7 @@ true - org.apache.dubbo + org.apache.dubbo.extensions dubbo-remoting-http true diff --git a/dubbo-rpc-extensions/dubbo-rpc-native-thrift/pom.xml b/dubbo-rpc-extensions/dubbo-rpc-native-thrift/pom.xml index 1f6b0cf3a..a2399ed78 100644 --- a/dubbo-rpc-extensions/dubbo-rpc-native-thrift/pom.xml +++ b/dubbo-rpc-extensions/dubbo-rpc-native-thrift/pom.xml @@ -43,13 +43,14 @@ libthrift - org.apache.dubbo + org.apache.dubbo.extensions dubbo-serialization-jdk true + org.apache.dubbo - dubbo-remoting-zookeeper + dubbo-remoting-zookeeper-curator5 true diff --git a/dubbo-rpc-extensions/dubbo-rpc-redis/pom.xml b/dubbo-rpc-extensions/dubbo-rpc-redis/pom.xml index 259a8add9..90c3a9fe0 100644 --- a/dubbo-rpc-extensions/dubbo-rpc-redis/pom.xml +++ b/dubbo-rpc-extensions/dubbo-rpc-redis/pom.xml @@ -47,7 +47,7 @@ test - org.apache.dubbo + org.apache.dubbo.extensions dubbo-serialization-jdk test diff --git a/dubbo-rpc-extensions/dubbo-rpc-rest/pom.xml b/dubbo-rpc-extensions/dubbo-rpc-rest/pom.xml index e8704b79a..ab5777b72 100644 --- a/dubbo-rpc-extensions/dubbo-rpc-rest/pom.xml +++ b/dubbo-rpc-extensions/dubbo-rpc-rest/pom.xml @@ -123,7 +123,7 @@ - org.apache.dubbo + org.apache.dubbo.extensions dubbo-serialization-jdk test diff --git a/dubbo-rpc-extensions/dubbo-rpc-webservice/pom.xml b/dubbo-rpc-extensions/dubbo-rpc-webservice/pom.xml index d7b555bdf..3d340bdc5 100644 --- a/dubbo-rpc-extensions/dubbo-rpc-webservice/pom.xml +++ b/dubbo-rpc-extensions/dubbo-rpc-webservice/pom.xml @@ -38,7 +38,7 @@ true - org.apache.dubbo + org.apache.dubbo.extensions dubbo-remoting-http true