Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIgor Fedorenko2011-08-05 02:06:45 -0400
committerIgor Fedorenko2011-08-05 02:47:10 -0400
commit497c8e48f288887e834c8c7c8c2c0313df703993 (patch)
treea8b8bb0bf4a87ae17ed456450833deff3b42ee6c
parente9906682edabd97d15907ce5e17daae20519a08d (diff)
downloadm2e-core-497c8e48f288887e834c8c7c8c2c0313df703993.tar.gz
m2e-core-497c8e48f288887e834c8c7c8c2c0313df703993.tar.xz
m2e-core-497c8e48f288887e834c8c7c8c2c0313df703993.zip
got rid of target platform, some cleanup
Signed-off-by: Igor Fedorenko <igor@ifedorenko.com>
-rw-r--r--org.eclipse.m2e.usagedata/build.properties3
-rw-r--r--pom.xml52
-rw-r--r--target-platform/UPDATING5
-rw-r--r--target-platform/m2e-e36.target39
-rw-r--r--target-platform/m2e-e37.target36
-rw-r--r--target-platform/pom.xml54
6 files changed, 12 insertions, 177 deletions
diff --git a/org.eclipse.m2e.usagedata/build.properties b/org.eclipse.m2e.usagedata/build.properties
index ef20dfc4..86a8a775 100644
--- a/org.eclipse.m2e.usagedata/build.properties
+++ b/org.eclipse.m2e.usagedata/build.properties
@@ -16,3 +16,6 @@ bin.includes = plugin.xml,\
jars.compile.order = .
output.. = target/classes
source.. = src/
+
+# need to force optional/nongreedy dependency on build classpath
+jars.extra.classpath=platform:/plugin/org.eclipse.epp.usagedata.gathering
diff --git a/pom.xml b/pom.xml
index 8b8b7ffc..1886f199 100644
--- a/pom.xml
+++ b/pom.xml
@@ -34,13 +34,14 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <m2e-maven-runtime.version>1.0.100-SNAPSHOT</m2e-maven-runtime.version>
+ <m2e-maven-runtime.version>1.0.200-SNAPSHOT</m2e-maven-runtime.version>
<m2e.site-compressed>http://repository.sonatype.org/service/local/repositories/forge-sites/content-compressed/</m2e.site-compressed>
<tycho-version>0.12.0</tycho-version>
- <target.platform>m2e-e37</target.platform>
+ <!-- eclipse version m2e is built against -->
+ <eclipse-repo.url>http://download.eclipse.org/releases/indigo</eclipse-repo.url>
</properties>
<organization>
@@ -60,18 +61,14 @@
<system>Bugzilla</system>
</issueManagement>
- <scm>
- <connection>scm:svn:http://svn.sonatype.org/m2eclipse/trunk/org.eclipse.m2e.parent</connection>
- <developerConnection>scm:svn:https://svn.sonatype.org/m2eclipse/trunk/org.eclipse.m2e.parent</developerConnection>
- </scm>
-
- <ciManagement>
- <system>Hudson</system>
- <url>https://ci.sonatype.org/job/m2eclipse-with-e33/</url>
- </ciManagement>
-
<repositories>
<repository>
+ <id>eclipse</id>
+ <layout>p2</layout>
+ <url>${eclipse-repo.url}</url>
+ </repository>
+
+ <repository>
<releases>
<enabled>true</enabled>
</releases>
@@ -116,8 +113,6 @@
<module>org.eclipse.m2e.logback.feature</module>
<module>org.eclipse.m2e.site</module>
-
- <module>target-platform</module>
</modules>
@@ -144,11 +139,6 @@
</dependency>
<dependency>
<groupId>org.eclipse.m2e</groupId>
- <artifactId>org.eclipse.m2e.maven.runtime</artifactId>
- <version>${m2e-maven-runtime.version}</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.m2e</groupId>
<artifactId>org.jboss.netty</artifactId>
<version>${m2e-maven-runtime.version}</version>
</dependency>
@@ -168,16 +158,7 @@
<artifactId>target-platform-configuration</artifactId>
<version>${tycho-version}</version>
<configuration>
- <resolver>p2</resolver>
<pomDependencies>consider</pomDependencies>
- <target>
- <artifact>
- <groupId>org.eclipse.m2e</groupId>
- <artifactId>target-platform</artifactId>
- <version>${project.version}</version>
- <classifier>${target.platform}</classifier>
- </artifact>
- </target>
</configuration>
</plugin>
</plugins>
@@ -186,11 +167,6 @@
<plugins>
<plugin>
<groupId>org.eclipse.tycho</groupId>
- <artifactId>maven-osgi-lifecycle-plugin</artifactId>
- <version>${tycho-version}</version>
- </plugin>
- <plugin>
- <groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-packaging-plugin</artifactId>
<version>${tycho-version}</version>
<configuration>
@@ -213,19 +189,9 @@
</plugin>
<plugin>
<groupId>org.eclipse.tycho</groupId>
- <artifactId>tycho-compiler-plugin</artifactId>
- <version>${tycho-version}</version>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-p2-plugin</artifactId>
<version>${tycho-version}</version>
</plugin>
-
</plugins>
</pluginManagement>
</build>
diff --git a/target-platform/UPDATING b/target-platform/UPDATING
deleted file mode 100644
index 8eb880c3..00000000
--- a/target-platform/UPDATING
+++ /dev/null
@@ -1,5 +0,0 @@
-Use the following command to update .target file to match contents of remote p2 repositories.
-
-mvn org.eclipse.tycho.extras:tycho-version-bump-plugin:0.12.0:update-target \
- -Dtycho.mode=maven -Dtycho-version=0.12.0 \
- -Dtarget=m2e-e37.target
diff --git a/target-platform/m2e-e36.target b/target-platform/m2e-e36.target
deleted file mode 100644
index 8e0bf9f3..00000000
--- a/target-platform/m2e-e36.target
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<?pde version="3.6"?>
-
-<target name="m2e-e36">
-<locations>
-<location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
-<unit id="org.eclipse.sdk.ide" version="3.6.2.M20110210-1200"/>
-<unit id="org.eclipse.emf.common.feature.group" version="2.6.0.v20100914-1218"/>
-<unit id="org.eclipse.wst.common.emf" version="1.2.3.v201012100400"/>
-<unit id="org.eclipse.wst.sse.core" version="1.1.504.v201102160550"/>
-<unit id="org.eclipse.wst.xml.core" version="1.1.503.v201102102045"/>
-<unit id="org.eclipse.wst.sse.ui" version="1.2.3.v201102102045"/>
-<unit id="org.eclipse.emf.ecore.edit.feature.group" version="2.6.0.v20100914-1218"/>
-<unit id="org.eclipse.emf.edit.ui.feature.group" version="2.6.0.v20100914-1218"/>
-<unit id="org.eclipse.wst.xsd.core" version="1.1.503.v201011121919"/>
-<unit id="org.eclipse.wst.web_ui.feature.feature.group" version="3.2.3.v201102160541-7O7CFbWEMf84qYjGDyP3DNEwcgFU"/>
-<unit id="org.eclipse.epp.usagedata.feature.feature.group" version="1.3.1.R201102081640"/>
-<repository location="http://download.eclipse.org/releases/helios"/>
-</location>
-<location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
-<unit id="org.eclipse.swtbot.eclipse.feature.group" version="2.0.4.20110304_0338-e5aff47-dev-e36"/>
-<unit id="org.eclipse.swtbot.eclipse.gef.feature.group" version="2.0.4.20110304_0338-e5aff47-dev-e36"/>
-<unit id="org.eclipse.swtbot.feature.group" version="2.0.4.20110304_0338-e5aff47-dev-e36"/>
-<unit id="org.eclipse.swtbot.ide.feature.group" version="2.0.4.20110304_0338-e5aff47-dev-e36"/>
-<unit id="org.eclipse.swtbot.eclipse.test.junit3.feature.group" version="2.0.4.20110304_0338-e5aff47-dev-e36"/>
-<unit id="org.eclipse.swtbot.eclipse.test.junit4.feature.group" version="2.0.4.20110304_0338-e5aff47-dev-e36"/>
-<repository location="http://download.eclipse.org/technology/swtbot/helios/dev-build/update-site/"/>
-</location>
-<location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
-<unit id="org.eclipse.equinox.p2.sdk.feature.group" version="3.6.2.R36x_v20110120-9I7VGEAG438GhnfSLuLz0FXP9NYJ"/>
-<repository location="http://download.eclipse.org/releases/helios"/>
-</location>
-<location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
-<unit id="org.slf4j.api" version="1.6.1.v20100831-0715"/>
-<unit id="ch.qos.logback.core" version="0.9.27.v20110224-1110"/>
-<repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20110523182458/repository"/>
-</location>
-</locations>
-</target>
diff --git a/target-platform/m2e-e37.target b/target-platform/m2e-e37.target
deleted file mode 100644
index 72257d83..00000000
--- a/target-platform/m2e-e37.target
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<?pde version="3.6"?>
-
-<target name="m2e-e37">
-<locations>
-<location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
-<unit id="org.eclipse.emf.common.feature.group" version="2.7.0.v20110605-0747"/>
-<unit id="org.eclipse.wst.common.emf" version="1.2.100.v201101101900"/>
-<unit id="org.eclipse.wst.sse.core" version="1.1.600.v201105162116"/>
-<unit id="org.eclipse.wst.xml.core" version="1.1.600.v201104251227"/>
-<unit id="org.eclipse.wst.sse.ui" version="1.3.0.v201105101529"/>
-<unit id="org.eclipse.emf.ecore.edit.feature.group" version="2.7.0.v20110606-0949"/>
-<unit id="org.eclipse.emf.edit.ui.feature.group" version="2.7.0.v20110606-0949"/>
-<unit id="org.eclipse.wst.xsd.core" version="1.1.600.v201104070312"/>
-<unit id="org.eclipse.wst.web_ui.feature.feature.group" version="3.3.0.v201102200555-7O7IFhJEMiB5vNMYta56_GonLeahqrwnYjv2mBz-"/>
-<unit id="org.eclipse.epp.usagedata.feature.feature.group" version="1.4.0.R201106061540"/>
-<repository location="http://download.eclipse.org/releases/indigo"/>
-<unit id="org.eclipse.sdk.ide" version="3.7.0.I20110613-1736"/>
-<unit id="org.eclipse.equinox.p2.sdk.feature.group" version="3.7.0.v20110519-9N7sHDJGMMn4xUrxSmFfL7O39XLL"/>
-</location>
-<location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
-<unit id="org.eclipse.swtbot.eclipse.feature.group" version="2.0.4.20110304_0338-e5aff47-dev-e36"/>
-<unit id="org.eclipse.swtbot.eclipse.gef.feature.group" version="2.0.4.20110304_0338-e5aff47-dev-e36"/>
-<unit id="org.eclipse.swtbot.feature.group" version="2.0.4.20110304_0338-e5aff47-dev-e36"/>
-<unit id="org.eclipse.swtbot.ide.feature.group" version="2.0.4.20110304_0338-e5aff47-dev-e36"/>
-<unit id="org.eclipse.swtbot.eclipse.test.junit3.feature.group" version="2.0.4.20110304_0338-e5aff47-dev-e36"/>
-<unit id="org.eclipse.swtbot.eclipse.test.junit4.feature.group" version="2.0.4.20110304_0338-e5aff47-dev-e36"/>
-<repository location="http://download.eclipse.org/technology/swtbot/helios/dev-build/update-site/"/>
-</location>
-<location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
-<unit id="org.slf4j.api" version="1.6.1.v20100831-0715"/>
-<unit id="ch.qos.logback.core" version="0.9.27.v20110224-1110"/>
-<repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20110523182458/repository"/>
-</location>
-</locations>
-</target>
diff --git a/target-platform/pom.xml b/target-platform/pom.xml
deleted file mode 100644
index c2857338..00000000
--- a/target-platform/pom.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
- <!--
- Copyright (c) 2008 Sonatype, Inc. 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 http://www.eclipse.org/legal/epl-v10.html
- -->
-<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>
- <groupId>org.eclipse.m2e</groupId>
- <artifactId>m2e-core</artifactId>
- <version>1.0.200-SNAPSHOT</version>
- </parent>
-
- <artifactId>target-platform</artifactId>
- <packaging>pom</packaging>
-
- <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>m2e-e36.target</file>
- <type>target</type>
- <classifier>m2e-e36</classifier>
- </artifact>
- <artifact>
- <file>m2e-e37.target</file>
- <type>target</type>
- <classifier>m2e-e37</classifier>
- </artifact>
- </artifacts>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-
-</project>

Back to the top