Browse Source

fixed compilation error related to the deploy-docker;

tags/1.4.0^2
huanghaiquan 3 years ago
parent
commit
69effd094b
3 changed files with 7 additions and 10 deletions
  1. +5
    -4
      deploy/docker/docker-demo/pom.xml
  2. +1
    -1
      deploy/docker/docker-sdk/pom.xml
  3. +1
    -5
      deploy/docker/pom.xml

+ 5
- 4
deploy/docker/docker-demo/pom.xml View File

@@ -5,7 +5,7 @@
<parent> <parent>
<artifactId>docker</artifactId> <artifactId>docker</artifactId>
<groupId>com.jd.blockchain</groupId> <groupId>com.jd.blockchain</groupId>
<version>1.3.0.RELEASE</version>
<version>1.4.0.RELEASE</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<artifactId>docker-demo</artifactId> <artifactId>docker-demo</artifactId>
@@ -24,7 +24,6 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId> <artifactId>maven-compiler-plugin</artifactId>
<version>3.8.1</version>
<configuration> <configuration>
<source>1.8</source> <source>1.8</source>
<target>1.8</target> <target>1.8</target>
@@ -123,9 +122,11 @@
<configuration> <configuration>


<imageName>jdchain-demo</imageName> <imageName>jdchain-demo</imageName>
<imageTags>${docker.tag}</imageTags>
<imageTags>
<imageTag>${project.version}</imageTag>
</imageTags>
<!-- 指定 Dockerfile 路径--> <!-- 指定 Dockerfile 路径-->
<dockerDirectory>${project.basedir}/src/main/docker</dockerDirectory>
<dockerDirectory>${project.basedir}/src/main/target</dockerDirectory>
</configuration> </configuration>
</plugin> </plugin>
</plugins> </plugins>


+ 1
- 1
deploy/docker/docker-sdk/pom.xml View File

@@ -5,7 +5,7 @@
<parent> <parent>
<artifactId>docker</artifactId> <artifactId>docker</artifactId>
<groupId>com.jd.blockchain</groupId> <groupId>com.jd.blockchain</groupId>
<version>1.3.0.RELEASE</version>
<version>1.4.0.RELEASE</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>




+ 1
- 5
deploy/docker/pom.xml View File

@@ -5,17 +5,13 @@
<parent> <parent>
<artifactId>deploy-root</artifactId> <artifactId>deploy-root</artifactId>
<groupId>com.jd.blockchain</groupId> <groupId>com.jd.blockchain</groupId>
<version>1.4.0-SNAPSHOT</version>
<version>1.4.0.RELEASE</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<version>1.3.0.RELEASE</version>
<packaging>pom</packaging> <packaging>pom</packaging>


<artifactId>docker</artifactId> <artifactId>docker</artifactId>


<properties>
<docker.tag>1.3.0</docker.tag>
</properties>


<modules> <modules>
<module>docker-sdk</module> <module>docker-sdk</module>


Loading…
Cancel
Save