提交 3deca192 编写于 作者: K ken.lj

修复2.5.4版本不兼容jdk1.7及以下版本的问题

上级 0735bcb4
......@@ -19,7 +19,7 @@
<parent>
<groupId>com.alibaba</groupId>
<artifactId>dubbo-parent</artifactId>
<version>2.5.4-SNAPSHOT</version>
<version>2.5.5</version>
</parent>
<artifactId>dubbo-admin</artifactId>
<packaging>war</packaging>
......
......@@ -19,7 +19,7 @@
<parent>
<groupId>com.alibaba</groupId>
<artifactId>dubbo-parent</artifactId>
<version>2.5.4-SNAPSHOT</version>
<version>2.5.5</version>
</parent>
<artifactId>dubbo-cluster</artifactId>
<packaging>jar</packaging>
......
......@@ -19,7 +19,7 @@
<parent>
<groupId>com.alibaba</groupId>
<artifactId>dubbo-parent</artifactId>
<version>2.5.4-SNAPSHOT</version>
<version>2.5.5</version>
</parent>
<artifactId>dubbo-common</artifactId>
<packaging>jar</packaging>
......
......@@ -19,7 +19,7 @@
<parent>
<groupId>com.alibaba</groupId>
<artifactId>dubbo-config</artifactId>
<version>2.5.4-SNAPSHOT</version>
<version>2.5.5</version>
</parent>
<artifactId>dubbo-config-api</artifactId>
<packaging>jar</packaging>
......
......@@ -19,7 +19,7 @@
<parent>
<groupId>com.alibaba</groupId>
<artifactId>dubbo-config</artifactId>
<version>2.5.4-SNAPSHOT</version>
<version>2.5.5</version>
</parent>
<artifactId>dubbo-config-spring</artifactId>
<packaging>jar</packaging>
......
......@@ -19,7 +19,7 @@
<parent>
<groupId>com.alibaba</groupId>
<artifactId>dubbo-parent</artifactId>
<version>2.5.4-SNAPSHOT</version>
<version>2.5.5</version>
</parent>
<artifactId>dubbo-config</artifactId>
<packaging>pom</packaging>
......
......@@ -19,7 +19,7 @@
<parent>
<groupId>com.alibaba</groupId>
<artifactId>dubbo-container</artifactId>
<version>2.5.4-SNAPSHOT</version>
<version>2.5.5</version>
</parent>
<artifactId>dubbo-container-api</artifactId>
<packaging>jar</packaging>
......
......@@ -19,7 +19,7 @@
<parent>
<groupId>com.alibaba</groupId>
<artifactId>dubbo-container</artifactId>
<version>2.5.4-SNAPSHOT</version>
<version>2.5.5</version>
</parent>
<artifactId>dubbo-container-jetty</artifactId>
<packaging>jar</packaging>
......
......@@ -19,7 +19,7 @@
<parent>
<groupId>com.alibaba</groupId>
<artifactId>dubbo-container</artifactId>
<version>2.5.4-SNAPSHOT</version>
<version>2.5.5</version>
</parent>
<artifactId>dubbo-container-log4j</artifactId>
<packaging>jar</packaging>
......
......@@ -19,7 +19,7 @@
<parent>
<groupId>com.alibaba</groupId>
<artifactId>dubbo-container</artifactId>
<version>2.5.4-SNAPSHOT</version>
<version>2.5.5</version>
</parent>
<artifactId>dubbo-container-logback</artifactId>
<packaging>jar</packaging>
......
......@@ -19,7 +19,7 @@
<parent>
<groupId>com.alibaba</groupId>
<artifactId>dubbo-container</artifactId>
<version>2.5.4-SNAPSHOT</version>
<version>2.5.5</version>
</parent>
<artifactId>dubbo-container-spring</artifactId>
<packaging>jar</packaging>
......
......@@ -19,7 +19,7 @@
<parent>
<groupId>com.alibaba</groupId>
<artifactId>dubbo-parent</artifactId>
<version>2.5.4-SNAPSHOT</version>
<version>2.5.5</version>
</parent>
<artifactId>dubbo-container</artifactId>
<packaging>pom</packaging>
......
......@@ -19,7 +19,7 @@
<parent>
<groupId>com.alibaba</groupId>
<artifactId>dubbo-demo</artifactId>
<version>2.5.4-SNAPSHOT</version>
<version>2.5.5</version>
</parent>
<artifactId>dubbo-demo-api</artifactId>
<packaging>jar</packaging>
......
......@@ -19,7 +19,7 @@
<parent>
<groupId>com.alibaba</groupId>
<artifactId>dubbo-demo</artifactId>
<version>2.5.4-SNAPSHOT</version>
<version>2.5.5</version>
</parent>
<artifactId>dubbo-demo-consumer</artifactId>
<packaging>jar</packaging>
......
......@@ -19,7 +19,7 @@
<parent>
<groupId>com.alibaba</groupId>
<artifactId>dubbo-demo</artifactId>
<version>2.5.4-SNAPSHOT</version>
<version>2.5.5</version>
</parent>
<artifactId>dubbo-demo-provider</artifactId>
<packaging>jar</packaging>
......
......@@ -19,7 +19,7 @@
<parent>
<groupId>com.alibaba</groupId>
<artifactId>dubbo-parent</artifactId>
<version>2.5.4-SNAPSHOT</version>
<version>2.5.5</version>
</parent>
<artifactId>dubbo-demo</artifactId>
<packaging>pom</packaging>
......
......@@ -19,7 +19,7 @@
<parent>
<groupId>com.alibaba</groupId>
<artifactId>dubbo-filter</artifactId>
<version>2.5.4-SNAPSHOT</version>
<version>2.5.5</version>
</parent>
<artifactId>dubbo-filter-cache</artifactId>
<packaging>jar</packaging>
......
......@@ -19,7 +19,7 @@
<parent>
<groupId>com.alibaba</groupId>
<artifactId>dubbo-filter</artifactId>
<version>2.5.4-SNAPSHOT</version>
<version>2.5.5</version>
</parent>
<artifactId>dubbo-filter-validation</artifactId>
<packaging>jar</packaging>
......
......@@ -19,7 +19,7 @@
<parent>
<groupId>com.alibaba</groupId>
<artifactId>dubbo-parent</artifactId>
<version>2.5.4-SNAPSHOT</version>
<version>2.5.5</version>
</parent>
<artifactId>dubbo-filter</artifactId>
<packaging>pom</packaging>
......
......@@ -23,7 +23,7 @@
</parent>
<groupId>com.alibaba</groupId>
<artifactId>dubbo</artifactId>
<version>2.5.4-SNAPSHOT</version>
<version>2.5.5</version>
<packaging>jar</packaging>
<name>Dubbo</name>
<description>Dubbo is a distributed service framework enpowers applications with service import/export capability
......@@ -46,13 +46,23 @@
<dependencies>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring</artifactId>
<version>2.5.6.SEC03</version>
<artifactId>spring-context</artifactId>
<version>4.3.10.RELEASE</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-beans</artifactId>
<version>4.3.10.RELEASE</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-web</artifactId>
<version>4.3.10.RELEASE</version>
</dependency>
<dependency>
<groupId>org.javassist</groupId>
<artifactId>javassist</artifactId>
<version>3.15.0-GA</version>
<version>3.20.0-GA</version>
</dependency>
<dependency>
<groupId>org.jboss.netty</groupId>
......@@ -74,7 +84,7 @@
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
<version>4.1.2</version>
<version>4.5.3</version>
<scope>provided</scope>
</dependency>
<dependency>
......@@ -98,13 +108,13 @@
<dependency>
<groupId>org.apache.zookeeper</groupId>
<artifactId>zookeeper</artifactId>
<version>3.3.3</version>
<version>3.4.9</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.101tec</groupId>
<artifactId>zkclient</artifactId>
<version>0.1</version>
<version>0.2</version>
<scope>provided</scope>
</dependency>
<dependency>
......@@ -122,13 +132,13 @@
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-frontend-simple</artifactId>
<version>2.6.1</version>
<version>3.0.14</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-transports-http</artifactId>
<version>2.6.1</version>
<version>3.0.14</version>
<scope>provided</scope>
</dependency>
<dependency>
......@@ -140,7 +150,7 @@
<dependency>
<groupId>com.caucho</groupId>
<artifactId>hessian</artifactId>
<version>4.0.7</version>
<version>4.0.38</version>
<scope>provided</scope>
</dependency>
<dependency>
......@@ -164,37 +174,37 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>1.6.2</version>
<version>1.7.25</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>redis.clients</groupId>
<artifactId>jedis</artifactId>
<version>2.0.0</version>
<version>2.9.0</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>javax.validation</groupId>
<artifactId>validation-api</artifactId>
<version>1.0.0.GA</version>
<version>1.1.0.Final</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-validator</artifactId>
<version>4.2.0.Final</version>
<version>5.4.1.Final</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>javax.cache</groupId>
<artifactId>cache-api</artifactId>
<version>0.4</version>
<version>1.0.0</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
<version>1.0.6</version>
<version>1.2.2</version>
<scope>provided</scope>
</dependency>
</dependencies>
......@@ -214,8 +224,8 @@
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>1.5</source>
<target>1.5</target>
<source>1.6</source>
<target>1.6</target>
<encoding>UTF-8</encoding>
</configuration>
</plugin>
......@@ -240,6 +250,9 @@
<goals>
<goal>jar</goal>
</goals>
<configuration>
<additionalparam>-Xdoclint:none</additionalparam>
</configuration>
</execution>
</executions>
<configuration>
......
......@@ -19,7 +19,7 @@
<parent>
<groupId>com.alibaba</groupId>
<artifactId>dubbo-monitor</artifactId>
<version>2.5.4-SNAPSHOT</version>
<version>2.5.5</version>
</parent>
<artifactId>dubbo-monitor-api</artifactId>
<packaging>jar</packaging>
......
......@@ -19,7 +19,7 @@
<parent>
<groupId>com.alibaba</groupId>
<artifactId>dubbo-monitor</artifactId>
<version>2.5.4-SNAPSHOT</version>
<version>2.5.5</version>
</parent>
<artifactId>dubbo-monitor-default</artifactId>
<packaging>jar</packaging>
......
......@@ -19,7 +19,7 @@
<parent>
<groupId>com.alibaba</groupId>
<artifactId>dubbo-parent</artifactId>
<version>2.5.4-SNAPSHOT</version>
<version>2.5.5</version>
</parent>
<artifactId>dubbo-monitor</artifactId>
<packaging>pom</packaging>
......
......@@ -19,7 +19,7 @@
<parent>
<groupId>com.alibaba</groupId>
<artifactId>dubbo-registry</artifactId>
<version>2.5.4-SNAPSHOT</version>
<version>2.5.5</version>
</parent>
<artifactId>dubbo-registry-api</artifactId>
<packaging>jar</packaging>
......
......@@ -19,7 +19,7 @@
<parent>
<groupId>com.alibaba</groupId>
<artifactId>dubbo-registry</artifactId>
<version>2.5.4-SNAPSHOT</version>
<version>2.5.5</version>
</parent>
<artifactId>dubbo-registry-default</artifactId>
<packaging>jar</packaging>
......
......@@ -19,7 +19,7 @@
<parent>
<groupId>com.alibaba</groupId>
<artifactId>dubbo-registry</artifactId>
<version>2.5.4-SNAPSHOT</version>
<version>2.5.5</version>
</parent>
<artifactId>dubbo-registry-multicast</artifactId>
<packaging>jar</packaging>
......
......@@ -19,7 +19,7 @@
<parent>
<groupId>com.alibaba</groupId>
<artifactId>dubbo-registry</artifactId>
<version>2.5.4-SNAPSHOT</version>
<version>2.5.5</version>
</parent>
<artifactId>dubbo-registry-redis</artifactId>
<packaging>jar</packaging>
......
......@@ -19,7 +19,7 @@
<parent>
<groupId>com.alibaba</groupId>
<artifactId>dubbo-registry</artifactId>
<version>2.5.4-SNAPSHOT</version>
<version>2.5.5</version>
</parent>
<artifactId>dubbo-registry-zookeeper</artifactId>
<packaging>jar</packaging>
......
......@@ -19,7 +19,7 @@
<parent>
<groupId>com.alibaba</groupId>
<artifactId>dubbo-parent</artifactId>
<version>2.5.4-SNAPSHOT</version>
<version>2.5.5</version>
</parent>
<artifactId>dubbo-registry</artifactId>
<packaging>pom</packaging>
......
......@@ -19,7 +19,7 @@
<parent>
<groupId>com.alibaba</groupId>
<artifactId>dubbo-remoting</artifactId>
<version>2.5.4-SNAPSHOT</version>
<version>2.5.5</version>
</parent>
<artifactId>dubbo-remoting-api</artifactId>
<packaging>jar</packaging>
......
......@@ -19,7 +19,7 @@
<parent>
<groupId>com.alibaba</groupId>
<artifactId>dubbo-remoting</artifactId>
<version>2.5.4-SNAPSHOT</version>
<version>2.5.5</version>
</parent>
<artifactId>dubbo-remoting-grizzly</artifactId>
<packaging>jar</packaging>
......
......@@ -19,7 +19,7 @@
<parent>
<groupId>com.alibaba</groupId>
<artifactId>dubbo-remoting</artifactId>
<version>2.5.4-SNAPSHOT</version>
<version>2.5.5</version>
</parent>
<artifactId>dubbo-remoting-http</artifactId>
<packaging>jar</packaging>
......
......@@ -19,7 +19,7 @@
<parent>
<groupId>com.alibaba</groupId>
<artifactId>dubbo-remoting</artifactId>
<version>2.5.4-SNAPSHOT</version>
<version>2.5.5</version>
</parent>
<artifactId>dubbo-remoting-mina</artifactId>
<packaging>jar</packaging>
......
......@@ -19,7 +19,7 @@
<parent>
<groupId>com.alibaba</groupId>
<artifactId>dubbo-remoting</artifactId>
<version>2.5.4-SNAPSHOT</version>
<version>2.5.5</version>
</parent>
<artifactId>dubbo-remoting-netty</artifactId>
<packaging>jar</packaging>
......
......@@ -19,7 +19,7 @@
<parent>
<groupId>com.alibaba</groupId>
<artifactId>dubbo-remoting</artifactId>
<version>2.5.4-SNAPSHOT</version>
<version>2.5.5</version>
</parent>
<artifactId>dubbo-remoting-p2p</artifactId>
<packaging>jar</packaging>
......
......@@ -19,7 +19,7 @@
<parent>
<groupId>com.alibaba</groupId>
<artifactId>dubbo-remoting</artifactId>
<version>2.5.4-SNAPSHOT</version>
<version>2.5.5</version>
</parent>
<artifactId>dubbo-remoting-zookeeper</artifactId>
<packaging>jar</packaging>
......
......@@ -20,7 +20,7 @@
<parent>
<groupId>com.alibaba</groupId>
<artifactId>dubbo-parent</artifactId>
<version>2.5.4-SNAPSHOT</version>
<version>2.5.5</version>
</parent>
<artifactId>dubbo-remoting</artifactId>
<packaging>pom</packaging>
......
......@@ -19,7 +19,7 @@
<parent>
<groupId>com.alibaba</groupId>
<artifactId>dubbo-rpc</artifactId>
<version>2.5.4-SNAPSHOT</version>
<version>2.5.5</version>
</parent>
<artifactId>dubbo-rpc-api</artifactId>
<packaging>jar</packaging>
......
......@@ -19,7 +19,7 @@
<parent>
<groupId>com.alibaba</groupId>
<artifactId>dubbo-rpc</artifactId>
<version>2.5.4-SNAPSHOT</version>
<version>2.5.5</version>
</parent>
<artifactId>dubbo-rpc-default</artifactId>
<packaging>jar</packaging>
......
......@@ -19,7 +19,7 @@
<parent>
<groupId>com.alibaba</groupId>
<artifactId>dubbo-rpc</artifactId>
<version>2.5.4-SNAPSHOT</version>
<version>2.5.5</version>
</parent>
<artifactId>dubbo-rpc-hessian</artifactId>
<packaging>jar</packaging>
......
......@@ -19,7 +19,7 @@
<parent>
<groupId>com.alibaba</groupId>
<artifactId>dubbo-rpc</artifactId>
<version>2.5.4-SNAPSHOT</version>
<version>2.5.5</version>
</parent>
<artifactId>dubbo-rpc-http</artifactId>
<packaging>jar</packaging>
......
......@@ -19,7 +19,7 @@
<parent>
<groupId>com.alibaba</groupId>
<artifactId>dubbo-rpc</artifactId>
<version>2.5.4-SNAPSHOT</version>
<version>2.5.5</version>
</parent>
<artifactId>dubbo-rpc-injvm</artifactId>
<packaging>jar</packaging>
......
......@@ -19,7 +19,7 @@
<parent>
<groupId>com.alibaba</groupId>
<artifactId>dubbo-rpc</artifactId>
<version>2.5.4-SNAPSHOT</version>
<version>2.5.5</version>
</parent>
<artifactId>dubbo-rpc-memcached</artifactId>
<packaging>jar</packaging>
......
......@@ -19,7 +19,7 @@
<parent>
<groupId>com.alibaba</groupId>
<artifactId>dubbo-rpc</artifactId>
<version>2.5.4-SNAPSHOT</version>
<version>2.5.5</version>
</parent>
<artifactId>dubbo-rpc-redis</artifactId>
<packaging>jar</packaging>
......
......@@ -19,7 +19,7 @@
<parent>
<groupId>com.alibaba</groupId>
<artifactId>dubbo-rpc</artifactId>
<version>2.5.4-SNAPSHOT</version>
<version>2.5.5</version>
</parent>
<artifactId>dubbo-rpc-rmi</artifactId>
<packaging>jar</packaging>
......
......@@ -19,7 +19,7 @@
<parent>
<groupId>com.alibaba</groupId>
<artifactId>dubbo-rpc</artifactId>
<version>2.5.4-SNAPSHOT</version>
<version>2.5.5</version>
</parent>
<artifactId>dubbo-rpc-thrift</artifactId>
<packaging>jar</packaging>
......
......@@ -19,7 +19,7 @@
<parent>
<groupId>com.alibaba</groupId>
<artifactId>dubbo-rpc</artifactId>
<version>2.5.4-SNAPSHOT</version>
<version>2.5.5</version>
</parent>
<artifactId>dubbo-rpc-webservice</artifactId>
<packaging>jar</packaging>
......
......@@ -19,7 +19,7 @@
<parent>
<groupId>com.alibaba</groupId>
<artifactId>dubbo-parent</artifactId>
<version>2.5.4-SNAPSHOT</version>
<version>2.5.5</version>
</parent>
<artifactId>dubbo-rpc</artifactId>
<packaging>pom</packaging>
......
......@@ -19,7 +19,7 @@
<parent>
<groupId>com.alibaba</groupId>
<artifactId>dubbo-simple</artifactId>
<version>2.5.4-SNAPSHOT</version>
<version>2.5.5</version>
</parent>
<artifactId>dubbo-monitor-simple</artifactId>
<packaging>jar</packaging>
......
......@@ -19,7 +19,7 @@
<parent>
<groupId>com.alibaba</groupId>
<artifactId>dubbo-simple</artifactId>
<version>2.5.4-SNAPSHOT</version>
<version>2.5.5</version>
</parent>
<artifactId>dubbo-registry-simple</artifactId>
<packaging>jar</packaging>
......
......@@ -19,7 +19,7 @@
<parent>
<groupId>com.alibaba</groupId>
<artifactId>dubbo-parent</artifactId>
<version>2.5.4-SNAPSHOT</version>
<version>2.5.5</version>
</parent>
<artifactId>dubbo-simple</artifactId>
<packaging>pom</packaging>
......
......@@ -19,7 +19,7 @@
<parent>
<groupId>com.alibaba</groupId>
<artifactId>dubbo-test</artifactId>
<version>2.5.4-SNAPSHOT</version>
<version>2.5.5</version>
</parent>
<artifactId>dubbo-test-benchmark</artifactId>
<packaging>jar</packaging>
......
......@@ -19,7 +19,7 @@
<parent>
<groupId>com.alibaba</groupId>
<artifactId>dubbo-test</artifactId>
<version>2.5.4-SNAPSHOT</version>
<version>2.5.5</version>
</parent>
<artifactId>dubbo-test-compatibility</artifactId>
<packaging>jar</packaging>
......
......@@ -19,7 +19,7 @@
<parent>
<groupId>com.alibaba</groupId>
<artifactId>dubbo-test</artifactId>
<version>2.5.4-SNAPSHOT</version>
<version>2.5.5</version>
</parent>
<artifactId>dubbo-test-examples</artifactId>
<packaging>jar</packaging>
......
......@@ -19,7 +19,7 @@
<parent>
<groupId>com.alibaba</groupId>
<artifactId>dubbo-test</artifactId>
<version>2.5.4-SNAPSHOT</version>
<version>2.5.5</version>
</parent>
<artifactId>dubbo-test-integration</artifactId>
<packaging>jar</packaging>
......
......@@ -19,7 +19,7 @@
<parent>
<groupId>com.alibaba</groupId>
<artifactId>dubbo-parent</artifactId>
<version>2.5.4-SNAPSHOT</version>
<version>2.5.5</version>
</parent>
<artifactId>dubbo-test</artifactId>
<packaging>pom</packaging>
......
......@@ -19,7 +19,7 @@
<parent>
<groupId>com.alibaba</groupId>
<artifactId>dubbo-parent</artifactId>
<version>2.5.4-SNAPSHOT</version>
<version>2.5.5</version>
</parent>
<artifactId>dubbo</artifactId>
<packaging>jar</packaging>
......
......@@ -6,7 +6,7 @@
<parent>
<groupId>com.alibaba</groupId>
<artifactId>dubbo-parent</artifactId>
<version>2.5.4-SNAPSHOT</version>
<version>2.5.5</version>
</parent>
<artifactId>hessian-lite</artifactId>
<packaging>jar</packaging>
......
......@@ -18,7 +18,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.alibaba</groupId>
<artifactId>dubbo-parent</artifactId>
<version>2.5.4-SNAPSHOT</version>
<version>2.5.5</version>
<packaging>pom</packaging>
<name>${project.artifactId}</name>
<description>The parent project of dubbo</description>
......@@ -140,7 +140,6 @@
<profile.name>oss</profile.name>
<!-- for maven compiler plugin -->
<maven_compiler_plugin_version>3.5.1</maven_compiler_plugin_version>
<java_source_version>1.6</java_source_version>
<java_target_version>1.6</java_target_version>
<file_encoding>UTF-8</file_encoding>
......@@ -463,7 +462,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>${maven_compiler_plugin_version}</version>
<configuration>
<fork>true</fork>
<source>${java_source_version}</source>
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册