Skip to content
This repository has been archived by the owner on Aug 11, 2020. It is now read-only.

Commit

Permalink
352883 Update Equinox content (incl. p2) to Juno M1
Browse files Browse the repository at this point in the history
- Updated versions of bundles in Tycho's OSGi runtime. Note: bundles
  loaded from Maven still use 3.7.0 versions (see root POM).
- Use a target file to manage dependencies to Equinox.
- Add target file for use in Eclipse.
  • Loading branch information
oberlies committed Aug 23, 2011
1 parent 80c2544 commit 4393caf
Show file tree
Hide file tree
Showing 7 changed files with 108 additions and 62 deletions.
33 changes: 10 additions & 23 deletions tycho-p2-resolver/pom.xml
Expand Up @@ -28,6 +28,8 @@
<name>Tycho OSGi Bundles Parent (Incubation)</name>

<modules>
<module>tycho-bundles-target</module>

<module>org.eclipse.tycho.p2.resolver.facade</module>
<module>org.eclipse.tycho.p2.tools.facade</module>

Expand All @@ -52,6 +54,14 @@
<version>${tycho-version}</version>
<configuration>
<resolver>p2</resolver>
<target>
<artifact>
<groupId>${project.groupId}</groupId>
<artifactId>tycho-bundles-target</artifactId>
<version>${project.version}</version>
<classifier>build</classifier>
</artifact>
</target>
</configuration>
</plugin>
</plugins>
Expand All @@ -66,27 +76,4 @@
</pluginManagement>
</build>

<profiles>
<profile>
<id>m2e</id>
<activation>
<property>
<name>m2e.version</name>
</property>
</activation>
<build>
<plugins>
<plugin>
<groupId>org.maven.ide.eclipse</groupId>
<artifactId>lifecycle-mapping</artifactId>
<version>0.10.0</version>
<configuration>
<mappingId>org.sonatype.tycho.m2e.tychoLifecycleMapping</mappingId>
</configuration>
</plugin>
</plugins>
</build>
</profile>
</profiles>

</project>
12 changes: 12 additions & 0 deletions tycho-p2-resolver/tycho-bundles-target/build.target
@@ -0,0 +1,12 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde version="3.6"?>

<target name="Partial target platform for Tycho - explicit versions for Equinox and p2 dependencies">
<locations>
<location includeAllPlatforms="false" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.equinox.core.sdk.feature.group" version="3.7.0.v20110506-0800-7uF9NFyVFWmE7gTCEZ4DfL5A"/>
<unit id="org.eclipse.equinox.p2.sdk.feature.group" version="3.7.0.v20110725-1630-9N7uH_mGMMn4xUu198nEJww39OF6"/>
<repository location="http://download.eclipse.org/eclipse/updates/3.8milestones/S-3.8M1-201108031800/"/>
</location>
</locations>
</target>
11 changes: 11 additions & 0 deletions tycho-p2-resolver/tycho-bundles-target/eclipse.target
@@ -0,0 +1,11 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde version="3.6"?>

<target name="Complete target platform for Tycho">
<locations>
<location includeAllPlatforms="false" includeMode="slicer" includeSource="false" type="InstallableUnit">
<unit id="org.eclipse.sdk.ide" version="3.8.0.I20110803-1800"/>
<repository location="http://download.eclipse.org/eclipse/updates/3.8milestones/S-3.8M1-201108031800/"/>
</location>
</locations>
</target>
44 changes: 44 additions & 0 deletions tycho-p2-resolver/tycho-bundles-target/pom.xml
@@ -0,0 +1,44 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>

<parent>
<artifactId>tycho-p2-resolver</artifactId>
<groupId>org.eclipse.tycho</groupId>
<version>0.13.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>

<artifactId>tycho-bundles-target</artifactId>
<packaging>pom</packaging>

<name>Tycho OSGi Bundles Target Platform (Incubation)</name>

