You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicecomb.apache.org by li...@apache.org on 2020/03/19 02:04:46 UTC
[servicecomb-java-chassis] branch master updated: [SCB-1805]clear
some unused 3rd party software
This is an automated email from the ASF dual-hosted git repository.
liubao pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/servicecomb-java-chassis.git
The following commit(s) were added to refs/heads/master by this push:
new e8e9c3b [SCB-1805]clear some unused 3rd party software
e8e9c3b is described below
commit e8e9c3bab60656e43aacf8b5ca44928e330550e7
Author: liubao <bi...@qq.com>
AuthorDate: Tue Mar 17 21:01:57 2020 +0800
[SCB-1805]clear some unused 3rd party software
---
dependencies/default/pom.xml | 13 ++++++-------
distribution/src/release/LICENSE | 4 +---
dynamic-config/config-apollo/pom.xml | 4 ----
.../archaius/sources/ApolloConfigurationSourceImpl.java | 6 ++----
dynamic-config/config-nacos/pom.xml | 8 --------
.../archaius/sources/NacosConfigurationSourceImpl.java | 9 +++------
.../java-chassis-spring-boot-starter-discovery/pom.xml | 8 --------
swagger/swagger-invocation/invocation-validator/pom.xml | 2 +-
.../swagger/invocation/validator/ParameterValidator.java | 6 +++---
9 files changed, 16 insertions(+), 44 deletions(-)
diff --git a/dependencies/default/pom.xml b/dependencies/default/pom.xml
index 7976bb1..4bfa46c 100644
--- a/dependencies/default/pom.xml
+++ b/dependencies/default/pom.xml
@@ -69,7 +69,6 @@
<javax-inject.version>1</javax-inject.version>
<javax-resource.version>1.5</javax-resource.version>
<javax-transaction.version>1.2</javax-transaction.version>
- <javax-validation.version>2.0.1.Final</javax-validation.version>
<javax-ws-rs.version>2.1</javax-ws-rs.version>
<jedis.version>2.9.0</jedis.version>
<jersey.version>2.27</jersey.version>
@@ -98,6 +97,7 @@
<servo.version>0.12.25</servo.version>
<servlet-api.version>4.0.3</servlet-api.version>
<activation.version>1.2.1</activation.version>
+ <jakarta.el.version>3.0.3</jakarta.el.version>
<slf4j.version>1.7.26</slf4j.version>
<snakeyaml.version>1.24</snakeyaml.version>
<spectator.version>0.83.0</spectator.version>
@@ -672,6 +672,11 @@
<version>${activation.version}</version>
</dependency>
<dependency>
+ <groupId>org.glassfish</groupId>
+ <artifactId>jakarta.el</artifactId>
+ <version>${jakarta.el.version}</version>
+ </dependency>
+ <dependency>
<groupId>javax.annotation</groupId>
<artifactId>javax.annotation-api</artifactId>
<version>${javax-annotation.version}</version>
@@ -696,12 +701,6 @@
</dependency>
<dependency>
- <groupId>javax.validation</groupId>
- <artifactId>validation-api</artifactId>
- <version>${javax-validation.version}</version>
- </dependency>
-
- <dependency>
<groupId>javax.ws.rs</groupId>
<artifactId>javax.ws.rs-api</artifactId>
<version>${javax-ws-rs.version}</version>
diff --git a/distribution/src/release/LICENSE b/distribution/src/release/LICENSE
index c6dcba6..7ef6221 100644
--- a/distribution/src/release/LICENSE
+++ b/distribution/src/release/LICENSE
@@ -287,6 +287,7 @@ You can find a copy of the License at licenses/LICENSE-epl-v20
* JRuby Lib Setup (org.jruby:jruby-stdlib:9.2.6.0 - https://github.com/jruby/jruby/jruby-stdlib)
* JRuby Main Maven Artifact (org.jruby:jruby:9.2.6.0 - https://github.com/jruby/jruby/jruby-artifacts/jruby)
* Vert.x Core (io.vertx:vertx-core:3.8.3 - https://github.com/eclipse-vertx/vert.x)
+* Jakarta Expression Language (org.glassfish:jakarta.el:3.0.3 - http://projects.eclipse.org/projects/ee4j.el)
================================================================
This product bundles libraries which are licensed under the
@@ -319,7 +320,6 @@ COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.1.
You can find a copy of the License at licenses/LICENSE-cddl
* JavaMail API jar (javax.mail:mailapi:1.4.3 - http://java.sun.com/projects/javamail/mailapi)
-* Expression Language 3.0 (org.glassfish:javax.el:3.0.0 - http://el-spec.java.net)
* Jakarta Servlet API (jakarta.servlet:jakarta.servlet-api:4.0.3 - https://projects.eclipse.org/projects/ee4j.servlet)
* javax.ws.rs-api (javax.ws.rs:javax.ws.rs-api:2.1 - http://jax-rs-spec.java.net)
* Jersey Apache HTTP Client 4.x (com.sun.jersey.contribs:jersey-apache-client4:2.27 - https://jersey.java.net/jersey-contribs/jersey-apache-client4/)
@@ -478,7 +478,6 @@ For details, see their respective project links.
* asciidoctorj-api (org.asciidoctor:asciidoctorj-api:1.6.2 - https://github.com/asciidoctor/asciidoctorj)
* Awaitility (org.awaitility:awaitility:3.0.0 - http://awaitility.org)
* backport9 (com.headius:backport9:1.1 - http://nexus.sonatype.org/oss-repository-hosting.html/backport9)
-* Bean Validation API (javax.validation:validation-api:2.0.1.Final - http://beanvalidation.org)
* Brave (io.zipkin.brave:brave:5.6.0 - https://github.com/openzipkin/brave/brave)
* Brave Context: Log4J 1.2 (io.zipkin.brave:brave-context-log4j12:5.6.0 - https://github.com/openzipkin/brave/brave-context-parent/brave-context-log4j12)
* Brave Instrumentation: Http Adapters (io.zipkin.brave:brave-instrumentation-http:5.6.0 - https://github.com/openzipkin/brave/brave-instrumentation-parent/brave-instrumentation-http)
@@ -611,7 +610,6 @@ For details, see their respective project links.
* Spring Cloud Netflix Core (org.springframework.cloud:spring-cloud-netflix-core:2.1.0.RELEASE - https://spring.io/spring-cloud/spring-cloud-netflix/spring-cloud-netflix-core)
* spring-cloud-starter (org.springframework.cloud:spring-cloud-starter:2.1.0.RELEASE - https://projects.spring.io/spring-cloud)
* spring-cloud-starter-gateway (org.springframework.cloud:spring-cloud-starter-gateway:2.1.0.RELEASE - https://projects.spring.io/spring-cloud)
-* Spring Cloud Starter Netflix Hystrix (org.springframework.cloud:spring-cloud-starter-netflix-hystrix:2.1.0.RELEASE - https://projects.spring.io/spring-cloud)
* Spring Cloud Starter Netflix Ribbon (org.springframework.cloud:spring-cloud-starter-netflix-ribbon:2.1.0.RELEASE - https://projects.spring.io/spring-cloud)
* Spring Cloud Starter Netflix Zuul (org.springframework.cloud:spring-cloud-starter-netflix-zuul:2.1.0.RELEASE - https://projects.spring.io/spring-cloud)
diff --git a/dynamic-config/config-apollo/pom.xml b/dynamic-config/config-apollo/pom.xml
index 27405b0..5780ea6 100644
--- a/dynamic-config/config-apollo/pom.xml
+++ b/dynamic-config/config-apollo/pom.xml
@@ -40,9 +40,5 @@
<groupId>org.springframework</groupId>
<artifactId>spring-web</artifactId>
</dependency>
- <dependency>
- <groupId>javax.validation</groupId>
- <artifactId>validation-api</artifactId>
- </dependency>
</dependencies>
</project>
diff --git a/dynamic-config/config-apollo/src/main/java/org/apache/servicecomb/config/archaius/sources/ApolloConfigurationSourceImpl.java b/dynamic-config/config-apollo/src/main/java/org/apache/servicecomb/config/archaius/sources/ApolloConfigurationSourceImpl.java
index 95741d5..4e74570 100644
--- a/dynamic-config/config-apollo/src/main/java/org/apache/servicecomb/config/archaius/sources/ApolloConfigurationSourceImpl.java
+++ b/dynamic-config/config-apollo/src/main/java/org/apache/servicecomb/config/archaius/sources/ApolloConfigurationSourceImpl.java
@@ -27,8 +27,6 @@ import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.CopyOnWriteArrayList;
-import javax.validation.constraints.NotNull;
-
import org.apache.commons.configuration.Configuration;
import org.apache.servicecomb.config.ConfigMapping;
import org.apache.servicecomb.config.client.ApolloClient;
@@ -77,12 +75,12 @@ public class ApolloConfigurationSourceImpl implements ConfigCenterConfigurationS
}
@Override
- public void addUpdateListener(@NotNull WatchedUpdateListener watchedUpdateListener) {
+ public void addUpdateListener(WatchedUpdateListener watchedUpdateListener) {
listeners.add(watchedUpdateListener);
}
@Override
- public void removeUpdateListener(@NotNull WatchedUpdateListener watchedUpdateListener) {
+ public void removeUpdateListener(WatchedUpdateListener watchedUpdateListener) {
listeners.remove(watchedUpdateListener);
}
diff --git a/dynamic-config/config-nacos/pom.xml b/dynamic-config/config-nacos/pom.xml
index f44d79a..72116e1 100644
--- a/dynamic-config/config-nacos/pom.xml
+++ b/dynamic-config/config-nacos/pom.xml
@@ -36,14 +36,6 @@
<groupId>org.apache.servicecomb</groupId>
<artifactId>foundation-vertx</artifactId>
</dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-web</artifactId>
- </dependency>
- <dependency>
- <groupId>javax.validation</groupId>
- <artifactId>validation-api</artifactId>
- </dependency>
<!--nacos client-->
<dependency>
<groupId>com.alibaba.nacos</groupId>
diff --git a/dynamic-config/config-nacos/src/main/java/org/apache/servicecomb/config/nacos/archaius/sources/NacosConfigurationSourceImpl.java b/dynamic-config/config-nacos/src/main/java/org/apache/servicecomb/config/nacos/archaius/sources/NacosConfigurationSourceImpl.java
index bfe68b3..27c463c 100644
--- a/dynamic-config/config-nacos/src/main/java/org/apache/servicecomb/config/nacos/archaius/sources/NacosConfigurationSourceImpl.java
+++ b/dynamic-config/config-nacos/src/main/java/org/apache/servicecomb/config/nacos/archaius/sources/NacosConfigurationSourceImpl.java
@@ -24,17 +24,14 @@ import static org.apache.servicecomb.config.nacos.client.ConfigurationAction.SET
import java.util.List;
import java.util.Map;
-import java.util.Properties;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.CopyOnWriteArrayList;
-import javax.validation.constraints.NotNull;
-
import org.apache.commons.configuration.Configuration;
import org.apache.servicecomb.config.ConfigMapping;
+import org.apache.servicecomb.config.nacos.client.ConfigurationAction;
import org.apache.servicecomb.config.nacos.client.NacosClient;
import org.apache.servicecomb.config.nacos.client.NacosConfig;
-import org.apache.servicecomb.config.nacos.client.ConfigurationAction;
import org.apache.servicecomb.config.spi.ConfigCenterConfigurationSource;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -78,12 +75,12 @@ public class NacosConfigurationSourceImpl implements ConfigCenterConfigurationSo
}
@Override
- public void addUpdateListener(@NotNull WatchedUpdateListener watchedUpdateListener) {
+ public void addUpdateListener(WatchedUpdateListener watchedUpdateListener) {
listeners.add(watchedUpdateListener);
}
@Override
- public void removeUpdateListener(@NotNull WatchedUpdateListener watchedUpdateListener) {
+ public void removeUpdateListener(WatchedUpdateListener watchedUpdateListener) {
listeners.remove(watchedUpdateListener);
}
diff --git a/spring-boot/spring-boot-starters/java-chassis-spring-boot-starter-discovery/pom.xml b/spring-boot/spring-boot-starters/java-chassis-spring-boot-starter-discovery/pom.xml
index 478451b..cbf81c3 100644
--- a/spring-boot/spring-boot-starters/java-chassis-spring-boot-starter-discovery/pom.xml
+++ b/spring-boot/spring-boot-starters/java-chassis-spring-boot-starter-discovery/pom.xml
@@ -52,10 +52,6 @@
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
- <artifactId>spring-cloud-netflix-core</artifactId>
- </dependency>
- <dependency>
- <groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-netflix-ribbon</artifactId>
<exclusions>
<exclusion>
@@ -65,10 +61,6 @@
</exclusions>
</dependency>
<dependency>
- <groupId>org.springframework.cloud</groupId>
- <artifactId>spring-cloud-starter-netflix-hystrix</artifactId>
- </dependency>
- <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
diff --git a/swagger/swagger-invocation/invocation-validator/pom.xml b/swagger/swagger-invocation/invocation-validator/pom.xml
index 30630cd..b0722fb 100644
--- a/swagger/swagger-invocation/invocation-validator/pom.xml
+++ b/swagger/swagger-invocation/invocation-validator/pom.xml
@@ -36,7 +36,7 @@
</dependency>
<dependency>
<groupId>org.glassfish</groupId>
- <artifactId>javax.el</artifactId>
+ <artifactId>jakarta.el</artifactId>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
diff --git a/swagger/swagger-invocation/invocation-validator/src/main/java/org/apache/servicecomb/swagger/invocation/validator/ParameterValidator.java b/swagger/swagger-invocation/invocation-validator/src/main/java/org/apache/servicecomb/swagger/invocation/validator/ParameterValidator.java
index 7c2ad70..93c190d 100644
--- a/swagger/swagger-invocation/invocation-validator/src/main/java/org/apache/servicecomb/swagger/invocation/validator/ParameterValidator.java
+++ b/swagger/swagger-invocation/invocation-validator/src/main/java/org/apache/servicecomb/swagger/invocation/validator/ParameterValidator.java
@@ -25,15 +25,15 @@ import javax.validation.ValidatorFactory;
import javax.validation.executable.ExecutableValidator;
import javax.validation.groups.Default;
-import com.netflix.config.DynamicBooleanProperty;
-import com.netflix.config.DynamicPropertyFactory;
-import org.apache.servicecomb.config.ConfigUtil;
import org.apache.servicecomb.swagger.engine.SwaggerProducerOperation;
import org.apache.servicecomb.swagger.invocation.SwaggerInvocation;
import org.apache.servicecomb.swagger.invocation.extension.ProducerInvokeExtension;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import com.netflix.config.DynamicBooleanProperty;
+import com.netflix.config.DynamicPropertyFactory;
+
public class ParameterValidator implements ProducerInvokeExtension {
private static final Logger LOGGER = LoggerFactory.getLogger(ParameterValidator.class);