Mercurial > hg > release > thermostat-0.7
changeset 730:8b73b939568c
Fix Thermostat-Eclipse build.
The build was failing since a few bundles in core were renamed and/or got
shuffelled around. In addition the default make target did not clean the local
repo of all thermostat bits before the build. So I've changed the "all" target
to "clean-repo" before building things. This should avoid not seing build
failures locally and have builds fail after push.
Reviewed-by: neugens
Review-thread: http://icedtea.classpath.org/pipermail/thermostat/2012-October/003885.html
| author | Severin Gehwolf <sgehwolf@redhat.com> |
|---|---|
| date | Wed, 24 Oct 2012 11:11:06 +0200 |
| parents | e80304692688 |
| children | 153988c559a8 |
| files | Makefile eclipse/core-p2-repository/pom.xml |
| diffstat | 2 files changed, 158 insertions(+), 137 deletions(-) [+] |
line wrap: on
line diff
--- a/Makefile Tue Oct 23 18:07:05 2012 +0200 +++ b/Makefile Wed Oct 24 11:11:06 2012 +0200 @@ -14,7 +14,10 @@ MAVEN_SKIP_TEST = -Dmaven.test.skip=true endif -all: eclipse +# Default to cleaning the local repo and building core + eclipse +# Cleaning the repo prevents things like not seeing build failures +# after bundles have been renamed. +all: clean-repo eclipse core: $(MAVEN) -f $(POM) $(MAVEN_FLAGS) $(MAVEN_SKIP_TEST) clean $(GOAL)
--- a/eclipse/core-p2-repository/pom.xml Tue Oct 23 18:07:05 2012 +0200 +++ b/eclipse/core-p2-repository/pom.xml Wed Oct 24 11:11:06 2012 +0200 @@ -76,144 +76,11 @@ <id>copy-bundles-for-publishing</id> <phase>process-resources</phase> <goals> - <goal>copy</goal> + <goal>copy-dependencies</goal> </goals> <configuration> - <artifactItems> - <artifactItem> - <groupId>com.redhat.thermostat</groupId> - <artifactId>thermostat-main</artifactId> - <version>${project.version}</version> - </artifactItem> - <artifactItem> - <groupId>com.redhat.thermostat</groupId> - <artifactId>thermostat-bundles</artifactId> - <version>${project.version}</version> - </artifactItem> - <artifactItem> - <groupId>com.redhat.thermostat</groupId> - <artifactId>thermostat-tools</artifactId> - <version>${project.version}</version> - </artifactItem> - <artifactItem> - <groupId>com.redhat.thermostat</groupId> - <artifactId>thermostat-launcher</artifactId> - <version>${project.version}</version> - </artifactItem> - <artifactItem> - <groupId>com.redhat.thermostat</groupId> - <artifactId>thermostat-client-core</artifactId> - <version>${project.version}</version> - </artifactItem> - <artifactItem> - <groupId>com.redhat.thermostat</groupId> - <artifactId>thermostat-client-command</artifactId> - <version>${project.version}</version> - </artifactItem> - <artifactItem> - <groupId>com.redhat.thermostat</groupId> - <artifactId>thermostat-client-vmclassstat</artifactId> - <version>${project.version}</version> - </artifactItem> - <artifactItem> - <groupId>com.redhat.thermostat</groupId> - <artifactId>thermostat-osgi-memory-stats-panel</artifactId> - <version>${project.version}</version> - </artifactItem> - <artifactItem> - <groupId>com.redhat.thermostat</groupId> - <artifactId>thermostat-osgi-living-vm-filter</artifactId> - <version>${project.version}</version> - </artifactItem> - <artifactItem> - <groupId>com.redhat.thermostat</groupId> - <artifactId>thermostat-agent-core</artifactId> - <version>${project.version}</version> - </artifactItem> - <artifactItem> - <groupId>com.redhat.thermostat</groupId> - <artifactId>thermostat-agent-cli</artifactId> - <version>${project.version}</version> - </artifactItem> - <artifactItem> - <groupId>com.redhat.thermostat</groupId> - <artifactId>thermostat-agent-command</artifactId> - <version>${project.version}</version> - </artifactItem> - <artifactItem> - <groupId>com.redhat.thermostat</groupId> - <artifactId>thermostat-common-core</artifactId> - <version>${project.version}</version> - </artifactItem> - <artifactItem> - <groupId>com.redhat.thermostat</groupId> - <artifactId>thermostat-common-command</artifactId> - <version>${project.version}</version> - </artifactItem> - <artifactItem> - <groupId>com.redhat.thermostat</groupId> - <artifactId>thermostat-osgi-process-handler</artifactId> - <version>${project.version}</version> - </artifactItem> - <artifactItem> - <groupId>com.redhat.thermostat</groupId> - <artifactId>thermostat-killvm-client-swing</artifactId> - <version>${project.version}</version> - </artifactItem> - <artifactItem> - <groupId>com.redhat.thermostat</groupId> - <artifactId>thermostat-client-heapdumper</artifactId> - <version>${project.version}</version> - </artifactItem> - <artifactItem> - <groupId>com.redhat.thermostat</groupId> - <artifactId>thermostat-laf</artifactId> - <version>${project.version}</version> - </artifactItem> - <artifactItem> - <groupId>com.redhat.thermostat</groupId> - <artifactId>thermostat-keyring</artifactId> - <version>${project.version}</version> - </artifactItem> - - <!-- thread plugin --> - <artifactItem> - <groupId>com.redhat.thermostat</groupId> - <artifactId>thermostat-thread-client-common</artifactId> - <version>${project.version}</version> - </artifactItem> - <artifactItem> - <groupId>com.redhat.thermostat</groupId> - <artifactId>thermostat-thread-client-controllers</artifactId> - <version>${project.version}</version> - </artifactItem> - <artifactItem> - <groupId>com.redhat.thermostat</groupId> - <artifactId>thermostat-thread-client-swing</artifactId> - <version>${project.version}</version> - </artifactItem> - <artifactItem> - <groupId>com.redhat.thermostat</groupId> - <artifactId>thermostat-thread-collector</artifactId> - <version>${project.version}</version> - </artifactItem> - <!-- Web bundles --> - <artifactItem> - <groupId>com.redhat.thermostat</groupId> - <artifactId>thermostat-web-client</artifactId> - <version>${project.version}</version> - </artifactItem> - <artifactItem> - <groupId>com.redhat.thermostat</groupId> - <artifactId>thermostat-web-common</artifactId> - <version>${project.version}</version> - </artifactItem> - <artifactItem> - <groupId>com.redhat.thermostat</groupId> - <artifactId>thermostat-web-server</artifactId> - <version>${project.version}</version> - </artifactItem> - </artifactItems> + <excludeTransitive>false</excludeTransitive> + <includeGroupIds>com.redhat.thermostat</includeGroupIds> <outputDirectory>${project.basedir}/target/source/plugins</outputDirectory> </configuration> </execution> @@ -223,4 +90,155 @@ </build> <packaging>pom</packaging> + + <dependencies> + <dependency> + <groupId>com.redhat.thermostat</groupId> + <artifactId>thermostat-main</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>com.redhat.thermostat</groupId> + <artifactId>thermostat-bundles</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>com.redhat.thermostat</groupId> + <artifactId>thermostat-tools</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>com.redhat.thermostat</groupId> + <artifactId>thermostat-launcher</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>com.redhat.thermostat</groupId> + <artifactId>thermostat-client-swing</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>com.redhat.thermostat</groupId> + <artifactId>thermostat-client-command</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>com.redhat.thermostat</groupId> + <artifactId>thermostat-client-vmclassstat-swing</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>com.redhat.thermostat</groupId> + <artifactId>thermostat-osgi-memory-stats-panel-swing</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>com.redhat.thermostat</groupId> + <artifactId>thermostat-osgi-living-vm-filter-swing</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>com.redhat.thermostat</groupId> + <artifactId>thermostat-agent-core</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>com.redhat.thermostat</groupId> + <artifactId>thermostat-agent-cli</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>com.redhat.thermostat</groupId> + <artifactId>thermostat-agent-command</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>com.redhat.thermostat</groupId> + <artifactId>thermostat-agent-heapdumper</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>com.redhat.thermostat</groupId> + <artifactId>thermostat-killvm-agent</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>com.redhat.thermostat</groupId> + <artifactId>thermostat-killvm-client-swing</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>com.redhat.thermostat</groupId> + <artifactId>thermostat-common-core</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>com.redhat.thermostat</groupId> + <artifactId>thermostat-common-command</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>com.redhat.thermostat</groupId> + <artifactId>thermostat-osgi-process-handler</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>com.redhat.thermostat</groupId> + <artifactId>thermostat-client-heapdumper-swing</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>com.redhat.thermostat</groupId> + <artifactId>thermostat-laf</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>com.redhat.thermostat</groupId> + <artifactId>thermostat-keyring</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>com.redhat.thermostat</groupId> + <artifactId>thermostat-web-client</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>com.redhat.thermostat</groupId> + <artifactId>thermostat-web-server</artifactId> + <version>${project.version}</version> + </dependency> + + <!-- thread plugin --> + <dependency> + <groupId>com.redhat.thermostat</groupId> + <artifactId>thermostat-thread-client-common</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>com.redhat.thermostat</groupId> + <artifactId>thermostat-thread-client-controllers</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>com.redhat.thermostat</groupId> + <artifactId>thermostat-thread-client-swing</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>com.redhat.thermostat</groupId> + <artifactId>thermostat-thread-collector</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>com.redhat.thermostat</groupId> + <artifactId>thermostat-thread-harvester</artifactId> + <version>${project.version}</version> + </dependency> + + <dependency> + <groupId>com.redhat.thermostat</groupId> + <artifactId>thermostat-system-backend</artifactId> + <version>${project.version}</version> + </dependency> + </dependencies> </project>