<build>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<version>1.3</version>
<executions>
<execution>
<id>attach-artifacts</id>
<phase>package</phase>
<goals>
<goal>attach-artifact</goal>
</goals>
<configuration>
<artifacts>
<artifact>
<file>build.target</file>
<type>target</type>
<classifier>build</classifier>
</artifact>
</artifacts>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>
Expand Up @@ -11,6 +11,7 @@ Require-Bundle: org.eclipse.core.runtime,
org.eclipse.equinox.p2.core;bundle-version="2.0.0",
org.eclipse.equinox.p2.metadata;bundle-version="2.0.0",
org.eclipse.equinox.p2.publisher;bundle-version="1.1.0",
org.eclipse.equinox.p2.publisher.eclipse;bundle-version="1.0.0",
org.eclipse.equinox.p2.artifact.repository;bundle-version="1.1.0",
org.eclipse.equinox.p2.metadata.repository;bundle-version="1.1.0",
org.eclipse.equinox.p2.director;bundle-version="2.0.0",
Expand All @@ -19,8 +20,7 @@ Require-Bundle: org.eclipse.core.runtime,
org.eclipse.core.net;bundle-version="1.2.100",
org.eclipse.tycho.p2.maven.repository;bundle-version="0.12.0",
org.eclipse.ecf.filetransfer;bundle-version="4.0.0",
org.eclipse.ecf;bundle-version="3.1.0",
org.eclipse.equinox.p2.publisher.eclipse;bundle-version="1.0.0"
org.eclipse.ecf;bundle-version="3.1.0"
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Bundle-ActivationPolicy: lazy
Export-Package: org.eclipse.tycho.p2.impl;x-friends:="org.eclipse.tycho.p2.impl.test",
Expand Down
8 changes: 0 additions & 8 deletions tycho-p2-resolver/tycho-p2-resolver-impl/pom.xml
Expand Up @@ -40,12 +40,4 @@
<module>tycho-p2-runtime</module>
</modules>

<repositories>
<repository>
<id>eclipse</id>
<layout>p2</layout>
<url>http://download.eclipse.org/releases/indigo</url>
</repository>
</repositories>

