Mercurial > hg > release > thermostat-1.0

changeset 371:c2ec27cdd1ec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Implement very basic heap dumper. Reviewed-by: omajid Review-thread: http://icedtea.classpath.org/pipermail/thermostat/2012-June/001776.html PR 1032
author Roman Kennke <rkennke@redhat.com>
date Wed, 13 Jun 2012 16:24:36 +0200
parents 912f1f0e5e09
children 456596ecdc23
files agent/pom.xml common/pom.xml
diffstat 2 files changed, 0 insertions(+), 64 deletions(-) [+]
line wrap: on
line diff
--- a/agent/pom.xml	Wed Jun 13 16:17:42 2012 +0200
+++ b/agent/pom.xml	Wed Jun 13 16:24:36 2012 +0200
@@ -58,37 +58,9 @@
     </dependency>
   </dependencies>
 
-<<<<<<< local
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.felix</groupId>
-        <artifactId>maven-bundle-plugin</artifactId>
-        <extensions>true</extensions>
-        <configuration>
-          <instructions>
-            <Bundle-Vendor>Red Hat, Inc.</Bundle-Vendor>
-            <Bundle-Activator>com.redhat.thermostat.agent.Activator</Bundle-Activator>
-            <Export-Package>
-              com.redhat.thermostat.agent,
-              com.redhat.thermostat.backend,
-            </Export-Package>
-            <Private-Package>
-              com.redhat.thermostat,
-              com.redhat.thermostat.agent.config,
-              com.redhat.thermostat.backend.sample,
-              com.redhat.thermostat.backend.system,
-            </Private-Package>
-          </instructions>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-=======
   <modules>
     <module>core</module>
     <module>command</module>
   </modules>
->>>>>>> other
 
 </project>
--- a/common/pom.xml	Wed Jun 13 16:17:42 2012 +0200
+++ b/common/pom.xml	Wed Jun 13 16:24:36 2012 +0200
@@ -49,42 +49,6 @@
   <packaging>pom</packaging>
 
   <name>Thermostat Common</name>
-<<<<<<< local
-  <url>${project.parent.url}</url>
-
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.felix</groupId>
-        <artifactId>maven-bundle-plugin</artifactId>
-        <extensions>true</extensions>
-        <configuration>
-          <instructions>
-            <Bundle-Vendor>Red Hat, Inc.</Bundle-Vendor>
-            <Bundle-Activator>com.redhat.thermostat.common.Activator</Bundle-Activator>
-            <Export-Package>
-              com.redhat.thermostat.common.cli,
-              com.redhat.thermostat.common.tools,
-              com.redhat.thermostat.common,
-              com.redhat.thermostat.common.appctx,
-              com.redhat.thermostat.common.config,
-              com.redhat.thermostat.common.dao,
-              com.redhat.thermostat.common.model,
-              com.redhat.thermostat.common.storage,
-              com.redhat.thermostat.common.utils,
-            </Export-Package>
-            <Private-Package>
-              com.redhat.thermostat.test,
-              com.redhat.thermostat.tools,
-            </Private-Package>
-          </instructions>
-        </configuration>
-      </plugin>
-    </plugins>
-
-  </build>
-=======
->>>>>>> other
 
   <dependencies>
     <dependency>