Skip to content

Commit

Permalink
Use less pom.xml files 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

It changes the groupId from org.eclipse.equinox to
org.eclipse.equinox.p2 for more plug-ins

Signed-off-by: Hannes Wellmann <wellmann.hannes1@gmx.net>
  • Loading branch information
HannesWell committed Apr 22, 2022
1 parent eb384f9 commit 18d3c67
Show file tree
Hide file tree
Showing 8 changed files with 20 additions and 319 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>
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.

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

This file was deleted.

31 changes: 16 additions & 15 deletions ...g.eclipse.equinox.p2.core.feature/pom.xml → features/pom.xml
Original file line number Diff line number Diff line change
@@ -1,30 +1,35 @@
<?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
Krzysztof Daniel - 419647: React to ECF feature restructuring
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>
<groupId>org.eclipse.equinox</groupId>
<artifactId>org.eclipse.equinox.p2.core.feature</artifactId>
<version>1.6.1400-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
<artifactId>features</artifactId>
<packaging>pom</packaging>


<build>
<modules>
<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>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>
</modules>

<build>
<plugins>
<plugin>
<groupId>org.eclipse.tycho</groupId>
Expand All @@ -36,12 +41,6 @@
<goals>
<goal>feature-source</goal>
</goals>
<configuration>
<excludes>
<plugin id="org.sat4j.core"/>
<plugin id="org.sat4j.pb"/>
</excludes>
</configuration>
</execution>
</executions>
</plugin>
Expand All @@ -61,4 +60,6 @@
</plugin>
</plugins>
</build>


</project>
Loading

0 comments on commit 18d3c67

Please sign in to comment.