bug5694: don't set parent pom for com.amazon.aws.aws-java-api bundle;

this to avoid inheriting the target platform definition which may be
inconsistent while building a new version of the target platform
This commit is contained in:
Axel Uhl committed 2022-04-12 17:09:03 +02:00
1 parent aa37ac2490
commit 4b5062ae19
2 files changed
+29 -9

No files matched your search

@@ -12,6 +12,9 @@
config does not skip resolving the target definition defined in the parent
pom. Therefore, the parent was not set here - which means we have to define
$tycho-version again. -->
<properties>
<tycho-version>1.6.0</tycho-version>
</properties>
<groupId>com.amazon.aws</groupId>
<version>1.0.0-SNAPSHOT</version>
<artifactId>com.amazon.aws.aws-java-api.updatesite</artifactId>
@@ -20,7 +23,7 @@
<plugin>
<groupId>org.eclipse.tycho.extras</groupId>
<artifactId>tycho-p2-extras-plugin</artifactId>
<version>1.0.0</version>
<version>${tycho-version}</version>
<configuration>
<sourceLocation>${basedir}</sourceLocation>
</configuration>
+25 -8
View File
@@ -2,12 +2,29 @@
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>root</artifactId>
<groupId>com.sap.sailing</groupId>
<version>1.0.0-SNAPSHOT</version>
</parent>
<artifactId>com.amazon.aws.aws-java-api</artifactId>
<version>2.17.124</version>
<packaging>eclipse-plugin</packaging>
<!-- Do not set parent: this would also inherit the tycho target platform
configuration. By building this artifact, we create the local p2 repo that
can then be referenced by the race-analysis-p2-local.target definition. So
we can't recursively use the local repo as target platform for building the
local repo - and apart from that don't need it. Skipping the tycho-maven-plugin
and target-platform-configuration plugins via <skip> parameter in the build
config does not skip resolving the target definition defined in the parent
pom. Therefore, the parent was not set here - which means we have to define
$tycho-version again. -->
<properties>
<tycho-version>1.6.0</tycho-version>
</properties>
<artifactId>com.amazon.aws.aws-java-api</artifactId>
<version>2.17.124</version>
<packaging>eclipse-plugin</packaging>
<build>
<plugins>
<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-maven-plugin</artifactId>
<version>${tycho-version}</version>
<extensions>true</extensions>
</plugin>
</plugins>
</build>
</project>