moved the tools.jar propertes into the root pom so we can share ${too…

…lsJar} across maven modules - and added it as a system dependency on hawtio-embedded so that the local JVM mbean works
hawtio · Jul 12, 2013 · ba8dffa · ba8dffa
1 parent e544476
commit ba8dffa
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 24 deletions.
diff --git a/hawtio-embedded/pom.xml b/hawtio-embedded/pom.xml
@@ -22,6 +22,14 @@
       <version>${jetty-version}</version>
     </dependency>
 
+    <dependency>
+      <groupId>com.sun</groupId>
+      <artifactId>tools</artifactId>
+      <version>1.6</version>
+      <scope>system</scope>
+      <systemPath>${toolsjar}</systemPath>
+    </dependency>
+
     <!-- logging -->
     <dependency>
       <groupId>org.slf4j</groupId>

diff --git a/hawtio-local-jvm-mbean/pom.xml b/hawtio-local-jvm-mbean/pom.xml
@@ -101,29 +101,5 @@
   </build>
 
   <profiles>
-    <profile>
-      <id>default-profile</id>
-      <activation>
-        <activeByDefault>true</activeByDefault>
-        <file>
-          <exists>${java.home}/../lib/tools.jar</exists>
-        </file>
-      </activation>
-      <properties>
-        <toolsjar>${java.home}/../lib/tools.jar</toolsjar>
-      </properties>
-    </profile>
-    <profile>
-      <id>mac-profile</id>
-      <activation>
-        <activeByDefault>false</activeByDefault>
-        <file>
-          <exists>${java.home}/../Classes/classes.jar</exists>
-        </file>
-      </activation>
-      <properties>
-        <toolsjar>${java.home}/../Classes/classes.jar</toolsjar>
-      </properties>
-    </profile>
   </profiles>
 </project>
diff --git a/pom.xml b/pom.xml
@@ -465,5 +465,32 @@
           ...
       -->
     </profile>
+
+
+    <!-- dealing with tools.jar for hawtio-local-jvm-mbean -->
+    <profile>
+      <id>default-profile</id>
+      <activation>
+        <activeByDefault>true</activeByDefault>
+        <file>
+          <exists>${java.home}/../lib/tools.jar</exists>
+        </file>
+      </activation>
+      <properties>
+        <toolsjar>${java.home}/../lib/tools.jar</toolsjar>
+      </properties>
+    </profile>
+    <profile>
+      <id>mac-profile</id>
+      <activation>
+        <activeByDefault>false</activeByDefault>
+        <file>
+          <exists>${java.home}/../Classes/classes.jar</exists>
+        </file>
+      </activation>
+      <properties>
+        <toolsjar>${java.home}/../Classes/classes.jar</toolsjar>
+      </properties>
+    </profile>
   </profiles>
 </project>