Mercurial > hg > release > thermostat-0.9
changeset 1075:be3470750169
Eclipse target platform definition
This commit provides a target definition file that enables Eclipse client
developers to install all required dependencies into their workspace in
a single click.
This commit adds a feature for all of our bundle-wrapped test
dependencies. This is necessary to include the corresponding p2
repository in our target definition file as a software source. This
feature required some changes to our Makefile, since Tycho was unable to
resolve the feature as is. Now the Makefile builds all pom-first
dependencies first, so core Thermostat and our bundle-wrapped deps. Then
all manifest-first modules are built in a single reactor, this includes
the p2 repositories.
Another small fix I've added is a eclipse-root property to the various
Eclipse POM files. I had noticed that different nesting depths caused
projects not to be able to find our p2 repositories that are referenced
using a relative path. This commit also removes the previous
Fedora-specific target definition file, which should be obsoleted by
this new general-purpose one. I have renamed the native location for the
Keyring wrapper lib from linux_x86-64 to linux_x86_64. Eclipse's
${target.arch} variable produces x86_64, which will make it easier for
documentation going forward.
Reviewed-by: jerboaa
Review-thread: http://icedtea.classpath.org/pipermail/thermostat/2013-April/006357.html
PR1387
line wrap: on
line diff
--- a/Makefile Fri Mar 22 16:18:06 2013 -0400 +++ b/Makefile Thu Apr 25 11:28:32 2013 -0400 @@ -36,12 +36,12 @@ copy-core-natives: core-install if [ "_$(ARCH)" = "_x86_64" ]; then \ - cp keyring/target/libGnomeKeyringWrapper.so eclipse/com.redhat.thermostat.client.feature/linux_x86-64; \ + cp keyring/target/libGnomeKeyringWrapper.so eclipse/com.redhat.thermostat.client.feature/linux_x86_64; \ else \ cp keyring/target/libGnomeKeyringWrapper.so eclipse/com.redhat.thermostat.client.feature/linux_x86; \ fi -eclipse-test: eclipse eclipse-test-p2 +eclipse-test: eclipse ifeq ($(USE_VNC),true) $(VNC) $(VNC_DISPLAY) $(VNC_FLAGS) endif @@ -54,16 +54,10 @@ eclipse-test-deps: copy-core-natives $(MAVEN) -f eclipse/test-deps-bundle-wrapping/pom.xml $(MAVEN_FLAGS) $(REPO_FLAG) $(MAVEN_SKIP_TEST) clean install -eclipse-test-p2: eclipse-test-deps - $(MAVEN) -f eclipse/test-deps-p2-repository/pom.xml $(MAVEN_FLAGS) $(REPO_FLAG) $(MAVEN_SKIP_TEST) clean $(GOAL) - jfreechart-deps: copy-core-natives $(MAVEN) -f eclipse/jfreechart-bundle-wrapping/pom.xml $(MAVEN_FLAGS) $(REPO_FLAG) $(MAVEN_SKIP_TEST) clean install -jfreechart-p2: jfreechart-deps - $(MAVEN) -f eclipse/jfreechart-p2-repository/pom.xml $(MAVEN_FLAGS) $(REPO_FLAG) $(MAVEN_SKIP_TEST) clean $(GOAL) - -eclipse: jfreechart-p2 +eclipse: jfreechart-deps eclipse-test-deps $(MAVEN) -f eclipse/pom.xml $(MAVEN_FLAGS) $(REPO_FLAG) $(MAVEN_SKIP_TEST) clean $(GOAL) create-repo-dir:
--- a/eclipse/com.redhat.thermostat.client.feature/build.properties Fri Mar 22 16:18:06 2013 -0400 +++ b/eclipse/com.redhat.thermostat.client.feature/build.properties Thu Apr 25 11:28:32 2013 -0400 @@ -1,4 +1,4 @@ bin.includes = feature.xml forceContextQualifier = SNAPSHOT root.linux.gtk.x86=linux_x86 -root.linux.gtk.x86_64=linux_x86-64 +root.linux.gtk.x86_64=linux_x86_64
--- a/eclipse/com.redhat.thermostat.client.feature/linux_x86-64/.empty Fri Mar 22 16:18:06 2013 -0400 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -File in order to trick hg into tracking the parent folder.
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/eclipse/com.redhat.thermostat.client.feature/linux_x86_64/.empty Thu Apr 25 11:28:32 2013 -0400 @@ -0,0 +1,1 @@ +File in order to trick hg into tracking the parent folder.
--- a/eclipse/com.redhat.thermostat.client.feature/pom.xml Fri Mar 22 16:18:06 2013 -0400 +++ b/eclipse/com.redhat.thermostat.client.feature/pom.xml Thu Apr 25 11:28:32 2013 -0400 @@ -13,6 +13,10 @@ <name>Thermostat Client Feature</name> + <properties> + <eclipse-root>${basedir}/..</eclipse-root> + </properties> + <dependencies> <dependency> <groupId>com.redhat.thermostat</groupId>
--- a/eclipse/com.redhat.thermostat.eclipse.boot/pom.xml Fri Mar 22 16:18:06 2013 -0400 +++ b/eclipse/com.redhat.thermostat.eclipse.boot/pom.xml Thu Apr 25 11:28:32 2013 -0400 @@ -14,6 +14,10 @@ <name>Thermostat Eclipse Client Boot Package</name> + <properties> + <eclipse-root>${basedir}/..</eclipse-root> + </properties> + <build> <!-- workaround for https://issues.sonatype.org/browse/TYCHO-168 --> <resources>
--- a/eclipse/com.redhat.thermostat.eclipse.chart.common/META-INF/MANIFEST.MF Fri Mar 22 16:18:06 2013 -0400 +++ b/eclipse/com.redhat.thermostat.eclipse.chart.common/META-INF/MANIFEST.MF Thu Apr 25 11:28:32 2013 -0400 @@ -40,5 +40,5 @@ Bundle-ActivationPolicy: lazy Require-Bundle: org.eclipse.ui, org.eclipse.core.runtime;bundle-version="3.8.0", - com.redhat.thermostat.eclipse;bundle-version="0.6.999" + com.redhat.thermostat.eclipse;bundle-version="0.8.0" Export-Package: com.redhat.thermostat.eclipse.chart.common
--- a/eclipse/com.redhat.thermostat.eclipse.chart.common/pom.xml Fri Mar 22 16:18:06 2013 -0400 +++ b/eclipse/com.redhat.thermostat.eclipse.chart.common/pom.xml Thu Apr 25 11:28:32 2013 -0400 @@ -14,6 +14,10 @@ <name>Thermostat Eclipse Charting</name> + <properties> + <eclipse-root>${basedir}/..</eclipse-root> + </properties> + <dependencies> <dependency> <groupId>com.redhat.thermostat.eclipse.parent</groupId>
--- a/eclipse/com.redhat.thermostat.eclipse.chart.vmclassstat/pom.xml Fri Mar 22 16:18:06 2013 -0400 +++ b/eclipse/com.redhat.thermostat.eclipse.chart.vmclassstat/pom.xml Thu Apr 25 11:28:32 2013 -0400 @@ -14,6 +14,10 @@ <name>Thermostat Eclipse VmClassStat Plug-in</name> + <properties> + <eclipse-root>${basedir}/..</eclipse-root> + </properties> + <dependencies> <dependency> <groupId>com.redhat.thermostat.eclipse.parent</groupId>
--- a/eclipse/com.redhat.thermostat.eclipse.feature/pom.xml Fri Mar 22 16:18:06 2013 -0400 +++ b/eclipse/com.redhat.thermostat.eclipse.feature/pom.xml Thu Apr 25 11:28:32 2013 -0400 @@ -13,6 +13,10 @@ <name>Thermostat Eclipse Feature</name> + <properties> + <eclipse-root>${basedir}/..</eclipse-root> + </properties> + <dependencies> <dependency> <groupId>com.redhat.thermostat.eclipse.parent</groupId>
--- a/eclipse/com.redhat.thermostat.eclipse.p2-repo/pom.xml Fri Mar 22 16:18:06 2013 -0400 +++ b/eclipse/com.redhat.thermostat.eclipse.p2-repo/pom.xml Thu Apr 25 11:28:32 2013 -0400 @@ -13,6 +13,10 @@ <name>Thermostat Eclipse p2 Repository</name> + <properties> + <eclipse-root>${basedir}/..</eclipse-root> + </properties> + <dependencies> <dependency> <groupId>com.redhat.thermostat.eclipse.parent</groupId>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/eclipse/com.redhat.thermostat.eclipse.target_platform/pom.xml Thu Apr 25 11:28:32 2013 -0400 @@ -0,0 +1,47 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <modelVersion>4.0.0</modelVersion> + <parent> + <artifactId>thermostat-eclipse-parent</artifactId> + <groupId>com.redhat.thermostat.eclipse.parent</groupId> + <version>0.8.0-SNAPSHOT</version> + </parent> + <groupId>com.redhat.thermostat.eclipse.parent</groupId> + <artifactId>com.redhat.thermostat.eclipse.target_platform</artifactId> + <version>0.8.0-SNAPSHOT</version> + <packaging>pom</packaging> + + <name>Thermostat Eclipse Target Platform</name> + + <properties> + <eclipse-root>${basedir}/..</eclipse-root> + </properties> + + <build> + <plugins> + <plugin> + <artifactId>maven-resources-plugin</artifactId> + <version>2.6</version> + <executions> + <execution> + <id>copy-resources</id> + <phase>package</phase> + <goals> + <goal>copy-resources</goal> + </goals> + <configuration> + <outputDirectory>${basedir}/target</outputDirectory> + <resources> + <resource> + <directory>src/main/resources</directory> + <filtering>true</filtering> + </resource> + </resources> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> +</project>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/eclipse/com.redhat.thermostat.eclipse.target_platform/src/main/resources/thermostat-juno.target Thu Apr 25 11:28:32 2013 -0400 @@ -0,0 +1,22 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<?pde version="3.8"?><target name="Thermostat Eclipse" sequenceNumber="29"> +<locations> +<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit"> +<unit id="org.eclipse.platform.sdk" version="4.2.2.M20130204-1200"/> +<repository location="http://download.eclipse.org/releases/juno"/> +</location> +<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit"> +<unit id="com.redhat.thermostat.client.feature.feature.group" version="0.8.0.SNAPSHOT"/> +<repository location="file:${eclipse-root}/composite-repo/target/composite-repo/"/> +</location> +<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit"> +<unit id="com.redhat.thermostat.eclipse.test.deps.feature.feature.group" version="0.8.0.SNAPSHOT"/> +<repository location="file:${eclipse-root}/test-deps-p2-repository/target/repository/"/> +</location> +<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit"> +<unit id="org.eclipse.swtbot.eclipse.feature.group" version="2.1.0.201302221524"/> +<unit id="org.eclipse.swtbot.feature.group" version="2.1.0.201302221524"/> +<repository location="http://download.eclipse.org/technology/swtbot/releases/latest/"/> +</location> +</locations> +</target>
--- a/eclipse/com.redhat.thermostat.eclipse.target_platform/thermostat_fedora.target Fri Mar 22 16:18:06 2013 -0400 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,11 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<?pde version="3.8"?><target name="Thermostat Eclipse (Fedora)" sequenceNumber="8"> -<locations> -<location path="/usr/share/java/hamcrest" type="Directory"/> -<location path="/usr/share/java" type="Directory"/> -<location path="${eclipse_home}/plugins" type="Profile"/> -<location path="/usr/share/java/objectweb-asm" type="Directory"/> -<location path="/usr/share/java/jfreechart" type="Directory"/> -</locations> -<targetJRE path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/> -</target>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/eclipse/com.redhat.thermostat.eclipse.test.deps.feature/.project Thu Apr 25 11:28:32 2013 -0400 @@ -0,0 +1,17 @@ +<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>com.redhat.thermostat.eclipse.test.deps.feature</name> + <comment></comment> + <projects> + </projects> + <buildSpec> + <buildCommand> + <name>org.eclipse.pde.FeatureBuilder</name> + <arguments> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.FeatureNature</nature> + </natures> +</projectDescription>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/eclipse/com.redhat.thermostat.eclipse.test.deps.feature/build.properties Thu Apr 25 11:28:32 2013 -0400 @@ -0,0 +1,2 @@ +bin.includes = feature.xml +forceContextQualifier = SNAPSHOT
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/eclipse/com.redhat.thermostat.eclipse.test.deps.feature/feature.xml Thu Apr 25 11:28:32 2013 -0400 @@ -0,0 +1,80 @@ +<?xml version="1.0" encoding="UTF-8"?> +<feature + id="com.redhat.thermostat.eclipse.test.deps.feature" + label="Thermostat Eclipse Test Dependencies" + version="0.8.0.qualifier" + provider-name="Red Hat Inc."> + + <description url="http://icedtea.classpath.org/thermostat"> + Plug-ins necessary to run the Thermostat Eclipse client tests. + </description> + + <copyright url="http://icedtea.classpath.org/thermostat"> + Copyright 2012, 2013 Red Hat, Inc. + </copyright> + + <license url="http://www.gnu.org/licenses/"> + Copyright 2012, 2013 Red Hat, Inc. + +This file is part of Thermostat. + +Thermostat is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published +by the Free Software Foundation; either version 2, or (at your +option) any later version. + +Thermostat is distributed in the hope that it will be useful, but +WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +General Public License for more details. + +You should have received a copy of the GNU General Public License +along with Thermostat; see the file COPYING. If not see +<http://www.gnu.org/licenses/>. + +Linking this code with other modules is making a combined work +based on this code. Thus, the terms and conditions of the GNU +General Public License cover the whole combination. + +As a special exception, the copyright holders of this code give +you permission to link this code with independent modules to +produce an executable, regardless of the license terms of these +independent modules, and to copy and distribute the resulting +executable under terms of your choice, provided that you also +meet, for each linked independent module, the terms and conditions +of the license of that module. An independent module is a module +which is not derived from or based on this code. If you modify +this code, you may extend this exception to your version of the +library, but you are not obligated to do so. If you do not wish +to do so, delete this exception statement from your version. + </license> + + <requires> + <import plugin="org.eclipse.orbit.mongodb" version="2.7.3" match="greaterOrEqual"/> + <import plugin="org.eclipse.osgi"/> + <import plugin="org.apache.commons.beanutils" version="1.8.0" match="greaterOrEqual"/> + <import plugin="org.apache.commons.cli" version="1.2.0" match="greaterOrEqual"/> + </requires> + + <plugin + id="com.redhat.thermostat.bundles.org.hamcrest.core" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + + <plugin + id="com.redhat.thermostat.bundles.org.mockito.mockito-core" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + + <plugin + id="com.redhat.thermostat.bundles.org.objenesis" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + +</feature>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/eclipse/com.redhat.thermostat.eclipse.test.deps.feature/pom.xml Thu Apr 25 11:28:32 2013 -0400 @@ -0,0 +1,77 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <modelVersion>4.0.0</modelVersion> + <parent> + <artifactId>thermostat-eclipse-parent</artifactId> + <groupId>com.redhat.thermostat.eclipse.parent</groupId> + <version>0.8.0-SNAPSHOT</version> + </parent> + <groupId>com.redhat.thermostat.eclipse.parent</groupId> + <artifactId>com.redhat.thermostat.eclipse.test.deps.feature</artifactId> + <packaging>eclipse-feature</packaging> + <version>0.8.0-SNAPSHOT</version> + + <name>Thermostat Eclipse Test Dependencies Feature</name> + + <properties> + <eclipse-root>${basedir}/..</eclipse-root> + </properties> + + <repositories> + <repository> + <id>local_client</id> + <layout>p2</layout> + <url>file://${eclipse-root}/core-p2-repository/target/repository/</url> + </repository> + <repository> + <id>local_eclipse</id> + <layout>p2</layout> + <url>file://${eclipse-root}/com.redhat.thermostat.eclipse.p2-repo/target/repository/</url> + </repository> + </repositories> + + <dependencies> + <dependency> + <groupId>org.hamcrest</groupId> + <artifactId>com.redhat.thermostat.bundles.org.hamcrest.core</artifactId> + <version>1.3</version> + </dependency> + <dependency> + <groupId>org.mockito</groupId> + <artifactId>com.redhat.thermostat.bundles.org.mockito.mockito-core</artifactId> + <version>1.9.0</version> + </dependency> + <dependency> + <groupId>org.objenesis</groupId> + <artifactId>com.redhat.thermostat.bundles.org.objenesis</artifactId> + <version>1.0</version> + </dependency> + </dependencies> + + <build> + <!-- workaround for https://issues.sonatype.org/browse/TYCHO-168 --> + <resources> + <resource> + <directory>src</directory> + <excludes> + <exclude>**/*.java</exclude> + </excludes> + </resource> + </resources> + <plugins> + <plugin> + <groupId>org.eclipse.tycho</groupId> + <artifactId>tycho-source-plugin</artifactId> + </plugin> + <plugin> + <groupId>org.eclipse.tycho</groupId> + <artifactId>tycho-packaging-plugin</artifactId> + <version>${tycho-version}</version> + <configuration> + <deployableFeature>true</deployableFeature> + </configuration> + </plugin> + </plugins> + </build> +</project>
--- a/eclipse/com.redhat.thermostat.eclipse.test.ui/META-INF/MANIFEST.MF Fri Mar 22 16:18:06 2013 -0400 +++ b/eclipse/com.redhat.thermostat.eclipse.test.ui/META-INF/MANIFEST.MF Thu Apr 25 11:28:32 2013 -0400 @@ -8,7 +8,8 @@ Require-Bundle: org.eclipse.ui, org.eclipse.core.runtime, org.junit;bundle-version="4.10.0", - org.hamcrest;bundle-version="1.1.0" + com.redhat.thermostat.bundles.org.hamcrest.core;resolution:=optional, + org.hamcrest;resolution:=optional Import-Package: com.redhat.thermostat.client.core.views, com.redhat.thermostat.client.ui, com.redhat.thermostat.common,
--- a/eclipse/com.redhat.thermostat.eclipse.test.ui/pom.xml Fri Mar 22 16:18:06 2013 -0400 +++ b/eclipse/com.redhat.thermostat.eclipse.test.ui/pom.xml Thu Apr 25 11:28:32 2013 -0400 @@ -14,26 +14,30 @@ <name>Thermostat Eclipse Client UI Tests</name> + <properties> + <eclipse-root>${basedir}/..</eclipse-root> + </properties> + <repositories> <repository> <id>swtbot</id> <layout>p2</layout> - <url>http://download.eclipse.org/technology/swtbot/helios/dev-build/update-site</url> + <url>http://download.eclipse.org/technology/swtbot/releases/latest/</url> </repository> <repository> <id>local_client</id> <layout>p2</layout> - <url>file://${basedir}/../core-p2-repository/target/repository/</url> + <url>file://${eclipse-root}/core-p2-repository/target/repository/</url> </repository> <repository> <id>local_eclipse</id> <layout>p2</layout> - <url>file://${basedir}/../com.redhat.thermostat.eclipse.p2-repo/target/repository/</url> + <url>file://${eclipse-root}/com.redhat.thermostat.eclipse.p2-repo/target/repository/</url> </repository> <repository> <id>local_eclipse_test_deps</id> <layout>p2</layout> - <url>file://${basedir}/../test-deps-p2-repository/target/repository/</url> + <url>file://${eclipse-root}/test-deps-p2-repository/target/repository/</url> </repository> </repositories> @@ -57,12 +61,17 @@ <dependency> <type>p2-installable-unit</type> <artifactId>com.redhat.thermostat.client.feature.feature.group</artifactId> - <version>0.6.999</version> + <version>0.8.0</version> </dependency> <dependency> <type>p2-installable-unit</type> <artifactId>com.redhat.thermostat.eclipse.feature.feature.group</artifactId> - <version>0.6.999</version> + <version>0.8.0</version> + </dependency> + <dependency> + <type>p2-installable-unit</type> + <artifactId>com.redhat.thermostat.eclipse.test.deps.feature.feature.group</artifactId> + <version>0.8.0</version> </dependency> </dependencies> <bundleStartLevel>
--- a/eclipse/com.redhat.thermostat.eclipse.test/pom.xml Fri Mar 22 16:18:06 2013 -0400 +++ b/eclipse/com.redhat.thermostat.eclipse.test/pom.xml Thu Apr 25 11:28:32 2013 -0400 @@ -14,21 +14,25 @@ <name>Thermostat Eclipse Client Tests</name> + <properties> + <eclipse-root>${basedir}/..</eclipse-root> + </properties> + <repositories> <repository> <id>local_client</id> <layout>p2</layout> - <url>file://${basedir}/../core-p2-repository/target/repository/</url> + <url>file://${eclipse-root}/core-p2-repository/target/repository/</url> </repository> <repository> <id>local_eclipse</id> <layout>p2</layout> - <url>file://${basedir}/../com.redhat.thermostat.eclipse.p2-repo/target/repository/</url> + <url>file://${eclipse-root}/com.redhat.thermostat.eclipse.p2-repo/target/repository/</url> </repository> <repository> <id>local_eclipse_test_deps</id> <layout>p2</layout> - <url>file://${basedir}/../test-deps-p2-repository/target/repository/</url> + <url>file://${eclipse-root}/test-deps-p2-repository/target/repository/</url> </repository> </repositories> @@ -51,12 +55,17 @@ <dependency> <type>p2-installable-unit</type> <artifactId>com.redhat.thermostat.client.feature.feature.group</artifactId> - <version>0.6.999</version> + <version>0.8.0</version> </dependency> <dependency> <type>p2-installable-unit</type> <artifactId>com.redhat.thermostat.eclipse.feature.feature.group</artifactId> - <version>0.6.999</version> + <version>0.8.0</version> + </dependency> + <dependency> + <type>p2-installable-unit</type> + <artifactId>com.redhat.thermostat.eclipse.test.deps.feature.feature.group</artifactId> + <version>0.8.0</version> </dependency> </dependencies> <bundleStartLevel>
--- a/eclipse/com.redhat.thermostat.eclipse/pom.xml Fri Mar 22 16:18:06 2013 -0400 +++ b/eclipse/com.redhat.thermostat.eclipse/pom.xml Thu Apr 25 11:28:32 2013 -0400 @@ -14,6 +14,10 @@ <name>Thermostat Eclipse Client</name> + <properties> + <eclipse-root>${basedir}/..</eclipse-root> + </properties> + <dependencies> <dependency> <groupId>com.redhat.thermostat.eclipse.parent</groupId>
--- a/eclipse/composite-repo/pom.xml Fri Mar 22 16:18:06 2013 -0400 +++ b/eclipse/composite-repo/pom.xml Thu Apr 25 11:28:32 2013 -0400 @@ -50,7 +50,7 @@ <packaging>pom</packaging> <properties> - <main.basedir>${project.basedir}/..</main.basedir> + <eclipse-root>${basedir}/..</eclipse-root> </properties> <name>Thermostat Eclipse :: Composite p2 Repo</name> @@ -70,10 +70,10 @@ <mkdir dir="${project.build.directory}/composite-repo" /> <!-- Copy Thermostat Eclipse plug-ins --> - <copydir src="${main.basedir}/com.redhat.thermostat.eclipse.p2-repo/target/repository" + <copydir src="${eclipse-root}/com.redhat.thermostat.eclipse.p2-repo/target/repository" dest="${project.build.directory}/composite-repo/thermostat-eclipse" /> <!-- Copy Thermostat core bundles p2 repo --> - <copydir src="${main.basedir}/core-p2-repository/target/repository" + <copydir src="${eclipse-root}/core-p2-repository/target/repository" dest="${project.build.directory}/composite-repo/thermostat-core-p2" /> <copy file="compositeArtifacts.xml" todir="${project.build.directory}/composite-repo/" />
--- a/eclipse/core-p2-repository/pom.xml Fri Mar 22 16:18:06 2013 -0400 +++ b/eclipse/core-p2-repository/pom.xml Thu Apr 25 11:28:32 2013 -0400 @@ -13,6 +13,10 @@ <name>Thermostat Client p2 Repository</name> + <properties> + <eclipse-root>${basedir}/..</eclipse-root> + </properties> + <dependencies> <dependency> <groupId>com.redhat.thermostat.eclipse.parent</groupId>
--- a/eclipse/jfreechart-bundle-wrapping/org.jfree.chart/pom.xml Fri Mar 22 16:18:06 2013 -0400 +++ b/eclipse/jfreechart-bundle-wrapping/org.jfree.chart/pom.xml Thu Apr 25 11:28:32 2013 -0400 @@ -59,6 +59,7 @@ <pkgGroupId>org.jfree</pkgGroupId> <pkgArtifactId>jfreechart</pkgArtifactId> <pkgVersion>1.0.14</pkgVersion> + <eclipse-root>${basedir}/../..</eclipse-root> </properties> <dependencies>
--- a/eclipse/jfreechart-bundle-wrapping/org.jfree/pom.xml Fri Mar 22 16:18:06 2013 -0400 +++ b/eclipse/jfreechart-bundle-wrapping/org.jfree/pom.xml Thu Apr 25 11:28:32 2013 -0400 @@ -59,6 +59,7 @@ <pkgGroupId>org.jfree</pkgGroupId> <pkgArtifactId>jcommon</pkgArtifactId> <pkgVersion>1.0.17</pkgVersion> + <eclipse-root>${basedir}/../..</eclipse-root> </properties> <dependencies>
--- a/eclipse/jfreechart-p2-repository/pom.xml Fri Mar 22 16:18:06 2013 -0400 +++ b/eclipse/jfreechart-p2-repository/pom.xml Thu Apr 25 11:28:32 2013 -0400 @@ -50,6 +50,10 @@ <name>Thermostat Eclipse :: p2 repository for JFreeChart</name> + <properties> + <eclipse-root>${basedir}/..</eclipse-root> + </properties> + <build> <plugins> <!-- Configuration for the PublishFeaturesAndBundlesMojoTest -->
--- a/eclipse/pom.xml Fri Mar 22 16:18:06 2013 -0400 +++ b/eclipse/pom.xml Thu Apr 25 11:28:32 2013 -0400 @@ -56,6 +56,7 @@ <platform-version-name>juno</platform-version-name> <eclipse-site>http://download.eclipse.org/releases/${platform-version-name}</eclipse-site> <orbit-site>http://download.eclipse.org/tools/orbit/downloads/drops/R20120526062928/repository/</orbit-site> + <eclipse-root>${basedir}</eclipse-root> </properties> <profiles> @@ -95,8 +96,12 @@ <module>com.redhat.thermostat.eclipse.chart.vmclassstat</module> <module>com.redhat.thermostat.client.feature</module> <module>com.redhat.thermostat.eclipse.feature</module> + <module>com.redhat.thermostat.eclipse.test.deps.feature</module> + <module>com.redhat.thermostat.eclipse.target_platform</module> <module>com.redhat.thermostat.eclipse.p2-repo</module> <module>core-p2-repository</module> + <module>test-deps-p2-repository</module> + <module>jfreechart-p2-repository</module> <module>composite-repo</module> </modules> @@ -114,7 +119,7 @@ <repository> <id>local_jfreechart</id> <layout>p2</layout> - <url>file://${basedir}/../jfreechart-p2-repository/target/repository/</url> + <url>file://${eclipse-root}/jfreechart-p2-repository/target/repository/</url> </repository> <repository> <id>maven.eclipse.org</id>
--- a/eclipse/test-deps-bundle-wrapping/org.hamcrest/pom.xml Fri Mar 22 16:18:06 2013 -0400 +++ b/eclipse/test-deps-bundle-wrapping/org.hamcrest/pom.xml Thu Apr 25 11:28:32 2013 -0400 @@ -59,6 +59,7 @@ <pkgGroupId>org.hamcrest</pkgGroupId> <pkgArtifactId>hamcrest-core</pkgArtifactId> <pkgVersion>1.3</pkgVersion> + <eclipse-root>${basedir}/../..</eclipse-root> </properties> <dependencies>
--- a/eclipse/test-deps-bundle-wrapping/org.mockito/pom.xml Fri Mar 22 16:18:06 2013 -0400 +++ b/eclipse/test-deps-bundle-wrapping/org.mockito/pom.xml Thu Apr 25 11:28:32 2013 -0400 @@ -59,6 +59,7 @@ <pkgGroupId>org.mockito</pkgGroupId> <pkgArtifactId>mockito-core</pkgArtifactId> <pkgVersion>1.9.0</pkgVersion> + <eclipse-root>${basedir}/../..</eclipse-root> </properties> <dependencies>
--- a/eclipse/test-deps-bundle-wrapping/org.objenesis/pom.xml Fri Mar 22 16:18:06 2013 -0400 +++ b/eclipse/test-deps-bundle-wrapping/org.objenesis/pom.xml Thu Apr 25 11:28:32 2013 -0400 @@ -59,6 +59,7 @@ <pkgGroupId>org.objenesis</pkgGroupId> <pkgArtifactId>objenesis</pkgArtifactId> <pkgVersion>1.0</pkgVersion> + <eclipse-root>${basedir}/../..</eclipse-root> </properties> <dependencies>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/eclipse/test-deps-p2-repository/category.xml Thu Apr 25 11:28:32 2013 -0400 @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="UTF-8"?> +<site> + <feature url="features/com.redhat.thermostat.eclipse.test.deps.feature_0.8.0.qualifier.jar" id="com.redhat.thermostat.eclipse.test.deps.feature" version="0.8.0.qualifier"> + <category name="thermostat-eclipse-test-deps"/> + </feature> + <category-def name="thermostat-eclipse-test-deps" label="Thermostat Eclipse Test Dependencies"/> +</site>
--- a/eclipse/test-deps-p2-repository/pom.xml Fri Mar 22 16:18:06 2013 -0400 +++ b/eclipse/test-deps-p2-repository/pom.xml Thu Apr 25 11:28:32 2013 -0400 @@ -47,63 +47,34 @@ <groupId>com.redhat.thermostat.eclipse.parent</groupId> <artifactId>com.redhat.thermostat.eclipse.test-deps-repo</artifactId> <version>0.8.0-SNAPSHOT</version> + <packaging>eclipse-repository</packaging> <name>Thermostat Eclipse :: p2 repository for plain Java test deps</name> + <properties> + <eclipse-root>${basedir}/..</eclipse-root> + </properties> + + <dependencies> + <dependency> + <groupId>com.redhat.thermostat.eclipse.parent</groupId> + <artifactId>com.redhat.thermostat.eclipse.test.deps.feature</artifactId> + <version>0.8.0-SNAPSHOT</version> + <type>eclipse-feature</type> + </dependency> + </dependencies> + <build> <plugins> - <!-- Configuration for the PublishFeaturesAndBundlesMojoTest --> <plugin> - <groupId>org.eclipse.tycho.extras</groupId> - <artifactId>tycho-p2-extras-plugin</artifactId> + <groupId>org.eclipse.tycho</groupId> + <artifactId>tycho-p2-publisher-plugin</artifactId> <version>${tycho-version}</version> - <executions> - <execution> - <phase>prepare-package</phase> - <goals> - <goal>publish-features-and-bundles</goal> - </goals> - </execution> - </executions> <configuration> - <compress>true</compress> + <publishArtifacts>true</publishArtifacts> </configuration> </plugin> - <plugin> - <artifactId>maven-dependency-plugin</artifactId> - <executions> - <execution> - <id>copy-bundles-for-publishing</id> - <phase>process-resources</phase> - <goals> - <goal>copy</goal> - </goals> - <configuration> - <artifactItems> - <artifactItem> - <groupId>org.hamcrest</groupId> - <artifactId>com.redhat.thermostat.bundles.org.hamcrest.core</artifactId> - <version>1.3</version> - </artifactItem> - <artifactItem> - <groupId>org.mockito</groupId> - <artifactId>com.redhat.thermostat.bundles.org.mockito.mockito-core</artifactId> - <version>1.9.0</version> - </artifactItem> - <artifactItem> - <groupId>org.objenesis</groupId> - <artifactId>com.redhat.thermostat.bundles.org.objenesis</artifactId> - <version>1.0</version> - </artifactItem> - </artifactItems> - <outputDirectory>${project.basedir}/target/source/plugins</outputDirectory> - </configuration> - </execution> - </executions> - </plugin> </plugins> </build> - - <packaging>pom</packaging> </project>