Skip to content

Commit

Permalink
Merge pull request #18 from qdaxb/update_pom_dependency
Browse files Browse the repository at this point in the history
update pom dependency
  • Loading branch information
half-dead committed Apr 26, 2016
2 parents bba2361 + 54e378f commit 959bdab
Show file tree
Hide file tree
Showing 6 changed files with 80 additions and 54 deletions.
5 changes: 0 additions & 5 deletions motan-core/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -31,27 +31,22 @@
<dependency>
<groupId>commons-pool</groupId>
<artifactId>commons-pool</artifactId>
<version>1.6</version>
</dependency>
<dependency>
<groupId>com.caucho</groupId>
<artifactId>hessian</artifactId>
<version>4.0.38</version>
</dependency>
<dependency>
<groupId>com.alibaba</groupId>
<artifactId>fastjson</artifactId>
<version>1.1.30</version>
</dependency>
<dependency>
<groupId>com.codahale.metrics</groupId>
<artifactId>metrics-core</artifactId>
<version>3.0.1</version>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>18.0</version>
</dependency>
</dependencies>
</project>
2 changes: 1 addition & 1 deletion motan-demo/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-web</artifactId>
<version>4.2.4.RELEASE</version>
<version>${spring-framework.version}</version>
</dependency>


Expand Down
1 change: 0 additions & 1 deletion motan-manager/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@
<packaging>war</packaging>
<name>motan-manager</name>
<properties>
<spring-framework.version>4.2.4.RELEASE</spring-framework.version>
<spring-security.version>4.0.3.RELEASE</spring-security.version>
</properties>
<dependencies>
Expand Down
49 changes: 25 additions & 24 deletions motan-registry-consul/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -15,28 +15,29 @@
~ limitations under the License.
-->

<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>com.weibo</groupId>
<artifactId>motan</artifactId>
<version>0.0.2-SNAPSHOT</version>
</parent>
<artifactId>motan-registry-consul</artifactId>
<name>motan-registry-consul</name>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
<dependencies>
<dependency>
<groupId>com.weibo</groupId>
<artifactId>motan-core</artifactId>
<version>${project.parent.version}</version>
</dependency>
<dependency>
<groupId>com.ecwid.consul</groupId>
<artifactId>consul-api</artifactId>
<version>1.1.4</version>
</dependency>
</dependencies>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>com.weibo</groupId>
<artifactId>motan</artifactId>
<version>0.0.2-SNAPSHOT</version>
</parent>
<artifactId>motan-registry-consul</artifactId>
<name>motan-registry-consul</name>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
<dependencies>
<dependency>
<groupId>com.weibo</groupId>
<artifactId>motan-core</artifactId>
<version>${project.parent.version}</version>
</dependency>
<dependency>
<groupId>com.ecwid.consul</groupId>
<artifactId>consul-api</artifactId>
<version>1.1.4</version>
</dependency>
</dependencies>
</project>
45 changes: 23 additions & 22 deletions motan-springsupport/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -15,27 +15,28 @@
~ limitations under the License.
-->

<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>motan</artifactId>
<groupId>com.weibo</groupId>
<version>0.0.2-SNAPSHOT</version>
</parent>
<artifactId>motan-springsupport</artifactId>
<name>motan-springsupport</name>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>motan</artifactId>
<groupId>com.weibo</groupId>
<version>0.0.2-SNAPSHOT</version>
</parent>
<artifactId>motan-springsupport</artifactId>
<name>motan-springsupport</name>

<dependencies>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-web</artifactId>
<version>3.2.3.RELEASE</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.weibo</groupId>
<artifactId>motan-core</artifactId>
<version>${project.parent.version}</version>
</dependency>
</dependencies>
<dependencies>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
<version>${spring-framework.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.weibo</groupId>
<artifactId>motan-core</artifactId>
<version>${project.parent.version}</version>
</dependency>
</dependencies>
</project>
32 changes: 31 additions & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -35,13 +35,43 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<java.source.jdk>1.6</java.source.jdk>
<spring.version>4.2.4.RELEASE</spring.version>
<spring-framework.version>4.2.4.RELEASE</spring-framework.version>
</properties>

<name>Motan</name>
<description>A remote procedure call(RPC) framework for rapid development of high performance distributed services.</description>
<url>https://github.com/weibocom/motan</url>

<dependencyManagement>
<dependencies>
<dependency>
<groupId>commons-pool</groupId>
<artifactId>commons-pool</artifactId>
<version>1.6</version>
</dependency>
<dependency>
<groupId>com.caucho</groupId>
<artifactId>hessian</artifactId>
<version>4.0.38</version>
</dependency>
<dependency>
<groupId>com.alibaba</groupId>
<artifactId>fastjson</artifactId>
<version>1.1.30</version>
</dependency>
<dependency>
<groupId>com.codahale.metrics</groupId>
<artifactId>metrics-core</artifactId>
<version>3.0.1</version>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>18.0</version>
</dependency>
</dependencies>
</dependencyManagement>

<dependencies>
<dependency>
<groupId>org.slf4j</groupId>
Expand Down

0 comments on commit 959bdab

Please sign in to comment.