Skip to content

Commit

Permalink
Adjust maven metadata to the ones actually published to central
Browse files Browse the repository at this point in the history
Currently the project is configured to use the org.eclipse.equinox.p2
group id but it is actually published to org.eclipse.platform. That is
both confusing and makes the metadata in p2 pointless and not allows to
use local build artifacts (e.g. for Tycho).

This changes the group id and configures the update-consumer-pom to
create a pom that can be used in a local maven setup similar to one
published on maven central.
  • Loading branch information
laeubi authored and mickaelistria committed Feb 5, 2024
1 parent f169149 commit f682eb1
Show file tree
Hide file tree
Showing 5 changed files with 18 additions and 4 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,5 @@ bin/
.META-INF_*
pom.tycho
.tycho-consumer-pom.xml
.flattened-pom.xml
apiAnalyzer-workspace/
1 change: 1 addition & 0 deletions .mvn/maven.config
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
-Pbuild-individual-bundles
-Dtycho.surefire.deleteWorkDir=true
-Dtycho.localArtifacts=ignore
4 changes: 2 additions & 2 deletions bundles/org.eclipse.equinox.p2.tests/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<modelVersion>4.0.0</modelVersion>

<parent>
<groupId>org.eclipse.equinox.p2</groupId>
<groupId>org.eclipse.platform</groupId>
<artifactId>rt.equinox.p2</artifactId>
<version>${releaseVersion}${qualifier}</version>
<relativePath>../../</relativePath>
Expand Down Expand Up @@ -39,7 +39,7 @@
<dependencies>
<!-- The tests require the reconciler product -->
<dependency>
<groupId>org.eclipse.equinox.p2</groupId>
<groupId>${project.groupId}</groupId>
<artifactId>org.eclipse.equinox.p2.reconciler</artifactId>
<version>1.1.0-SNAPSHOT</version>
<type>pom</type>
Expand Down
2 changes: 1 addition & 1 deletion examples/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<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>
<groupId>org.eclipse.platform</groupId>
<artifactId>rt.equinox.p2</artifactId>
<version>${releaseVersion}${qualifier}</version>
<relativePath>../pom.xml</relativePath>
Expand Down
14 changes: 13 additions & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<relativePath>../eclipse-platform-parent</relativePath>
</parent>

<groupId>org.eclipse.equinox.p2</groupId>
<groupId>org.eclipse.platform</groupId>
<artifactId>rt.equinox.p2</artifactId>
<packaging>pom</packaging>
<version>${releaseVersion}${qualifier}</version>
Expand Down Expand Up @@ -128,6 +128,18 @@
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-packaging-plugin</artifactId>
<executions>
<execution>
<id>default-update-consumer-pom</id>
<configuration>
<skipPomGeneration>false</skipPomGeneration>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>

Expand Down

0 comments on commit f682eb1

Please sign in to comment.