[41060] trunk/hudson/dtkit/dtkit-default/junit-output: FIx Java7 and Upgrade to latest versions

Mon, 30 Dec 2013 13:55:45 -0800

Title: [41060] trunk/hudson/dtkit/dtkit-default/junit-output: FIx Java7 and Upgrade to latest versions
Revision
41060
Author
gbois
Date
2013-12-30 16:55:19 -0500 (Mon, 30 Dec 2013)

Log Message

FIx Java7 and Upgrade to latest versions

Modified Paths

Diff

Modified: trunk/hudson/dtkit/dtkit-default/junit-output/dtkit-default-junit/pom.xml (41059 => 41060)


--- trunk/hudson/dtkit/dtkit-default/junit-output/dtkit-default-junit/pom.xml	2013-12-30 21:53:15 UTC (rev 41059)
+++ trunk/hudson/dtkit/dtkit-default/junit-output/dtkit-default-junit/pom.xml	2013-12-30 21:55:19 UTC (rev 41060)
@@ -1,4 +1,5 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
@@ -19,11 +20,6 @@
 
         <dependency>
             <groupId>com.thalesgroup.dtkit</groupId>
-            <artifactId>dtkit-tusar-model</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>com.thalesgroup.dtkit</groupId>
             <artifactId>dtkit-processor</artifactId>
         </dependency>
     </dependencies>

Modified: trunk/hudson/dtkit/dtkit-default/junit-output/dtkit-default-junit-jenkins/pom.xml (41059 => 41060)


--- trunk/hudson/dtkit/dtkit-default/junit-output/dtkit-default-junit-jenkins/pom.xml	2013-12-30 21:53:15 UTC (rev 41059)
+++ trunk/hudson/dtkit/dtkit-default/junit-output/dtkit-default-junit-jenkins/pom.xml	2013-12-30 21:55:19 UTC (rev 41060)
@@ -1,4 +1,5 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
@@ -37,4 +38,24 @@
 
     </dependencies>
 
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.kohsuke.stapler</groupId>
+                <artifactId>maven-stapler-plugin</artifactId>
+                <version>1.7</version>
+                <dependencies>
+                    <dependency>
+                        <groupId>com.sun</groupId>
+                        <artifactId>tools</artifactId>
+                        <version>1.7</version>
+                        <scope>system</scope>
+                        <systemPath>/Library/Java/JavaVirtualMachines/jdk1.7.0_45.jdk/Contents/Home/lib/tools.jar
+                        </systemPath>
+                    </dependency>
+                </dependencies>
+            </plugin>
+        </plugins>
+    </build>
+
 </project>

Modified: trunk/hudson/dtkit/dtkit-default/junit-output/pom.xml (41059 => 41060)


--- trunk/hudson/dtkit/dtkit-default/junit-output/pom.xml	2013-12-30 21:53:15 UTC (rev 41059)
+++ trunk/hudson/dtkit/dtkit-default/junit-output/pom.xml	2013-12-30 21:55:19 UTC (rev 41060)
@@ -1,10 +1,11 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
         <groupId>org.jenkins-ci.lib.dtkit</groupId>
         <artifactId>dtkit-metrics-default-parent</artifactId>
-        <version>21</version>
+        <version>24</version>
     </parent>
 
     <groupId>org.jenkins-ci.lib.dtkit</groupId>
@@ -34,7 +35,6 @@
     </developers>
 
     <modules>
-        <!-- Generic DTKIT modules containing default set of metrics -->
         <module>dtkit-default-junit</module>
         <module>dtkit-default-junit-jenkins</module>
     </modules>
@@ -47,6 +47,14 @@
         <dependencies>
 
             <dependency>
+                <groupId>JDK7</groupId>
+                <artifactId>tools</artifactId>
+                <version>1.7</version>
+                <scope>system</scope>
+                <systemPath>/Library/Java/JavaVirtualMachines/jdk1.7.0_45.jdk/Contents/Home/lib/tools.jar</systemPath>
+            </dependency>
+
+            <dependency>
                 <groupId>org.jenkins-ci.lib.dtkit</groupId>
                 <artifactId>dtkit-default-junit</artifactId>
                 <version>${project.version}</version>
@@ -66,8 +74,8 @@
         <connection>scm:svn:https://svn.jenkins-ci.org/trunk/hudson/dtkit/dtkit-default/junit-output</connection>
         <developerConnection>scm:svn:https://svn.jenkins-ci.org/trunk/hudson/dtkit/dtkit-default/junit-output
         </developerConnection>
-    <url>https://github.com/jenkinsci/pom/dtkit-metrics-parent/tags/dtkit-metrics-default-parent-21/dtkit-default-junit-parent</url>
-  </scm>
+        <url>https://github.com/jenkinsci/pom/dtkit-metrics-parent/tags/dtkit-metrics-default-parent-21/dtkit-default-junit-parent</url>
+    </scm>
 
     <build>
         <plugins>

--
You received this message because you are subscribed to the Google Groups "Jenkins Commits" group.
To unsubscribe from this group and stop receiving emails from it, send an email to jenkinsci-commits+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/groups/opt_out.

Reply via email to