You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@deltaspike.apache.org by st...@apache.org on 2012/07/06 10:27:14 UTC

git commit: DELTASPIKE-220 upgrade plugins and fix version management

Updated Branches:
  refs/heads/master 768710791 -> 60a60f30f


DELTASPIKE-220 upgrade plugins and fix version management


Project: http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/commit/60a60f30
Tree: http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/tree/60a60f30
Diff: http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/diff/60a60f30

Branch: refs/heads/master
Commit: 60a60f30fe29db1766c38830ed4cafa2577f10ac
Parents: 7687107
Author: Mark Struberg <st...@apache.org>
Authored: Fri Jul 6 10:26:28 2012 +0200
Committer: Mark Struberg <st...@apache.org>
Committed: Fri Jul 6 10:26:28 2012 +0200

----------------------------------------------------------------------
 deltaspike/core/integration-test/pom.xml |   11 -----------
 deltaspike/parent/code/pom.xml           |    1 -
 deltaspike/parent/it/pom.xml             |   11 +++++++++++
 deltaspike/parent/pom.xml                |    4 ++--
 deltaspike/pom.xml                       |    1 +
 5 files changed, 14 insertions(+), 14 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/60a60f30/deltaspike/core/integration-test/pom.xml
----------------------------------------------------------------------
diff --git a/deltaspike/core/integration-test/pom.xml b/deltaspike/core/integration-test/pom.xml
index 464bb6c..a002784 100644
--- a/deltaspike/core/integration-test/pom.xml
+++ b/deltaspike/core/integration-test/pom.xml
@@ -68,17 +68,6 @@
         <pluginManagement>
             <plugins>
                 <plugin>
-                    <artifactId>maven-jar-plugin</artifactId>
-                    <version>2.2</version>
-                    <configuration>
-                        <archive>
-                            <manifest>
-                                <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
-                            </manifest>
-                        </archive>
-                    </configuration>
-                </plugin>
-                <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-surefire-plugin</artifactId>
                     <version>${maven.surefire.plugin.version}</version>

http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/60a60f30/deltaspike/parent/code/pom.xml
----------------------------------------------------------------------
diff --git a/deltaspike/parent/code/pom.xml b/deltaspike/parent/code/pom.xml
index 466f3ed..6c9533d 100644
--- a/deltaspike/parent/code/pom.xml
+++ b/deltaspike/parent/code/pom.xml
@@ -71,7 +71,6 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-jar-plugin</artifactId>
-                <version>2.3.2</version>
                 <executions>
                     <execution>
                         <goals>

http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/60a60f30/deltaspike/parent/it/pom.xml
----------------------------------------------------------------------
diff --git a/deltaspike/parent/it/pom.xml b/deltaspike/parent/it/pom.xml
index 39d94a7..0d26c0a 100644
--- a/deltaspike/parent/it/pom.xml
+++ b/deltaspike/parent/it/pom.xml
@@ -334,6 +334,17 @@
             <build>
                 <plugins>
                     <plugin>
+                        <artifactId>maven-jar-plugin</artifactId>
+                        <configuration>
+                            <archive>
+                                <manifest>
+                                    <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+                                </manifest>
+                            </archive>
+                        </configuration>
+                    </plugin>
+
+                    <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-surefire-plugin</artifactId>
                         <version>${maven.surefire.plugin.version}</version>

http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/60a60f30/deltaspike/parent/pom.xml
----------------------------------------------------------------------
diff --git a/deltaspike/parent/pom.xml b/deltaspike/parent/pom.xml
index e6bc5a5..556d6fc 100644
--- a/deltaspike/parent/pom.xml
+++ b/deltaspike/parent/pom.xml
@@ -144,11 +144,11 @@
         <mojarra1.version>1.2_14</mojarra1.version>
 
         <maven.jetty.plugin.version>7.1.5.v20100705</maven.jetty.plugin.version>
-        <maven.surefire.plugin.version>2.11</maven.surefire.plugin.version>
+        <maven.surefire.plugin.version>2.12</maven.surefire.plugin.version>
 
         <hamcrest.version>1.3.RC2</hamcrest.version>
 
-        <jacoco.version>0.5.6.201201232323</jacoco.version>
+        <jacoco.version>0.5.7.201204190339</jacoco.version>
 
         <arquillian-openwebbeans.version>1.0.0.CR2</arquillian-openwebbeans.version>
         <arquillian-weld.version>1.0.0.CR3</arquillian-weld.version>

http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/60a60f30/deltaspike/pom.xml
----------------------------------------------------------------------
diff --git a/deltaspike/pom.xml b/deltaspike/pom.xml
index 9f951ce..802ee45 100644
--- a/deltaspike/pom.xml
+++ b/deltaspike/pom.xml
@@ -90,6 +90,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-remote-resources-plugin</artifactId>
+                    <version>1.3</version>
                     <executions>
                         <execution>
                             <id>process-remote-resources</id>