Skip to content
This repository has been archived by the owner on Oct 30, 2020. It is now read-only.

Make release 2.5.0 #69

Merged
merged 1 commit into from
Aug 25, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
root = true

[**]
[*]
charset = utf-8
end_of_line = lf
indent_size = 4
Expand All @@ -9,5 +9,5 @@ insert_final_newline = true
trim_trailing_whitespace = true
tab_width = 4

[{*.yaml,*.yml}]
[{*.yaml, *.yml}]
indent_size = 2
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

<groupId>com.dkanejs.maven.plugins</groupId>
<artifactId>docker-compose-maven-plugin</artifactId>
<version>2.4.1-SNAPSHOT</version>
<version>2.5.0</version>

<packaging>maven-plugin</packaging>

Expand Down
60 changes: 30 additions & 30 deletions src/it/build/pom.xml
Original file line number Diff line number Diff line change
@@ -1,38 +1,38 @@
<?xml version="1.0" encoding="UTF-8"?>
<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/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<modelVersion>4.0.0</modelVersion>

<groupId>com.dkanejs.maven.plugins.it</groupId>
<artifactId>build</artifactId>
<version>1.0</version>
<groupId>com.dkanejs.maven.plugins.it</groupId>
<artifactId>build</artifactId>
<version>1.0</version>

<description>Verify "docker-compose build" runs.</description>
<description>Verify "docker-compose build" runs.</description>

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>

<build>
<plugins>
<plugin>
<groupId>@project.groupId@</groupId>
<artifactId>@project.artifactId@</artifactId>
<version>@project.version@</version>
<executions>
<execution>
<id>build</id>
<phase>verify</phase>
<goals>
<goal>build</goal>
</goals>
<configuration>
<composeFile>${project.basedir}/docker-compose.yml</composeFile>
<detachedMode>false</detachedMode>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
<build>
<plugins>
<plugin>
<groupId>@project.groupId@</groupId>
<artifactId>@project.artifactId@</artifactId>
<version>@project.version@</version>
<executions>
<execution>
<id>build</id>
<phase>verify</phase>
<goals>
<goal>build</goal>
</goals>
<configuration>
<composeFile>${project.basedir}/docker-compose.yml</composeFile>
<detachedMode>false</detachedMode>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>
Original file line number Diff line number Diff line change
Expand Up @@ -260,8 +260,8 @@ enum Command {
UP("up"),
DOWN("down"),
PULL("pull"),
BUILD("build"),
PUSH("push");
PUSH("push"),
BUILD("build");

@SuppressWarnings("unused")
private String value;
Expand Down