Skip to content
Permalink
Browse files
升级版本号为 0.3.0-SNAPSHOT (#684)
  • Loading branch information
KeRan213539 committed Jan 27, 2021
1 parent 3ce54f9 commit 382f414c5b772bf8046fc58c703a27d4dc7f4c1f
Show file tree
Hide file tree
Showing 8 changed files with 48 additions and 15 deletions.
@@ -6,6 +6,7 @@ target/
*.zip
*.tar
*.tar.gz
.flattened-pom.xml

# eclipse ignore
.settings/
@@ -22,6 +22,6 @@ RUN mvn --batch-mode clean package -Dmaven.test.skip=true
FROM openjdk:8-jre
LABEL maintainer="dev@dubbo.apache.org"
RUN apt-get update && apt-get install -y tini
COPY --from=0 /source/dubbo-admin-snapshot/dubbo-admin-distribution/target/dubbo-admin-0.2.0-SNAPSHOT.jar /app.jar
COPY --from=0 /source/dubbo-admin-snapshot/dubbo-admin-distribution/target/dubbo-admin-0.3.0-SNAPSHOT.jar /app.jar
ENTRYPOINT ["tini","--","java","-XX:+UnlockExperimentalVMOptions","-XX:+UseCGroupMemoryLimitForHeap","-Djava.security.egd=file:/dev/./urandom","-jar","/app.jar"]
EXPOSE 8080
@@ -21,21 +21,21 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>dubbo-admin</artifactId>
<groupId>org.apache</groupId>
<version>0.2.0-SNAPSHOT</version>
<groupId>org.apache.dubbo</groupId>
<version>${revision}</version>
</parent>
<modelVersion>4.0.0</modelVersion>

<artifactId>dubbo-admin-distribution</artifactId>

<dependencies>
<dependency>
<groupId>org.apache</groupId>
<groupId>org.apache.dubbo</groupId>
<artifactId>dubbo-admin-ui</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache</groupId>
<groupId>org.apache.dubbo</groupId>
<artifactId>dubbo-admin-server</artifactId>
<version>${project.version}</version>
</dependency>
@@ -21,8 +21,8 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>dubbo-admin</artifactId>
<groupId>org.apache</groupId>
<version>0.2.0-SNAPSHOT</version>
<groupId>org.apache.dubbo</groupId>
<version>${revision}</version>
</parent>
<modelVersion>4.0.0</modelVersion>

@@ -21,8 +21,8 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>dubbo-admin</artifactId>
<groupId>org.apache</groupId>
<version>0.2.0-SNAPSHOT</version>
<groupId>org.apache.dubbo</groupId>
<version>${revision}</version>
</parent>
<modelVersion>4.0.0</modelVersion>

@@ -1,6 +1,6 @@
{
"name": "dubbo-admin-ui",
"version": "0.2.0-SNAPSHOT",
"version": "0.3.0-SNAPSHOT",
"description": "dubbo-admin-ui",
"author": "apache dubbo",
"private": true,
@@ -21,8 +21,8 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>dubbo-admin</artifactId>
<groupId>org.apache</groupId>
<version>0.2.0-SNAPSHOT</version>
<groupId>org.apache.dubbo</groupId>
<version>${revision}</version>
</parent>
<modelVersion>4.0.0</modelVersion>

38 pom.xml
@@ -18,8 +18,9 @@
<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>

<groupId>org.apache.dubbo</groupId>
<artifactId>dubbo-admin</artifactId>
<version>0.2.0-SNAPSHOT</version>
<version>${revision}</version>
<modules>
<module>dubbo-admin-ui</module>
<module>dubbo-admin-server</module>
@@ -52,17 +53,18 @@
</repositories>

<properties>
<revision>0.3.0-SNAPSHOT</revision>
<main.basedir>${project.basedir}</main.basedir>
<commons-lang3-version>3.7</commons-lang3-version>
<dubbo-version>2.7.7</dubbo-version>
<dubbo-version>2.7.8</dubbo-version>
<curator-version>2.12.0</curator-version>
<curator-test-version>4.1.0</curator-test-version>
<fastjson-version>1.2.67</fastjson-version>
<springfox-swagger-version>2.9.2</springfox-swagger-version>
<netty-version>4.1.42.Final</netty-version>
<jacoco-version>0.8.2</jacoco-version>
<jedis-version>2.9.0</jedis-version>
<apollo-version>1.2.0</apollo-version>
<apollo-version>1.2.0</apollo-version>
<consul-version>1.4.2</consul-version>
<consul-embedded-version>2.0.0</consul-embedded-version>
<nacos-version>1.0.0</nacos-version>
@@ -71,6 +73,8 @@
<maven-checkstyle-plugin-version>3.0.0</maven-checkstyle-plugin-version>
<spring-boot-version>2.1.4.RELEASE</spring-boot-version>
<maven_compiler_version>3.6.0</maven_compiler_version>
<maven-flatten-version>1.1.0</maven-flatten-version>

<java_source_version>1.8</java_source_version>
<java_target_version>1.8</java_target_version>
<file_encoding>UTF-8</file_encoding>
@@ -288,6 +292,34 @@

<build>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>flatten-maven-plugin</artifactId>
<version>${maven-flatten-version}</version>
<configuration>
<updatePomFile>true</updatePomFile>
<flattenMode>resolveCiFriendliesOnly</flattenMode>
<pomElements>
<dependencies>expand</dependencies>
</pomElements>
</configuration>
<executions>
<execution>
<id>flatten</id>
<phase>process-resources</phase>
<goals>
<goal>flatten</goal>
</goals>
</execution>
<execution>
<id>flatten.clean</id>
<phase>clean</phase>
<goals>
<goal>clean</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>

0 comments on commit 382f414

Please sign in to comment.