Skip to content

Commit 4b1b86e

Browse files
Merge pull request eclipse-collections#1767 from fipro78/master
Simplify p2 repository generation
2 parents 5268319 + 0173cfc commit 4b1b86e

3 files changed

Lines changed: 13 additions & 74 deletions

File tree

p2-feature/org.eclipse.collections.target/org.eclipse.collections.target.target

Lines changed: 0 additions & 46 deletions
This file was deleted.

p2-feature/org.eclipse.collections.target/pom.xml

Lines changed: 0 additions & 18 deletions
This file was deleted.

p2-feature/pom.xml

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
<name>Eclipse Collections p2 Parent</name>
2020

2121
<modules>
22-
<module>org.eclipse.collections.target</module>
2322
<module>org.eclipse.collections.feature</module>
2423
<module>org.eclipse.collections.repository</module>
2524
</modules>
@@ -44,12 +43,22 @@
4443
<dependency>
4544
<groupId>org.eclipse.collections</groupId>
4645
<artifactId>eclipse-collections</artifactId>
47-
<version>${project.version}</version>
46+
<version>12.0.0.M20.JDK11</version>
4847
</dependency>
4948
<dependency>
5049
<groupId>org.eclipse.collections</groupId>
5150
<artifactId>eclipse-collections-api</artifactId>
52-
<version>${project.version}</version>
51+
<version>12.0.0.M20.JDK11</version>
52+
</dependency>
53+
<dependency>
54+
<groupId>org.apache.aries.spifly</groupId>
55+
<artifactId>org.apache.aries.spifly.dynamic.framework.extension</artifactId>
56+
<version>1.3.7</version>
57+
</dependency>
58+
<dependency>
59+
<groupId>org.eclipse.platform</groupId>
60+
<artifactId>org.eclipse.osgi</artifactId>
61+
<version>3.19.0</version>
5362
</dependency>
5463
</dependencies>
5564

@@ -69,13 +78,7 @@
6978
<groupId>org.eclipse.tycho</groupId>
7079
<artifactId>target-platform-configuration</artifactId>
7180
<configuration>
72-
<target>
73-
<artifact>
74-
<groupId>org.eclipse.collections</groupId>
75-
<artifactId>target</artifactId>
76-
<version>${project.version}</version>
77-
</artifact>
78-
</target>
81+
<pomDependencies>consider</pomDependencies>
7982
<targetDefinitionIncludeSource>honor</targetDefinitionIncludeSource>
8083
<environments>
8184
<environment>

0 commit comments

Comments
 (0)