Skip to content

Commit

Permalink
Merge pull request #662 from chonton/fix-samples
Browse files Browse the repository at this point in the history
PR merged! Thanks!
  • Loading branch information
fusesource-ci authored Dec 18, 2016
2 parents ecf482e + 0a6e423 commit 67fa15b
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion samples/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
<url>http://www.jolokia.org</url>

<properties>
<docker.maven.plugin.version>0.17-SNAPSHOT</docker.maven.plugin.version>
<docker.maven.plugin.version>0.18-SNAPSHOT</docker.maven.plugin.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
</properties>
Expand Down
4 changes: 2 additions & 2 deletions src/main/resources/META-INF/plexus/components.xml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<process-test-resources>org.apache.maven.plugins:maven-resources-plugin:testResources</process-test-resources>
<test-compile>org.apache.maven.plugins:maven-compiler-plugin:testCompile</test-compile>
<test>org.apache.maven.plugins:maven-surefire-plugin:test</test>
<package>org.apache.maven.plugins:maven-jar-plugin:jar,${project.groupId}:${project.artifactId}:build</package>
<package>org.apache.maven.plugins:maven-jar-plugin:jar,${project.groupId}:${project.artifactId}:build-nofork</package>
<pre-integration-test>${project.groupId}:${project.artifactId}:start</pre-integration-test>
<integration-test>org.apache.maven.plugins:maven-failsafe-plugin:integration-test</integration-test>
<verify>${project.groupId}:${project.artifactId}:stop,org.apache.maven.plugins:maven-failsafe-plugin:verify</verify>
Expand All @@ -44,7 +44,7 @@
<process-test-resources>org.apache.maven.plugins:maven-resources-plugin:testResources</process-test-resources>
<test-compile>org.apache.maven.plugins:maven-compiler-plugin:testCompile</test-compile>
<test>org.apache.maven.plugins:maven-surefire-plugin:test</test>
<package>org.apache.maven.plugins:maven-jar-plugin:jar,${project.groupId}:${project.artifactId}:build</package>
<package>org.apache.maven.plugins:maven-jar-plugin:jar,${project.groupId}:${project.artifactId}:build-nofork</package>
<deploy>${project.groupId}:${project.artifactId}:push</deploy>
</phases>
</lifecycle>
Expand Down

0 comments on commit 67fa15b

Please sign in to comment.