You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dubbo.apache.org by hu...@apache.org on 2019/12/25 13:54:38 UTC
[dubbo-js] branch v3.0.0 updated: refactor dubbo-demo
This is an automated email from the ASF dual-hosted git repository.
hufeng pushed a commit to branch v3.0.0
in repository https://gitbox.apache.org/repos/asf/dubbo-js.git
The following commit(s) were added to refs/heads/v3.0.0 by this push:
new 86f264a refactor dubbo-demo
new e5a5c05 Merge pull request #182 from hufeng/v3.0.0
86f264a is described below
commit 86f264a3ab4da736d721cdad81a90b7f84788d4d
Author: hufeng <fe...@gmail.com>
AuthorDate: Wed Dec 25 21:52:20 2019 +0800
refactor dubbo-demo
---
.vscode/settings.json | 2 +-
java/dubbo-demo/dubbo-demo-api/pom.xml | 21 +-
.../java/org/apache/dubbo/demo/DemoProvider.java | 17 +-
java/dubbo-demo/dubbo-demo-consumer/pom.xml | 39 +-
.../src/main/assembly/assembly.xml | 27 +-
.../src/main/assembly/conf/dubbo.properties | 28 +-
.../org/apache/dubbo/demo/consumer/Consumer.java | 3 -
java/dubbo-demo/dubbo-demo-provider/pom.xml | 46 +-
.../src/main/assembly/assembly.xml | 27 +-
.../src/main/assembly/conf/dubbo.properties | 28 +-
.../org/apache/dubbo/demo/provider/Provider.java | 3 -
.../org/apache/dubbo/demo/provider/Provider1.java | 3 -
java/dubbo-demo/pom.xml | 10 +-
java/pom.xml | 585 ---------------------
start_dubbo_service.sh | 2 +-
15 files changed, 146 insertions(+), 695 deletions(-)
diff --git a/.vscode/settings.json b/.vscode/settings.json
index 385f27a..4f81299 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -1,3 +1,3 @@
{
- "java.configuration.updateBuildConfiguration": "interactive"
+ "java.configuration.updateBuildConfiguration": "automatic"
}
diff --git a/java/dubbo-demo/dubbo-demo-api/pom.xml b/java/dubbo-demo/dubbo-demo-api/pom.xml
index 905096b..3904e0c 100644
--- a/java/dubbo-demo/dubbo-demo-api/pom.xml
+++ b/java/dubbo-demo/dubbo-demo-api/pom.xml
@@ -17,6 +17,15 @@
<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
+ <artifactId>dubbo-demo-api</artifactId>
+ <packaging>jar</packaging>
+ <groupId>org.apache.dubbo</groupId>
+ <version>2.7.4.1</version>
+ <name>${project.artifactId}</name>
+ <description>The demo module of dubbo project</description>
+ <properties>
+ <skip_maven_deploy>true</skip_maven_deploy>
+ </properties>
<build>
<plugins>
<plugin>
@@ -32,16 +41,4 @@
</plugin>
</plugins>
</build>
- <parent>
- <groupId>com.alibaba</groupId>
- <artifactId>dubbo-demo</artifactId>
- <version>2.6.3</version>
- </parent>
- <artifactId>dubbo-demo-api</artifactId>
- <packaging>jar</packaging>
- <name>${project.artifactId}</name>
- <description>The demo module of dubbo project</description>
- <properties>
- <skip_maven_deploy>true</skip_maven_deploy>
- </properties>
</project>
\ No newline at end of file
diff --git a/java/dubbo-demo/dubbo-demo-api/src/main/java/org/apache/dubbo/demo/DemoProvider.java b/java/dubbo-demo/dubbo-demo-api/src/main/java/org/apache/dubbo/demo/DemoProvider.java
index 57875a4..3b4b592 100644
--- a/java/dubbo-demo/dubbo-demo-api/src/main/java/org/apache/dubbo/demo/DemoProvider.java
+++ b/java/dubbo-demo/dubbo-demo-api/src/main/java/org/apache/dubbo/demo/DemoProvider.java
@@ -1,12 +1,13 @@
/*
- * Copyright 1999-2011 Alibaba Group.
- *
- * Licensed 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
- *
+ * 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.
diff --git a/java/dubbo-demo/dubbo-demo-consumer/pom.xml b/java/dubbo-demo/dubbo-demo-consumer/pom.xml
index fb0577b..4a2f114 100644
--- a/java/dubbo-demo/dubbo-demo-consumer/pom.xml
+++ b/java/dubbo-demo/dubbo-demo-consumer/pom.xml
@@ -17,60 +17,77 @@
<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>com.alibaba</groupId>
- <artifactId>dubbo-demo</artifactId>
- <version>2.6.3</version>
- </parent>
<artifactId>dubbo-demo-consumer</artifactId>
+ <groupId>org.apache.dubbo</groupId>
+ <version>2.7.4.1</version>
<packaging>jar</packaging>
<name>${project.artifactId}</name>
<description>The demo consumer module of dubbo project</description>
<properties>
+ <dubbo.version>2.7.4.1</dubbo.version>
+ <javassist_version>3.20.0-GA</javassist_version>
+ <netty_version>3.2.5.Final</netty_version>
+ <zookeeper_version>3.4.9</zookeeper_version>
+ <zkclient_version>0.2</zkclient_version>
+ <curator_version>2.12.0</curator_version>
+ <fastjson_version>1.2.31</fastjson_version>
+ <log4j_version>1.2.16</log4j_version>
+ <slf4j_version>1.7.25</slf4j_version>
+
+ <maven.compiler.target>1.8</maven.compiler.target>
+ <maven.compiler.source>1.8</maven.compiler.source>
<skip_maven_deploy>false</skip_maven_deploy>
</properties>
<dependencies>
<dependency>
- <groupId>com.alibaba</groupId>
+ <groupId>org.apache.dubbo</groupId>
<artifactId>dubbo-demo-api</artifactId>
- <version>${project.parent.version}</version>
+ <version>${dubbo.version}</version>
</dependency>
<dependency>
- <groupId>com.alibaba</groupId>
+ <groupId>org.apache.dubbo</groupId>
<artifactId>dubbo</artifactId>
- <version>${project.parent.version}</version>
+ <version>${dubbo.version}</version>
</dependency>
<dependency>
<groupId>org.javassist</groupId>
<artifactId>javassist</artifactId>
+ <version>${javassist_version}</version>
</dependency>
<dependency>
<groupId>org.jboss.netty</groupId>
<artifactId>netty</artifactId>
+ <version>${netty_version}</version>
</dependency>
<dependency>
<groupId>org.apache.zookeeper</groupId>
<artifactId>zookeeper</artifactId>
+ <version>${zookeeper_version}</version>
</dependency>
<dependency>
<groupId>com.101tec</groupId>
<artifactId>zkclient</artifactId>
+ <version>${zkclient_version}</version>
</dependency>
<dependency>
<groupId>org.apache.curator</groupId>
<artifactId>curator-framework</artifactId>
+ <version>${curator_version}</version>
</dependency>
<dependency>
<groupId>com.alibaba</groupId>
<artifactId>fastjson</artifactId>
+ <version>${fastjson_version}</version>
</dependency>
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
+ <version>${log4j_version}</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
+ <version>${slf4j_version}</version>
</dependency>
</dependencies>
<build>
@@ -87,9 +104,9 @@
<configuration>
<artifactItems>
<artifactItem>
- <groupId>com.alibaba</groupId>
+ <groupId>org.apache.dubbo</groupId>
<artifactId>dubbo</artifactId>
- <version>${project.parent.version}</version>
+ <version>${dubbo.version}</version>
<outputDirectory>${project.build.directory}/dubbo</outputDirectory>
<includes>META-INF/assembly/**</includes>
</artifactItem>
diff --git a/java/dubbo-demo/dubbo-demo-consumer/src/main/assembly/assembly.xml b/java/dubbo-demo/dubbo-demo-consumer/src/main/assembly/assembly.xml
index e57da2e..96cf40b 100644
--- a/java/dubbo-demo/dubbo-demo-consumer/src/main/assembly/assembly.xml
+++ b/java/dubbo-demo/dubbo-demo-consumer/src/main/assembly/assembly.xml
@@ -1,17 +1,18 @@
<!--
- - Copyright 1999-2011 Alibaba Group.
- -
- - Licensed 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.
+ * 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.
-->
<assembly>
<id>assembly</id>
diff --git a/java/dubbo-demo/dubbo-demo-consumer/src/main/assembly/conf/dubbo.properties b/java/dubbo-demo/dubbo-demo-consumer/src/main/assembly/conf/dubbo.properties
index d3cc21f..164e3f1 100644
--- a/java/dubbo-demo/dubbo-demo-consumer/src/main/assembly/conf/dubbo.properties
+++ b/java/dubbo-demo/dubbo-demo-consumer/src/main/assembly/conf/dubbo.properties
@@ -1,17 +1,19 @@
-##
-# Copyright 1999-2011 Alibaba Group.
-#
-# Licensed 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
-#
+#
+# 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.
+#
+# 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.
+
##
dubbo.container=log4j,spring
dubbo.application.name=demo-consumer
diff --git a/java/dubbo-demo/dubbo-demo-consumer/src/main/java/org/apache/dubbo/demo/consumer/Consumer.java b/java/dubbo-demo/dubbo-demo-consumer/src/main/java/org/apache/dubbo/demo/consumer/Consumer.java
index 56091a5..cbcf6c3 100644
--- a/java/dubbo-demo/dubbo-demo-consumer/src/main/java/org/apache/dubbo/demo/consumer/Consumer.java
+++ b/java/dubbo-demo/dubbo-demo-consumer/src/main/java/org/apache/dubbo/demo/consumer/Consumer.java
@@ -20,9 +20,6 @@ package org.apache.dubbo.demo.consumer;
import org.apache.dubbo.demo.DemoProvider;
import org.springframework.context.support.ClassPathXmlApplicationContext;
-/**
- * Created by ken.lj on 2017/7/31.
- */
public class Consumer {
public static void main(String[] args) {
diff --git a/java/dubbo-demo/dubbo-demo-provider/pom.xml b/java/dubbo-demo/dubbo-demo-provider/pom.xml
index 5163803..34e82ce 100644
--- a/java/dubbo-demo/dubbo-demo-provider/pom.xml
+++ b/java/dubbo-demo/dubbo-demo-provider/pom.xml
@@ -17,64 +17,88 @@
<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>com.alibaba</groupId>
- <artifactId>dubbo-demo</artifactId>
- <version>2.6.3</version>
- </parent>
<artifactId>dubbo-demo-provider</artifactId>
+ <groupId>org.apache.dubbo</groupId>
+ <version>2.7.4.1</version>
<packaging>jar</packaging>
<name>${project.artifactId}</name>
<description>The demo provider module of dubbo project</description>
<properties>
+ <dubbo.version>2.7.4.1</dubbo.version>
+ <javassist_version>3.20.0-GA</javassist_version>
+ <netty_version>3.2.5.Final</netty_version>
+ <zookeeper_version>3.4.9</zookeeper_version>
+ <zkclient_version>0.2</zkclient_version>
+ <curator_version>2.12.0</curator_version>
+ <fastjson_version>1.2.31</fastjson_version>
+ <log4j_version>1.2.16</log4j_version>
+ <slf4j_version>1.7.25</slf4j_version>
+ <spring_version>4.3.10.RELEASE</spring_version>
+
+ <maven.compiler.target>1.8</maven.compiler.target>
+ <maven.compiler.source>1.8</maven.compiler.source>
<skip_maven_deploy>false</skip_maven_deploy>
</properties>
<dependencies>
<dependency>
- <groupId>com.alibaba</groupId>
+ <groupId>org.apache.dubbo</groupId>
<artifactId>dubbo-demo-api</artifactId>
- <version>${project.parent.version}</version>
+ <version>${dubbo.version}</version>
</dependency>
<dependency>
- <groupId>com.alibaba</groupId>
+ <groupId>org.apache.dubbo</groupId>
<artifactId>dubbo</artifactId>
- <version>${project.parent.version}</version>
+ <version>${dubbo.version}</version>
</dependency>
<dependency>
<groupId>org.javassist</groupId>
<artifactId>javassist</artifactId>
+ <version>${javassist_version}</version>
</dependency>
<dependency>
<groupId>org.jboss.netty</groupId>
<artifactId>netty</artifactId>
+ <version>${netty_version}</version>
</dependency>
<dependency>
<groupId>org.apache.zookeeper</groupId>
<artifactId>zookeeper</artifactId>
+ <version>${zookeeper_version}</version>
</dependency>
<dependency>
<groupId>com.101tec</groupId>
<artifactId>zkclient</artifactId>
+ <version>${zkclient_version}</version>
</dependency>
<dependency>
<groupId>org.apache.curator</groupId>
<artifactId>curator-framework</artifactId>
+ <version>${curator_version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.curator</groupId>
+ <artifactId>curator-recipes</artifactId>
+ <version>${curator_version}</version>
</dependency>
<dependency>
<groupId>com.alibaba</groupId>
<artifactId>fastjson</artifactId>
+ <version>${fastjson_version}</version>
</dependency>
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
+ <version>${log4j_version}</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
+ <version>${slf4j_version}</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
+ <version>${spring_version}</version>
</dependency>
</dependencies>
<build>
@@ -91,9 +115,9 @@
<configuration>
<artifactItems>
<artifactItem>
- <groupId>com.alibaba</groupId>
+ <groupId>org.apache.dubbo</groupId>
<artifactId>dubbo</artifactId>
- <version>${project.parent.version}</version>
+ <version>${dubbo.version}</version>
<outputDirectory>${project.build.directory}/dubbo</outputDirectory>
<includes>META-INF/assembly/**</includes>
</artifactItem>
diff --git a/java/dubbo-demo/dubbo-demo-provider/src/main/assembly/assembly.xml b/java/dubbo-demo/dubbo-demo-provider/src/main/assembly/assembly.xml
index e57da2e..96cf40b 100644
--- a/java/dubbo-demo/dubbo-demo-provider/src/main/assembly/assembly.xml
+++ b/java/dubbo-demo/dubbo-demo-provider/src/main/assembly/assembly.xml
@@ -1,17 +1,18 @@
<!--
- - Copyright 1999-2011 Alibaba Group.
- -
- - Licensed 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.
+ * 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.
-->
<assembly>
<id>assembly</id>
diff --git a/java/dubbo-demo/dubbo-demo-provider/src/main/assembly/conf/dubbo.properties b/java/dubbo-demo/dubbo-demo-provider/src/main/assembly/conf/dubbo.properties
index 728be32..67f859b 100644
--- a/java/dubbo-demo/dubbo-demo-provider/src/main/assembly/conf/dubbo.properties
+++ b/java/dubbo-demo/dubbo-demo-provider/src/main/assembly/conf/dubbo.properties
@@ -1,17 +1,19 @@
-##
-# Copyright 1999-2011 Alibaba Group.
-#
-# Licensed 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
-#
+#
+# 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.
+#
+# 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.
+
##
dubbo.container=log4j,spring
dubbo.application.name=demo-provider
diff --git a/java/dubbo-demo/dubbo-demo-provider/src/main/java/org/apache/dubbo/demo/provider/Provider.java b/java/dubbo-demo/dubbo-demo-provider/src/main/java/org/apache/dubbo/demo/provider/Provider.java
index 094394c..5a4297a 100644
--- a/java/dubbo-demo/dubbo-demo-provider/src/main/java/org/apache/dubbo/demo/provider/Provider.java
+++ b/java/dubbo-demo/dubbo-demo-provider/src/main/java/org/apache/dubbo/demo/provider/Provider.java
@@ -19,9 +19,6 @@ package org.apache.dubbo.demo.provider;
import org.springframework.context.support.ClassPathXmlApplicationContext;
-/**
- * Created by ken.lj on 2017/7/31.
- */
public class Provider {
public static void main(String[] args) throws Exception {
diff --git a/java/dubbo-demo/dubbo-demo-provider/src/main/java/org/apache/dubbo/demo/provider/Provider1.java b/java/dubbo-demo/dubbo-demo-provider/src/main/java/org/apache/dubbo/demo/provider/Provider1.java
index 6d8c9c5..5bcaff7 100644
--- a/java/dubbo-demo/dubbo-demo-provider/src/main/java/org/apache/dubbo/demo/provider/Provider1.java
+++ b/java/dubbo-demo/dubbo-demo-provider/src/main/java/org/apache/dubbo/demo/provider/Provider1.java
@@ -19,9 +19,6 @@ package org.apache.dubbo.demo.provider;
import org.springframework.context.support.ClassPathXmlApplicationContext;
-/**
- * Created by ken.lj on 2017/7/31.
- */
public class Provider1 {
public static void main(String[] args) throws Exception {
diff --git a/java/dubbo-demo/pom.xml b/java/dubbo-demo/pom.xml
index 52efd4c..f53935b 100644
--- a/java/dubbo-demo/pom.xml
+++ b/java/dubbo-demo/pom.xml
@@ -17,16 +17,16 @@
<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>com.alibaba</groupId>
- <artifactId>dubbo-parent</artifactId>
- <version>2.6.3</version>
- </parent>
<artifactId>dubbo-demo</artifactId>
<packaging>pom</packaging>
<name>${project.artifactId}</name>
+ <groupId>org.apache.dubbo</groupId>
+ <version>2.7.4.1</version>
<description>The demo module of dubbo project</description>
<properties>
+ <maven.compiler.target>1.8</maven.compiler.target>
+ <maven.compiler.source>1.8</maven.compiler.source>
+
<skip_maven_deploy>true</skip_maven_deploy>
</properties>
<modules>
diff --git a/java/pom.xml b/java/pom.xml
deleted file mode 100644
index f54473d..0000000
--- a/java/pom.xml
+++ /dev/null
@@ -1,585 +0,0 @@
-<!--
- * 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.
--->
-<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <groupId>com.alibaba</groupId>
- <artifactId>dubbo-parent</artifactId>
- <version>2.6.3</version>
- <packaging>pom</packaging>
- <name>${project.artifactId}</name>
- <description>The parent project of dubbo</description>
- <url>http://code.alibabatech.com/wiki/display/dubbo</url>
- <inceptionYear>2011</inceptionYear>
- <licenses>
- <license>
- <name>Apache 2</name>
- <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
- <distribution>repo</distribution>
- <comments>A business-friendly OSS license</comments>
- </license>
- </licenses>
- <organization>
- <name>Alibaba</name>
- <url>http://www.alibaba.com</url>
- </organization>
- <modules>
- <module>hessian-lite</module>
- <module>dubbo-common</module>
- <module>dubbo-container</module>
- <module>dubbo-remoting</module>
- <module>dubbo-rpc</module>
- <module>dubbo-filter</module>
- <module>dubbo-cluster</module>
- <module>dubbo-registry</module>
- <module>dubbo-monitor</module>
- <module>dubbo-config</module>
- <module>dubbo</module>
- <module>dubbo-simple</module>
- <module>dubbo-admin</module>
- <module>dubbo-demo</module>
- </modules>
- <profiles>
- <profile>
- <id>test</id>
- <activation>
- <file>
- <missing>.project</missing>
- </file>
- </activation>
- <modules>
- <module>dubbo-test</module>
- </modules>
- </profile>
- <profile>
- <id>hudson</id>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <testFailureIgnore>true</testFailureIgnore>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
- <properties>
- <!-- Common libs -->
- <spring_version>4.3.10.RELEASE</spring_version>
- <javassist_version>3.20.0-GA</javassist_version>
- <netty_version>3.2.5.Final</netty_version>
- <mina_version>1.1.7</mina_version>
- <grizzly_version>2.1.4</grizzly_version>
- <httpclient_version>4.5.3</httpclient_version>
- <hessian_lite_version>3.2.1-fixed-2</hessian_lite_version>
- <xstream_version>1.4.1</xstream_version>
- <fastjson_version>1.2.31</fastjson_version>
- <bsf_version>3.1</bsf_version>
- <sorcerer_version>0.8</sorcerer_version>
- <zookeeper_version>3.4.9</zookeeper_version>
- <zkclient_version>0.2</zkclient_version>
- <curator_version>2.12.0</curator_version>
- <jedis_version>2.9.0</jedis_version>
- <xmemcached_version>1.3.6</xmemcached_version>
- <cxf_version>3.0.14</cxf_version>
- <thrift_version>0.12.0</thrift_version>
- <jfreechart_version>1.0.13</jfreechart_version>
- <hessian_version>4.0.38</hessian_version>
- <servlet_version>2.5</servlet_version>
- <jetty_version>6.1.26</jetty_version>
- <validation_version>1.1.0.Final</validation_version>
- <hibernate_validator_version>5.4.1.Final</hibernate_validator_version>
- <jel_version>3.0.1-b08</jel_version>
- <jcache_version>1.0.0</jcache_version>
- <sca_version>2.0-M5.1</sca_version>
- <guice_version>3.0</guice_version>
- <cglib_version>2.2</cglib_version>
- <webx_version>3.1.6</webx_version>
- <velocity_version>1.7</velocity_version>
- <!-- Log libs -->
- <slf4j_version>1.7.25</slf4j_version>
- <jcl_version>1.2</jcl_version>
- <log4j_version>1.2.16</log4j_version>
- <logback_version>1.2.2</logback_version>
- <!-- Test libs -->
- <junit_version>4.12</junit_version>
- <easymock_version>3.4</easymock_version>
- <jmockit_version>1.33</jmockit_version>
- <!-- Build args -->
- <argline>-server -Xms64m -Xmx256m -XX:PermSize=64m -XX:MaxPermSize=128m -Dfile.encoding=UTF-8
- -Djava.net.preferIPv4Stack=true
- </argline>
- <skip_maven_deploy>false</skip_maven_deploy>
- <updateReleaseInfo>true</updateReleaseInfo>
- <project.build.sourceEncoding>${file_encoding}</project.build.sourceEncoding>
-
- <!-- generate idea copyright -->
- <copyright>Copyright 1999-2012 Alibaba Group. Licensed 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.
- </copyright>
- <profile.name>oss</profile.name>
-
- <!-- for maven compiler plugin -->
- <java_source_version>1.6</java_source_version>
- <java_target_version>1.6</java_target_version>
- <file_encoding>UTF-8</file_encoding>
-
- </properties>
- <dependencyManagement>
- <dependencies>
- <!-- Common libs -->
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-framework-bom</artifactId>
- <version>${spring_version}</version>
- <type>pom</type>
- <scope>import</scope>
- </dependency>
- <dependency>
- <groupId>org.javassist</groupId>
- <artifactId>javassist</artifactId>
- <version>${javassist_version}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.netty</groupId>
- <artifactId>netty</artifactId>
- <version>${netty_version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.mina</groupId>
- <artifactId>mina-core</artifactId>
- <version>${mina_version}</version>
- </dependency>
- <dependency>
- <groupId>org.glassfish.grizzly</groupId>
- <artifactId>grizzly-core</artifactId>
- <version>${grizzly_version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpclient</artifactId>
- <version>${httpclient_version}</version>
- </dependency>
- <dependency>
- <groupId>com.alibaba</groupId>
- <artifactId>hessian-lite</artifactId>
- <version>${hessian_lite_version}</version>
- </dependency>
- <dependency>
- <groupId>com.alibaba</groupId>
- <artifactId>fastjson</artifactId>
- <version>${fastjson_version}</version>
- </dependency>
- <dependency>
- <groupId>com.thoughtworks.xstream</groupId>
- <artifactId>xstream</artifactId>
- <version>${xstream_version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.bsf</groupId>
- <artifactId>bsf-api</artifactId>
- <version>${bsf_version}</version>
- </dependency>
- <dependency>
- <groupId>org.jvnet.sorcerer</groupId>
- <artifactId>sorcerer-javac</artifactId>
- <version>${sorcerer_version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.zookeeper</groupId>
- <artifactId>zookeeper</artifactId>
- <version>${zookeeper_version}</version>
- </dependency>
- <dependency>
- <groupId>com.101tec</groupId>
- <artifactId>zkclient</artifactId>
- <version>${zkclient_version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.curator</groupId>
- <artifactId>curator-framework</artifactId>
- <version>${curator_version}</version>
- </dependency>
- <dependency>
- <groupId>redis.clients</groupId>
- <artifactId>jedis</artifactId>
- <version>${jedis_version}</version>
- </dependency>
- <dependency>
- <groupId>com.googlecode.xmemcached</groupId>
- <artifactId>xmemcached</artifactId>
- <version>${xmemcached_version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-rt-frontend-simple</artifactId>
- <version>${cxf_version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-rt-transports-http</artifactId>
- <version>${cxf_version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.thrift</groupId>
- <artifactId>libthrift</artifactId>
- <version>${thrift_version}</version>
- </dependency>
- <dependency>
- <groupId>jfree</groupId>
- <artifactId>jfreechart</artifactId>
- <version>${jfreechart_version}</version>
- </dependency>
- <dependency>
- <groupId>com.caucho</groupId>
- <artifactId>hessian</artifactId>
- <version>${hessian_version}</version>
- </dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>${servlet_version}</version>
- </dependency>
- <dependency>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>jetty</artifactId>
- <version>${jetty_version}</version>
- </dependency>
- <dependency>
- <groupId>javax.validation</groupId>
- <artifactId>validation-api</artifactId>
- <version>${validation_version}</version>
- </dependency>
- <dependency>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-validator</artifactId>
- <version>${hibernate_validator_version}</version>
- </dependency>
- <dependency>
- <groupId>org.glassfish</groupId>
- <artifactId>javax.el</artifactId>
- <version>${jel_version}</version>
- </dependency>
- <dependency>
- <groupId>javax.cache</groupId>
- <artifactId>cache-api</artifactId>
- <version>${jcache_version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-sca-api</artifactId>
- <version>${sca_version}</version>
- </dependency>
- <dependency>
- <groupId>com.google.inject</groupId>
- <artifactId>guice</artifactId>
- <version>${guice_version}</version>
- </dependency>
- <dependency>
- <groupId>com.alibaba.citrus</groupId>
- <artifactId>citrus-webx-all</artifactId>
- <version>${webx_version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.velocity</groupId>
- <artifactId>velocity</artifactId>
- <version>${velocity_version}</version>
- </dependency>
- <!-- Log libs -->
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- <version>${slf4j_version}</version>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <version>${slf4j_version}</version>
- </dependency>
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <version>${jcl_version}</version>
- </dependency>
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>${log4j_version}</version>
- </dependency>
- <dependency>
- <groupId>ch.qos.logback</groupId>
- <artifactId>logback-classic</artifactId>
- <version>${logback_version}</version>
- </dependency>
- <!-- Test libs -->
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>${junit_version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.easymock</groupId>
- <artifactId>easymock</artifactId>
- <version>${easymock_version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.jmockit</groupId>
- <artifactId>jmockit</artifactId>
- <version>1.33</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>cglib</groupId>
- <artifactId>cglib-nodep</artifactId>
- <version>${cglib_version}</version>
- </dependency>
- </dependencies>
- </dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- </dependency>
- <dependency>
- <groupId>org.easymock</groupId>
- <artifactId>easymock</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jmockit</groupId>
- <artifactId>jmockit</artifactId>
- </dependency>
- </dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <configuration>
- <archive>
- <addMavenDescriptor>true</addMavenDescriptor>
- <index>true</index>
- <manifest>
- <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
- <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
- </manifest>
- </archive>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <useSystemClassLoader>true</useSystemClassLoader>
- <forkMode>once</forkMode>
- <argLine>${argline}</argLine>
- <systemProperties>
- <!-- common shared -->
- <property>
- <name>transporter</name>
- <value>${transporter}</value>
- </property>
- <property>
- <name>serialization</name>
- <value>${serialization}</value>
- </property>
- <!-- server side -->
- <property>
- <name>port</name>
- <value>${port}</value>
- </property>
- <property>
- <name>threadpool</name>
- <value>${threadpool}</value>
- </property>
- <property>
- <name>threads</name>
- <value>${threads}</value>
- </property>
- <property>
- <name>iothreads</name>
- <value>${iothreads}</value>
- </property>
- <!-- client side -->
- <property>
- <name>server</name>
- <value>${server}</value>
- </property>
- <property>
- <name>timeout</name>
- <value>${timeout}</value>
- </property>
- <property>
- <name>length</name>
- <value>${length}</value>
- </property>
- <property>
- <name>connections</name>
- <value>${connections}</value>
- </property>
- <property>
- <name>base</name>
- <value>${base}</value>
- </property>
- <property>
- <name>concurrent</name>
- <value>${concurrent}</value>
- </property>
- <property>
- <name>runs</name>
- <value>${runs}</value>
- </property>
- <property>
- <name>onerror</name>
- <value>${onerror}</value>
- </property>
- </systemProperties>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-deploy-plugin</artifactId>
- <configuration>
- <skip>${skip_maven_deploy}</skip>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <fork>true</fork>
- <source>${java_source_version}</source>
- <target>${java_target_version}</target>
- <encoding>${file_encoding}</encoding>
- </configuration>
- </plugin>
- <plugin>
- <artifactId>maven-source-plugin</artifactId>
- <executions>
- <execution>
- <id>attach-sources</id>
- <phase>verify</phase>
- <goals>
- <goal>jar</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-
- <issueManagement>
- <system>github</system>
- <url>https://github.com/alibaba/dubbo/issues</url>
- </issueManagement>
- <scm>
- <url>https://github.com/alibaba/dubbo</url>
- <connection>https://github.com/alibaba/dubbo.git</connection>
- </scm>
- <mailingLists>
- <mailingList>
- <name>Dubbo User Mailling List</name>
- <subscribe>dubbo-subscribe AT googlegroups DOT com</subscribe>
- <unsubscribe>dubbo-unsubscribe AT googlegroups DOT com</unsubscribe>
- <post>dubbo AT googlegroups DOT com</post>
- <archive>http://groups.google.com/group/dubbo</archive>
- </mailingList>
- </mailingLists>
- <developers>
- <developer>
- <name>QianXiao(Shawn)</name>
- <id>shawn.qianx</id>
- <email>shawn.qianx (AT) alibaba-inc.com</email>
- <roles>
- <role>Developer</role>
- </roles>
- <timezone>+8</timezone>
- </developer>
- <developer>
- <name>LiangFei(William)</name>
- <id>william.liangf</id>
- <email>william.liangf (AT) alibaba-inc.com</email>
- <roles>
- <role>Developer</role>
- </roles>
- <timezone>+8</timezone>
- </developer>
- <developer>
- <name>LiDing(Jerry)</name>
- <id>ding.lid</id>
- <email>ding.lid (AT) alibaba-inc.com</email>
- <roles>
- <role>Developer</role>
- </roles>
- <timezone>+8</timezone>
- </developer>
- <developer>
- <name>LiuChao(Charles)</name>
- <id>chao.liuc</id>
- <email>chao.liuc (AT) alibaba-inc.com</email>
- <roles>
- <role>Developer</role>
- </roles>
- <timezone>+8</timezone>
- </developer>
- <developer>
- <name>LiuHaoMin(Ludvik)</name>
- <id>haoming.liuhm</id>
- <email>haoming.liuhm (AT) alibaba-inc.com</email>
- <roles>
- <role>Developer</role>
- </roles>
- <timezone>+8</timezone>
- </developer>
- <developer>
- <name>ChenLei(Tony)</name>
- <id>tony.chenl</id>
- <email>tony.chenl (AT) alibaba-inc.com</email>
- <roles>
- <role>Developer</role>
- </roles>
- <timezone>+8</timezone>
- </developer>
- <developer>
- <name>LvGang(Kimi)</name>
- <id>gang.lvg</id>
- <email>gang.lvg (AT) alibaba-inc.com</email>
- <roles>
- <role>Developer</role>
- </roles>
- <timezone>+8</timezone>
- </developer>
- <developer>
- <name>WuXiaoFei(Teaey)</name>
- <id>xiaofei.wxf</id>
- <email>xiaofei.wxf (AT) alibaba-inc.com</email>
- <roles>
- <role>Developer</role>
- </roles>
- <timezone>+8</timezone>
- </developer>
- </developers>
-</project>
diff --git a/start_dubbo_service.sh b/start_dubbo_service.sh
index 0d7ea11..6b2c49a 100755
--- a/start_dubbo_service.sh
+++ b/start_dubbo_service.sh
@@ -25,4 +25,4 @@ mvn clean package
# start zookeeper cluster
docker-compose up &
# start java dubbo service
-java -jar ./target/dubbo-demo-provider-2.6.3-jar-with-dependencies.jar
+java -jar ./target/dubbo-demo-provider-2.7.4.1-jar-with-dependencies.jar