Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIgor Fedorenko2011-08-05 06:06:45 +0000
committerIgor Fedorenko2011-08-05 06:47:10 +0000
commit497c8e48f288887e834c8c7c8c2c0313df703993 (patch)
treea8b8bb0bf4a87ae17ed456450833deff3b42ee6c /pom.xml
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>
Diffstat (limited to 'pom.xml')
-rw-r--r--pom.xml52
1 files changed, 9 insertions, 43 deletions
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>

Back to the top