Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan Sievers2015-05-28 11:43:36 -0400
committerJan Sievers2015-05-28 11:43:36 -0400
commit260507fd004cf8126f049c2bd4280e99302ca2a8 (patch)
treea4227590777c335f477c878aa7150eff51c70685
parent2ac6622b69a46344f5f2174cad311feb871be4ac (diff)
downloadorg.eclipse.tycho-demo-260507fd004cf8126f049c2bd4280e99302ca2a8.tar.gz
org.eclipse.tycho-demo-260507fd004cf8126f049c2bd4280e99302ca2a8.tar.xz
org.eclipse.tycho-demo-260507fd004cf8126f049c2bd4280e99302ca2a8.zip
Update to Tycho 0.23.0
also, update itp04 demo to use Mars p2 repo and explicitly configure a ".app" product root folder for MacOSX.
-rw-r--r--itp01/pom.xml2
-rw-r--r--itp02/build01/pom.xml2
-rw-r--r--itp02/build01/pomfirst-bundle/META-INF/MANIFEST.MF4
-rw-r--r--itp02/build01/pomfirst-thirdparty/META-INF/MANIFEST.MF6
-rw-r--r--itp02/build02/pom.xml2
-rw-r--r--itp03-crossplatform/pom.xml2
-rw-r--r--itp04-rcp/eclipse-repository/pom.xml9
-rw-r--r--itp04-rcp/mars/.gitignore (renamed from itp04-rcp/helios/.gitignore)0
-rw-r--r--itp04-rcp/mars/mars.target (renamed from itp04-rcp/helios/helios.target)4
-rw-r--r--itp04-rcp/mars/pom.xml (renamed from itp04-rcp/helios/pom.xml)4
-rw-r--r--itp04-rcp/pom.xml6
11 files changed, 25 insertions, 16 deletions
diff --git a/itp01/pom.xml b/itp01/pom.xml
index 5107aff..f92816d 100644
--- a/itp01/pom.xml
+++ b/itp01/pom.xml
@@ -11,7 +11,7 @@
</modules>
<properties>
- <tycho-version>0.22.0</tycho-version>
+ <tycho-version>0.23.0</tycho-version>
</properties>
<repositories>
diff --git a/itp02/build01/pom.xml b/itp02/build01/pom.xml
index 9fce400..8081769 100644
--- a/itp02/build01/pom.xml
+++ b/itp02/build01/pom.xml
@@ -13,7 +13,7 @@
<packaging>pom</packaging>
<properties>
- <tycho-version>0.22.0</tycho-version>
+ <tycho-version>0.23.0</tycho-version>
<manifest-location>META-INF</manifest-location>
</properties>
diff --git a/itp02/build01/pomfirst-bundle/META-INF/MANIFEST.MF b/itp02/build01/pomfirst-bundle/META-INF/MANIFEST.MF
index 6559520..224e640 100644
--- a/itp02/build01/pomfirst-bundle/META-INF/MANIFEST.MF
+++ b/itp02/build01/pomfirst-bundle/META-INF/MANIFEST.MF
@@ -4,8 +4,8 @@ Export-Package: tycho.demo.itp02.pomfirst;uses:="org.codehaus.plexus.u
Bundle-Version: 1.0.0.SNAPSHOT
Tool: Bnd-0.0.357
Bundle-Name: pomfirst-bundle
-Bnd-LastModified: 1363342212730
-Created-By: 1.6.0_34 (Sun Microsystems Inc.)
+Bnd-LastModified: 1432827265000
+Created-By: 1.7.0_67 (Oracle Corporation)
Bundle-ManifestVersion: 2
Bundle-SymbolicName: tycho.demo.itp02.pomfirst-bundle
Import-Package: org.codehaus.plexus.util,tycho.demo.itp02.pomfirst;ver
diff --git a/itp02/build01/pomfirst-thirdparty/META-INF/MANIFEST.MF b/itp02/build01/pomfirst-thirdparty/META-INF/MANIFEST.MF
index 263f7df..cddaeac 100644
--- a/itp02/build01/pomfirst-thirdparty/META-INF/MANIFEST.MF
+++ b/itp02/build01/pomfirst-thirdparty/META-INF/MANIFEST.MF
@@ -8,13 +8,13 @@ Export-Package: org.codehaus.plexus.util.reflection;version="2.0.7",or
.plexus.util;version="2.0.7"
Embed-Directory: jars
Bundle-ClassPath: jars/plexus-utils-2.0.7.jar
-Built-By: D037913
+Built-By: d037913
Tool: Bnd-0.0.357
Bundle-Name: pomfirst-thirdparty
Created-By: Apache Maven Bundle Plugin
-Build-Jdk: 1.6.0_34
+Build-Jdk: 1.7.0_67
Bundle-Version: 1.0.0.SNAPSHOT
-Bnd-LastModified: 1363342227494
+Bnd-LastModified: 1432827267797
Embed-Transitive: true
Bundle-ManifestVersion: 2
Embed-Dependency: plexus-utils
diff --git a/itp02/build02/pom.xml b/itp02/build02/pom.xml
index 9c51fc4..e92dd1e 100644
--- a/itp02/build02/pom.xml
+++ b/itp02/build02/pom.xml
@@ -12,7 +12,7 @@
<packaging>pom</packaging>
<properties>
- <tycho-version>0.22.0</tycho-version>
+ <tycho-version>0.23.0</tycho-version>
</properties>
<modules>
diff --git a/itp03-crossplatform/pom.xml b/itp03-crossplatform/pom.xml
index b0afd01..4ddffbc 100644
--- a/itp03-crossplatform/pom.xml
+++ b/itp03-crossplatform/pom.xml
@@ -7,7 +7,7 @@
<packaging>pom</packaging>
<properties>
- <tycho-version>0.22.0</tycho-version>
+ <tycho-version>0.23.0</tycho-version>
<eclipse-repository-url>http://download.eclipse.org/eclipse/updates/3.6</eclipse-repository-url>
</properties>
diff --git a/itp04-rcp/eclipse-repository/pom.xml b/itp04-rcp/eclipse-repository/pom.xml
index b540821..3c0f08c 100644
--- a/itp04-rcp/eclipse-repository/pom.xml
+++ b/itp04-rcp/eclipse-repository/pom.xml
@@ -36,6 +36,15 @@ Contributors:
<linux>tar.gz</linux>
<macosx>tar.gz</macosx>
</formats>
+ <products>
+ <product>
+ <id>example.product.id</id>
+ <rootFolders>
+ <!-- for MacOSX, make sure you use a folder ending with .app , see bug 463670 -->
+ <macosx>Eclipse.app</macosx>
+ </rootFolders>
+ </product>
+ </products>
</configuration>
<executions>
<execution>
diff --git a/itp04-rcp/helios/.gitignore b/itp04-rcp/mars/.gitignore
index 8032fef..8032fef 100644
--- a/itp04-rcp/helios/.gitignore
+++ b/itp04-rcp/mars/.gitignore
diff --git a/itp04-rcp/helios/helios.target b/itp04-rcp/mars/mars.target
index 848070c..e55da28 100644
--- a/itp04-rcp/helios/helios.target
+++ b/itp04-rcp/mars/mars.target
@@ -1,13 +1,13 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde version="3.5"?>
-<target name="eclipse 3.6.2">
+<target name="eclipse Mars">
<locations>
<location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
<unit id="org.eclipse.rcp.feature.group" version="0.0.0"/>
<unit id="org.eclipse.equinox.p2.user.ui.feature.group" version="0.0.0"/>
<unit id="org.eclipse.equinox.executable.feature.group" version="0.0.0"/>
-<repository location="http://download.eclipse.org/releases/helios/"/>
+<repository location="http://download.eclipse.org/releases/mars/201505221000/"/>
</location>
</locations>
</target>
diff --git a/itp04-rcp/helios/pom.xml b/itp04-rcp/mars/pom.xml
index 6016b0b..8923f9b 100644
--- a/itp04-rcp/helios/pom.xml
+++ b/itp04-rcp/mars/pom.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-Copyright (c) 2010, 2012 SAP AG and others.
+Copyright (c) 2010, 2015 SAP AG and others.
All rights reserved. This program and the accompanying materials
are made available under the terms of the Eclipse Public License v1.0
which accompanies this distribution, and is available at
@@ -14,7 +14,7 @@ Contributors:
xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
- <artifactId>helios</artifactId>
+ <artifactId>mars</artifactId>
<packaging>eclipse-target-definition</packaging>
<name>RCP Example Target Definition</name>
diff --git a/itp04-rcp/pom.xml b/itp04-rcp/pom.xml
index 223892f..f3489c4 100644
--- a/itp04-rcp/pom.xml
+++ b/itp04-rcp/pom.xml
@@ -20,7 +20,7 @@ Contributors:
<name>RCP Parent</name>
<properties>
- <tycho-version>0.23.0-SNAPSHOT</tycho-version>
+ <tycho-version>0.23.0</tycho-version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
@@ -29,7 +29,7 @@ Contributors:
<module>example-bundle</module>
<module>example-feature</module>
<module>example-feature-2</module>
- <module>helios</module>
+ <module>mars</module>
<module>root-files</module>
<module>root-files-windows</module>
</modules>
@@ -44,7 +44,7 @@ Contributors:
<target>
<artifact>
<groupId>example.group</groupId>
- <artifactId>helios</artifactId>
+ <artifactId>mars</artifactId>
<version>1.0.0-SNAPSHOT</version>
</artifact>
</target>

Back to the top