You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2017/04/22 09:01:04 UTC

[1/2] camel git commit: Upgrade maven-shade-plugin

Repository: camel
Updated Branches:
  refs/heads/master 56d87de36 -> 0690550ba


Upgrade maven-shade-plugin


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/07f55fde
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/07f55fde
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/07f55fde

Branch: refs/heads/master
Commit: 07f55fde471a083bb55275041315061eede86e81
Parents: 56d87de
Author: Claus Ibsen <da...@apache.org>
Authored: Sat Apr 22 10:55:31 2017 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Sat Apr 22 10:55:31 2017 +0200

----------------------------------------------------------------------
 parent/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/07f55fde/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 2b2a52c..a11e058 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -451,7 +451,7 @@
     <maven-reporting-api-version>2.2.1</maven-reporting-api-version>
     <maven-reporting-impl-version>2.0.5</maven-reporting-impl-version>
     <maven-scr-plugin-version>1.22.0</maven-scr-plugin-version>
-    <maven-shade-plugin-version>2.4.3</maven-shade-plugin-version>
+    <maven-shade-plugin-version>3.0.0</maven-shade-plugin-version>
     <maven-surefire-report-plugin-version>2.13</maven-surefire-report-plugin-version>
     <maven-war-plugin-version>3.0.0</maven-war-plugin-version>
     <mchange-commons-java-version>0.2.11</mchange-commons-java-version>


[2/2] camel git commit: Upgrade maven-resources-plugin

Posted by da...@apache.org.
Upgrade maven-resources-plugin


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/0690550b
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/0690550b
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/0690550b

Branch: refs/heads/master
Commit: 0690550ba5369c9487bcf24410e955265a17af27
Parents: 07f55fd
Author: Claus Ibsen <da...@apache.org>
Authored: Sat Apr 22 11:00:45 2017 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Sat Apr 22 11:00:45 2017 +0200

----------------------------------------------------------------------
 parent/pom.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/0690550b/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index a11e058..01c0858 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -447,7 +447,7 @@
     <maven-plugin-plugin-version>3.4</maven-plugin-plugin-version>
     <maven-remote-resources-plugin-version>1.5</maven-remote-resources-plugin-version>
     <!-- resources plugin needed by Camel maven archetypes -->
-    <maven-resources-plugin-version>3.0.1</maven-resources-plugin-version>
+    <maven-resources-plugin-version>3.0.2</maven-resources-plugin-version>
     <maven-reporting-api-version>2.2.1</maven-reporting-api-version>
     <maven-reporting-impl-version>2.0.5</maven-reporting-impl-version>
     <maven-scr-plugin-version>1.22.0</maven-scr-plugin-version>
@@ -4633,6 +4633,7 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-resources-plugin</artifactId>
+          <version>${maven-resources-plugin-version}</version>
           <configuration>
             <encoding>UTF-8</encoding>
           </configuration>