You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shenyu.apache.org by de...@apache.org on 2021/06/18 10:55:09 UTC
[incubator-shenyu] branch master updated: [BUILD] add apache parent
pom (#1640)
This is an automated email from the ASF dual-hosted git repository.
dengliming pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-shenyu.git
The following commit(s) were added to refs/heads/master by this push:
new 47f2407 [BUILD] add apache parent pom (#1640)
47f2407 is described below
commit 47f2407c5e30c9390304f2db6d863bd2ebf82a18
Author: xiaoyu <xi...@apache.org>
AuthorDate: Fri Jun 18 18:55:03 2021 +0800
[BUILD] add apache parent pom (#1640)
* add apache parent pom
* add apache parent pom
---
pom.xml | 30 +++++++++++++++----------
shenyu-admin/pom.xml | 5 +++--
shenyu-bootstrap/pom.xml | 1 +
shenyu-plugin/shenyu-plugin-ratelimiter/pom.xml | 2 +-
4 files changed, 23 insertions(+), 15 deletions(-)
diff --git a/pom.xml b/pom.xml
index 00f22f7..41c77d7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -19,6 +19,11 @@
<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">
+ <parent>
+ <groupId>org.apache</groupId>
+ <artifactId>apache</artifactId>
+ <version>21</version>
+ </parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.shenyu</groupId>
<artifactId>shenyu</artifactId>
@@ -50,23 +55,17 @@
</license>
</licenses>
<scm>
- <url>https://github.com/dromara/shenyu.git</url>
- <connection>scm:git:https://github.com/dromara/shenyu</connection>
- <developerConnection>scm:git:git@github.com:dromara/shenyu</developerConnection>
+ <url>https://github.com/apache/incubator-shenyu.git</url>
+ <connection>scm:git:https://github.com/apache/incubator-shenyu</connection>
+ <developerConnection>scm:git:git@github.com:apache/incubator-shenyu</developerConnection>
<tag>${project.version}</tag>
</scm>
<issueManagement>
<system>GitHub Issues</system>
- <url>https://github.com/dromara/shenyu/issues</url>
+ <url>https://github.com/apache/incubator-shenyu/issues</url>
</issueManagement>
- <parent>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-parent</artifactId>
- <version>2.2.2.RELEASE</version>
- </parent>
-
<properties>
<java.version>1.8</java.version>
<hutool.version>4.0.8</hutool.version>
@@ -113,7 +112,7 @@
<maven-gpg-plugin.version>1.6</maven-gpg-plugin.version>
<maven-source-plugin.version>3.0.1</maven-source-plugin.version>
<maven-surefire-plugin.version>3.0.0-M4</maven-surefire-plugin.version>
- <maven-javadoc-plugin.version>3.3.0</maven-javadoc-plugin.version>
+ <maven-javadoc-plugin.version>2.10.3</maven-javadoc-plugin.version>
<maven-compiler-plugin.version>3.7.0</maven-compiler-plugin.version>
<maven-release-plugin.version>2.5.3</maven-release-plugin.version>
<versions-maven-plugin.version>2.5</versions-maven-plugin.version>
@@ -128,7 +127,14 @@
<dependencyManagement>
<dependencies>
-
+ <dependency>
+ <!-- Import dependency management from Spring Boot -->
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-dependencies</artifactId>
+ <version>2.2.2.RELEASE</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
<dependency>
<groupId>com.weibo</groupId>
<artifactId>motan-core</artifactId>
diff --git a/shenyu-admin/pom.xml b/shenyu-admin/pom.xml
index eb620a7..06efc57 100644
--- a/shenyu-admin/pom.xml
+++ b/shenyu-admin/pom.xml
@@ -225,7 +225,7 @@
<dependency>
<groupId>com.h2database</groupId>
<artifactId>h2</artifactId>
- <version>${h2.version}</version>
+ <version>1.4.200</version>
</dependency>
<dependency>
@@ -247,6 +247,7 @@
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
+ <version>2.2.2.RELEASE</version>
<configuration>
<mainClass>org.apache.shenyu.admin.ShenyuAdminBootstrap</mainClass>
<executable>true</executable>
@@ -263,7 +264,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
- <version>${maven-resources-plugin.version}</version>
+ <version>3.2.0</version>
<configuration>
<encoding>${project.build.sourceEncoding}</encoding>
<useDefaultDelimiters>true</useDefaultDelimiters>
diff --git a/shenyu-bootstrap/pom.xml b/shenyu-bootstrap/pom.xml
index c3613f3..fbaa1a7 100644
--- a/shenyu-bootstrap/pom.xml
+++ b/shenyu-bootstrap/pom.xml
@@ -345,6 +345,7 @@
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
+ <version>2.2.2.RELEASE</version>
<configuration>
<mainClass>org.apache.shenyu.bootstrap.ShenyuBootstrapApplication</mainClass>
<executable>true</executable>
diff --git a/shenyu-plugin/shenyu-plugin-ratelimiter/pom.xml b/shenyu-plugin/shenyu-plugin-ratelimiter/pom.xml
index baf0718..5d9eb04 100644
--- a/shenyu-plugin/shenyu-plugin-ratelimiter/pom.xml
+++ b/shenyu-plugin/shenyu-plugin-ratelimiter/pom.xml
@@ -40,7 +40,7 @@
<dependency>
<groupId>io.lettuce</groupId>
<artifactId>lettuce-core</artifactId>
- <version>${lettuce.version}</version>
+ <version>6.1.2.RELEASE</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>