</project>
Expand Up @@ -25,11 +25,11 @@
<plugins>
<plugin id="org.apache.commons.codec" version="1.3.0.v201101211617"/>
<plugin id="org.apache.commons.httpclient" version="3.1.0.v201012070820"/>
<plugin id="org.apache.commons.logging" version="1.1.1.v201101211721"/>
<plugin id="org.apache.commons.logging" version="1.0.4.v201101211617"/>
<plugin id="org.eclipse.core.contenttype" version="3.4.100.v20110423-0524"/>
<plugin id="org.eclipse.core.jobs" version="3.5.100.v20110404"/>
<plugin id="org.eclipse.core.jobs" version="3.5.200.v20110721-1714"/>
<plugin id="org.eclipse.core.net" version="1.2.100.I20110511-0800"/>
<plugin id="org.eclipse.core.runtime" version="3.7.0.v20110110"/>
<plugin id="org.eclipse.core.runtime" version="3.7.0.v20110721-1714"/>
<plugin id="org.eclipse.core.runtime.compatibility.registry" version="3.5.0.v20110505" fragment="true"/>
<plugin id="org.eclipse.ecf" version="3.1.300.v20110531-2218"/>
<plugin id="org.eclipse.ecf.filetransfer" version="5.0.0.v20110531-2218"/>
Expand All @@ -41,34 +41,34 @@
<plugin id="org.eclipse.ecf.ssl" version="1.0.100.v20110531-2218" fragment="true"/>
<plugin id="org.eclipse.equinox.app" version="1.3.100.v20110321"/>
<plugin id="org.eclipse.equinox.common" version="3.6.0.v20110523"/>
<plugin id="org.eclipse.equinox.ds" version="1.3.0.v20110502"/>
<plugin id="org.eclipse.equinox.frameworkadmin" version="2.0.0.v20110502-1955"/>
<plugin id="org.eclipse.equinox.frameworkadmin.equinox" version="1.0.300.v20110506"/>
<plugin id="org.eclipse.equinox.p2.artifact.repository" version="1.1.100.v20110519"/>
<plugin id="org.eclipse.equinox.p2.core" version="2.1.0.v20110502-1955"/>
<plugin id="org.eclipse.equinox.p2.director" version="2.1.0.v20110504-1715"/>
<plugin id="org.eclipse.equinox.p2.director.app" version="1.0.300.v20110505"/>
<plugin id="org.eclipse.equinox.p2.engine" version="2.1.0.v20110511"/>
<plugin id="org.eclipse.equinox.p2.garbagecollector" version="1.0.200.v20110510"/>
<plugin id="org.eclipse.equinox.p2.jarprocessor" version="1.0.200.v20110502-1955"/>
<plugin id="org.eclipse.equinox.p2.metadata" version="2.1.0.v20110510"/>
<plugin id="org.eclipse.equinox.p2.metadata.repository" version="1.2.0.v20110511-1359"/>
<plugin id="org.eclipse.equinox.p2.publisher" version="1.2.0.v20110511"/>
<plugin id="org.eclipse.equinox.p2.publisher.eclipse" version="1.0.0.v20110511"/>
<plugin id="org.eclipse.equinox.p2.repository" version="2.1.0.v20110601"/>
<plugin id="org.eclipse.equinox.p2.repository.tools" version="2.0.100.v20110512-1320"/>
<plugin id="org.eclipse.equinox.p2.touchpoint.eclipse" version="2.1.0.v20110511"/>
<plugin id="org.eclipse.equinox.p2.touchpoint.natives" version="1.0.300.v20110502-1955"/>
<plugin id="org.eclipse.equinox.p2.transport.ecf" version="1.0.0.v20110510"/>
<plugin id="org.eclipse.equinox.p2.updatesite" version="1.0.300.v20110510"/>
<plugin id="org.eclipse.equinox.preferences" version="3.4.0.v20110502"/>
<plugin id="org.eclipse.equinox.registry" version="3.5.100.v20110502"/>
<plugin id="org.eclipse.equinox.ds" version="1.3.100.v20110705"/>
<plugin id="org.eclipse.equinox.frameworkadmin" version="2.0.0.v20110725-1630"/>
<plugin id="org.eclipse.equinox.frameworkadmin.equinox" version="1.0.300.v20110725-1630"/>
<plugin id="org.eclipse.equinox.p2.artifact.repository" version="1.1.200.v20110725-1630"/>
<plugin id="org.eclipse.equinox.p2.core" version="2.1.0.v20110725-1630"/>
<plugin id="org.eclipse.equinox.p2.director" version="2.1.100.v20110725-1630"/>
<plugin id="org.eclipse.equinox.p2.director.app" version="1.0.300.v20110725-1630"/>
<plugin id="org.eclipse.equinox.p2.engine" version="2.1.100.v20110725-1630"/>
<plugin id="org.eclipse.equinox.p2.garbagecollector" version="1.0.200.v20110725-1630"/>
<plugin id="org.eclipse.equinox.p2.jarprocessor" version="1.0.200.v20110725-1630"/>
<plugin id="org.eclipse.equinox.p2.metadata" version="2.1.0.v20110725-1630"/>
<plugin id="org.eclipse.equinox.p2.metadata.repository" version="1.2.0.v20110725-1630"/>
<plugin id="org.eclipse.equinox.p2.publisher" version="1.2.0.v20110725-1630"/>
<plugin id="org.eclipse.equinox.p2.publisher.eclipse" version="1.0.0.v20110725-1630"/>
<plugin id="org.eclipse.equinox.p2.repository" version="2.1.0.v20110725-1630"/>
<plugin id="org.eclipse.equinox.p2.repository.tools" version="2.0.100.v20110725-1630"/>
<plugin id="org.eclipse.equinox.p2.touchpoint.eclipse" version="2.1.100.v20110725-1630"/>
<plugin id="org.eclipse.equinox.p2.touchpoint.natives" version="1.0.300.v20110725-1630"/>
<plugin id="org.eclipse.equinox.p2.transport.ecf" version="1.0.100.v20110725-1630"/>
<plugin id="org.eclipse.equinox.p2.updatesite" version="1.0.300.v20110725-1630"/>
<plugin id="org.eclipse.equinox.preferences" version="3.4.100.v20110711"/>
<plugin id="org.eclipse.equinox.registry" version="3.5.200.v20110718-1559"/>
<plugin id="org.eclipse.equinox.security" version="1.1.0.v20110502"/>
<plugin id="org.eclipse.equinox.simpleconfigurator" version="1.0.200.v20110502-1955"/>
<plugin id="org.eclipse.equinox.simpleconfigurator.manipulator" version="2.0.0.v20110502-1955"/>
<plugin id="org.eclipse.equinox.simpleconfigurator" version="1.0.300.v20110725-1630"/>
<plugin id="org.eclipse.equinox.simpleconfigurator.manipulator" version="2.0.0.v20110725-1630"/>
<plugin id="org.eclipse.equinox.util" version="1.0.300.v20110502"/>
<plugin id="org.eclipse.osgi" version="3.7.0.v20110613"/>
<plugin id="org.eclipse.osgi.services" version="3.3.0.v20110513"/>
<plugin id="org.eclipse.osgi" version="3.8.0.v20110726-1606"/>
<plugin id="org.eclipse.osgi.services" version="3.3.0.v20110711-1243"/>
<plugin id="org.sat4j.core" version="2.3.0.v20110329"/>
<plugin id="org.sat4j.pb" version="2.3.0.v20110329"/>

Expand Down

0 comments on commit 4393caf

Please sign in to comment.