Skip to content

Commit

Permalink
Use pomless for Features and remove unnecessary m2e lifecycle-mappings
Browse files Browse the repository at this point in the history
This enhances the fix of eclipse-equinox#17
  • Loading branch information
HannesWell committed Apr 23, 2022
1 parent 50cbeb3 commit 128f293
Show file tree
Hide file tree
Showing 8 changed files with 16 additions and 318 deletions.
2 changes: 1 addition & 1 deletion .mvn/extensions.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@
<extension>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-build</artifactId>
<version>2.7.0</version>
<version>2.7.1</version>
</extension>
</extensions>
64 changes: 0 additions & 64 deletions features/org.eclipse.equinox.p2.core.feature/pom.xml

This file was deleted.

56 changes: 0 additions & 56 deletions features/org.eclipse.equinox.p2.discovery.feature/pom.xml

This file was deleted.

56 changes: 0 additions & 56 deletions features/org.eclipse.equinox.p2.extras.feature/pom.xml

This file was deleted.

57 changes: 0 additions & 57 deletions features/org.eclipse.equinox.p2.rcp.feature/pom.xml

This file was deleted.

25 changes: 0 additions & 25 deletions features/org.eclipse.equinox.p2.sdk/pom.xml

This file was deleted.

19 changes: 12 additions & 7 deletions ...es/org.eclipse.equinox.p2.user.ui/pom.xml → features/pom.xml
Original file line number Diff line number Diff line change
@@ -1,28 +1,33 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright (c) 2012, 2017 Eclipse Foundation.
Copyright (c) 2012, 2022 Eclipse Foundation.
All rights reserved. This program and the accompanying materials
are made available under the terms of the Eclipse Distribution License v1.0
which accompanies this distribution, and is available at
http://www.eclipse.org/org/documents/edl-v10.php
Contributors:
Igor Fedorenko - initial implementation
Hannes Wellmann - leaverage Tycho-pomless more
-->
<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.equinox.p2</groupId>
<artifactId>rt.equinox.p2</artifactId>
<version>4.24.0-SNAPSHOT</version>
<relativePath>../..</relativePath>
</parent>
<artifactId>features</artifactId>
<packaging>pom</packaging>

<groupId>org.eclipse.equinox</groupId>
<artifactId>org.eclipse.equinox.p2.user.ui</artifactId>
<version>2.4.1600-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>

<modules>
<module>org.eclipse.equinox.p2.core.feature</module>
<module>org.eclipse.equinox.p2.extras.feature</module>
<module>org.eclipse.equinox.p2.discovery.feature</module>
<module>org.eclipse.equinox.p2.sdk</module>
<module>org.eclipse.equinox.p2.rcp.feature</module>
<module>org.eclipse.equinox.p2.user.ui</module>
</modules>
<build>
<plugins>
<plugin>
Expand Down
55 changes: 3 additions & 52 deletions pom.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright (c) 2012, 2019 Eclipse Foundation.
Copyright (c) 2012, 2022 Eclipse Foundation.
All rights reserved. This program and the accompanying materials
are made available under the terms of the Eclipse Distribution License v1.0
which accompanies this distribution, and is available at
Expand Down Expand Up @@ -64,51 +64,6 @@
</profile>
</profiles>

<build>
<pluginManagement>
<plugins>
<!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
<plugin>
<groupId>org.eclipse.m2e</groupId>
<artifactId>lifecycle-mapping</artifactId>
<version>1.0.0</version>
<configuration>
<lifecycleMappingMetadata>
<pluginExecutions>
<pluginExecution>
<pluginExecutionFilter>
<groupId>org.eclipse.cbi.maven.plugins</groupId>
<artifactId>eclipse-cbi-plugin</artifactId>
<versionRange>[0.0.0,)</versionRange>
<goals>
<goal>generate-api-build-xml</goal>
</goals>
</pluginExecutionFilter>
<action>
<ignore></ignore>
</action>
</pluginExecution>
<pluginExecution>
<pluginExecutionFilter>
<groupId>org.eclipse.tycho.extras</groupId>
<artifactId>tycho-eclipserun-plugin</artifactId>
<versionRange>[0.0.0,)</versionRange>
<goals>
<goal>eclipse-run</goal>
</goals>
</pluginExecutionFilter>
<action>
<ignore></ignore>
</action>
</pluginExecution>
</pluginExecutions>
</lifecycleMappingMetadata>
</configuration>
</plugin>
</plugins>
</pluginManagement>
</build>

<modules>
<module>bundles/org.eclipse.equinox.frameworkadmin</module>
<module>bundles/org.eclipse.equinox.frameworkadmin.equinox</module>
Expand Down Expand Up @@ -146,14 +101,10 @@
<module>bundles/org.eclipse.equinox.simpleconfigurator</module>
<module>bundles/org.eclipse.equinox.simpleconfigurator.manipulator</module>
<module>bundles/org.eclipse.equinox.p2.publisher.eclipse</module>
<module>features/org.eclipse.equinox.p2.core.feature</module>
<module>features/org.eclipse.equinox.p2.extras.feature</module>
<module>features/org.eclipse.equinox.p2.discovery.feature</module>
<module>bundles/org.eclipse.equinox.p2.ui.sdk</module>
<module>bundles/org.eclipse.equinox.p2.ui.sdk.scheduler</module>
<module>features/org.eclipse.equinox.p2.sdk</module>
<module>features/org.eclipse.equinox.p2.rcp.feature</module>
<module>features/org.eclipse.equinox.p2.user.ui</module>

<module>features</module>

<module>bundles/org.eclipse.equinox.p2.tests.reconciler.product</module>
<module>bundles/org.eclipse.equinox.p2.tests</module>
Expand Down

0 comments on commit 128f293

Please sign in to comment.