Permalink
Browse files

Build with Tycho 0.13.0

Overall, Tycho 0.13.0 is stricter than the previous version.
In particular artifact ids in poms have to match the feature
and bundle ids. This required changes in a few places. For
details, see the Tycho release notes at:

http://wiki.eclipse.org/Tycho/Release_Notes/0.13
  • Loading branch information...
fsteeg committed Nov 27, 2011
1 parent c3cc915 commit 18173e93ed7c0cd397548f04c1241c479cab617f
@@ -16,7 +16,7 @@
<version>${version}-SNAPSHOT</version>
</parent>
- <artifactId>${artifactId}</artifactId>
+ <artifactId>${package}</artifactId>
<packaging>eclipse-feature</packaging>
<name>${projectName} Feature (Incubation)</name>
@@ -11,7 +11,7 @@
<version>${version}-SNAPSHOT</version>
</parent>
- <artifactId>${artifactId}</artifactId>
+ <artifactId>${bundleId}.core.tests</artifactId>
<packaging>eclipse-test-plugin</packaging>
<name>${projectName} Core Test Plug-in</name>
@@ -8,7 +8,7 @@
<version>${version}-SNAPSHOT</version>
</parent>
- <artifactId>${artifactId}</artifactId>
+ <artifactId>${bundleId}.doc</artifactId>
<packaging>eclipse-plugin</packaging>
<name>${projectName} Documentation (Incubation)</name>
@@ -15,7 +15,7 @@
<version>${version}-SNAPSHOT</version>
</parent>
- <artifactId>${artifactId}</artifactId>
+ <artifactId>${package}.source</artifactId>
<packaging>eclipse-feature</packaging>
<name>${projectName} Sources Feature</name>
@@ -7,9 +7,9 @@ Bundle-Version: ${version}.qualifier
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Require-Bundle: org.apache.log4j,
- org.eclipse.core.runtime;version="[3.4.0,4.0.0)",
- org.eclipse.core.filesystem;version="[1.1.0,2.0.0)",
- org.eclipse.core.resources;version="[3.4.0,4.0.0)",
+ org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
+ org.eclipse.core.filesystem;bundle-version="[1.1.0,2.0.0)",
+ org.eclipse.core.resources;bundle-version="[3.4.0,4.0.0)",
org.eclipse.ui;bundle-version="[3.4.0,4.0.0)",
org.hamcrest;bundle-version="[1.1.0,2.0.0)",
${bundleId}.ui,
@@ -33,5 +33,5 @@ Import-Package: org.eclipse.swt.widgets,
org.junit.runner;version="[4.3.1,5.0.0)",
org.junit.runners;version="[4.3.1,5.0.0)",
org.osgi.framework;version="[1.4.0,2.0.0)"
-Fragment-Host: ${bundleId}.ui;bundle-version="${version}"
+Fragment-Host: ${bundleId}.ui
Export-Package: ${bundleId}.ui.tests
@@ -8,7 +8,7 @@
<version>${version}-SNAPSHOT</version>
</parent>
- <artifactId>${artifactId}</artifactId>
+ <artifactId>${bundleId}.ui.tests</artifactId>
<packaging>eclipse-test-plugin</packaging>
<name>${projectName} UI Test Plug-in (Incubation)</name>
@@ -26,12 +26,12 @@
</licenses>
<properties>
- <tycho-version>0.12.0</tycho-version>
+ <tycho-version>0.13.0</tycho-version>
<platform-version-name>helios</platform-version-name>
<eclipse-site>http://download.eclipse.org/releases/${platform-version-name}</eclipse-site>
<wikitext-site>http://download.eclipse.org/tools/mylyn/update/weekly</wikitext-site>
<swtbot-site>http://download.eclipse.org/technology/swtbot/${platform-version-name}/dev-build/update-site</swtbot-site>
- <orbit-site>http://download.eclipse.org/tools/orbit/downloads/drops/S20110124210048/repository</orbit-site>
+ <orbit-site>http://download.eclipse.org/tools/orbit/downloads/drops/R20110523182458/repository</orbit-site>
</properties>
<repositories>
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<feature
- id="org.aniszczyk.minerva"
+ id="org.aniszczyk.minerva-feature"
label="%featureName"
version="1.0.0.qualifier"
provider-name="%providerName">
@@ -3,10 +3,10 @@
<description url="http://github.com/caniszczyk/minerva">
Minerva
</description>
- <feature url="features/org.aniszczyk.minerva_0.0.0.qualifier.jar" id="org.aniszczyk.minerva" version="0.0.0" patch="false">
+ <feature url="features/org.aniszczyk.minerva_0.0.0.qualifier.jar" id="org.aniszczyk.minerva-feature" version="0.0.0" patch="false">
<category name="Minerva Plug-in"/>
</feature>
- <feature url="features/org.aniszczyk.minerva.sources_0.0.0.qualifier.jar" id="org.aniszczyk.minerva.source" version="0.0.0" patch="false">
+ <feature url="features/org.aniszczyk.minerva.sources_0.0.0.qualifier.jar" id="org.aniszczyk.minerva.source-feature" version="0.0.0" patch="false">
<category name="Minerva Plug-in"/>
</feature>
<category-def name="Minerva Example" label="Minerva Example">
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<feature
- id="org.aniszczyk.minerva.source"
+ id="org.aniszczyk.minerva.source-feature"
label="%featureName"
version="1.0.0.qualifier"
provider-name="%providerName"
@@ -7,9 +7,9 @@ Bundle-Version: 1.0.0.qualifier
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Require-Bundle: org.apache.log4j,
- org.eclipse.core.runtime;version="[3.4.0,4.0.0)",
- org.eclipse.core.filesystem;version="[1.1.0,2.0.0)",
- org.eclipse.core.resources;version="[3.4.0,4.0.0)",
+ org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
+ org.eclipse.core.filesystem;bundle-version="[1.1.0,2.0.0)",
+ org.eclipse.core.resources;bundle-version="[3.4.0,4.0.0)",
org.eclipse.ui;bundle-version="[3.4.0,4.0.0)",
org.hamcrest;bundle-version="[1.1.0,2.0.0)",
org.aniszczyk.minerva.ui,
@@ -33,5 +33,5 @@ Import-Package: org.eclipse.swt.widgets,
org.junit.runner;version="[4.3.1,5.0.0)",
org.junit.runners;version="[4.3.1,5.0.0)",
org.osgi.framework;version="[1.4.0,2.0.0)"
-Fragment-Host: org.aniszczyk.minerva.ui;bundle-version="1.0.0"
+Fragment-Host: org.aniszczyk.minerva.ui
Export-Package: org.aniszczyk.minerva.ui.tests
@@ -25,7 +25,7 @@
<name>Minerva UI Test Plug-in (Incubation)</name>
<properties>
- <local-p2-site>file:/${basedir}/../org.aniszczyk.minerva-updatesite/target/site</local-p2-site>
+ <local-p2-site>file:/${basedir}/../org.aniszczyk.minerva-repository/target/repository</local-p2-site>
<ui.test.vmargs.all>-Xmx512m -XX:MaxPermSize=256m</ui.test.vmargs.all>
<ui.test.vmargs.mac>-XstartOnFirstThread</ui.test.vmargs.mac>
<ui.test.vmargs>${ui.test.vmargs.all}</ui.test.vmargs>
@@ -84,17 +84,17 @@
<artifactId>org.eclipse.pde.feature.group</artifactId>
<version>${platform-version}</version>
</dependency>
- <dependency> -->
- <type>p2-installable-unit</type>
- <artifactId>org.aniszczyk.minerva.feature.group</artifactId>
- <version>1.0.0</version>
+ <dependency>
+ <type>eclipse-feature</type>
+ <artifactId>org.aniszczyk.minerva-feature</artifactId>
+ <version>0.0.0</version>
</dependency>
<dependency>
<type>p2-installable-unit</type>
<artifactId>org.eclipse.cvs.feature.group</artifactId>
<version>[1.1.2,2.0.0)</version>
</dependency>
- </dependencies>
+ </dependencies>
</configuration>
</plugin>
<plugin>
View
@@ -39,12 +39,12 @@
</licenses>
<properties>
- <tycho-version>0.12.0</tycho-version>
+ <tycho-version>0.13.0</tycho-version>
<platform-version-name>helios</platform-version-name>
<eclipse-site>http://download.eclipse.org/releases/${platform-version-name}</eclipse-site>
<wikitext-site>http://download.eclipse.org/tools/mylyn/update/weekly</wikitext-site>
<swtbot-site>http://download.eclipse.org/technology/swtbot/${platform-version-name}/dev-build/update-site</swtbot-site>
- <orbit-site>http://download.eclipse.org/tools/orbit/downloads/drops/S20110124210048/repository</orbit-site>
+ <orbit-site>http://download.eclipse.org/tools/orbit/downloads/drops/R20110523182458/repository/</orbit-site>
</properties>

1 comment on commit 18173e9

@PBastiani

This comment has been minimized.

Show comment
Hide comment
@PBastiani

PBastiani Feb 7, 2012

Contributor

Thanks for this update Fabian !
Please note: due to a new lifecycle mapping, tycho 0.13 is not fully compliant with M2E1.0 :(
2 possible workaround:

Contributor

PBastiani commented on 18173e9 Feb 7, 2012

Thanks for this update Fabian !
Please note: due to a new lifecycle mapping, tycho 0.13 is not fully compliant with M2E1.0 :(
2 possible workaround:

Please sign in to comment.