Update version ranges to work with biz.aQute.bndlib 7.0.0

eclipse-pde · Oct 6, 2023 · abfdf64 · abfdf64
1 parent 6b0f0ed
commit abfdf64
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 6 deletions.
diff --git a/pom.xml b/pom.xml
@@ -9,9 +9,12 @@
   Contributors:
      Igor Fedorenko - initial implementation
      Lars Vogel <[email protected]> - Ongoing maintenance
-     Lucas Bullen <[email protected]> - Bug 529467 - Move genericeditor.extension tests to own project
+     Lucas Bullen <[email protected]> - Bug 529467 - Move genericeditor.extension
+tests to own project
 -->
-<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">
+<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>
@@ -37,6 +40,27 @@
     <module>build</module>
     <module>features</module>
   </modules>
+  <dependencies>
+    <dependency>
+      <groupId>biz.aQute.bnd</groupId>
+      <artifactId>biz.aQute.bndlib</artifactId>
+      <version>7.0.0</version>
+    </dependency>
+  </dependencies>
+
+  <build>
+    <pluginManagement>
+      <plugins>
+        <plugin>
+          <groupId>org.eclipse.tycho</groupId>
+          <artifactId>target-platform-configuration</artifactId>
+          <configuration>
+            <pomDependencies>consider</pomDependencies>
+          </configuration>
+        </plugin>
+      </plugins>
+    </pluginManagement>
+  </build>
 
   <!--
     To build individual bundles, we specify a repository where to find parent pom,

diff --git a/ui/org.eclipse.pde.core/META-INF/MANIFEST.MF b/ui/org.eclipse.pde.core/META-INF/MANIFEST.MF
@@ -82,9 +82,9 @@ Export-Package:
 Import-Package: aQute.bnd.build;version="[4.4.0,5.0.0)",
  aQute.bnd.build.model;version="[4.2.0,5.0.0)",
  aQute.bnd.header;version="[2.5.0,3.0.0)",
- aQute.bnd.osgi;version="[5.5.0,6.0.0)",
+ aQute.bnd.osgi;version="[5.5.0,8.0.0)",
  aQute.bnd.osgi.repository;version="[3.0.0,4.0.0)",
- aQute.bnd.osgi.resource;version="[4.3.0,5.0.0)",
+ aQute.bnd.osgi.resource;version="[4.3.0,6.0.0)",
  aQute.bnd.properties;version="[2.0.0,3.0.0)",
  aQute.bnd.service;version="[4.7.0,5.0.0)",
  aQute.bnd.version;version="[2.2.0,3.0.0)",

diff --git a/ui/org.eclipse.pde.ui/META-INF/MANIFEST.MF b/ui/org.eclipse.pde.ui/META-INF/MANIFEST.MF
@@ -120,9 +120,9 @@ Require-Bundle:
  org.eclipse.equinox.security;bundle-version="[1.4.100,2.0.0)"
 Import-Package: aQute.bnd.build.model;version="[4.2.0,5.0.0)",
  aQute.bnd.header;version="[2.5.0,3.0.0)",
- aQute.bnd.osgi;version="[5.6.0,6.0.0)",
+ aQute.bnd.osgi;version="[5.6.0,8.0.0)",
  aQute.bnd.osgi.repository;version="[3.0.0,4.0.0)",
- aQute.bnd.osgi.resource;version="[4.3.0,5.0.0)",
+ aQute.bnd.osgi.resource;version="[4.3.0,6.0.0)",
  aQute.bnd.properties;version="[2.0.0,3.0.0)",
  aQute.bnd.version;version="[2.2.0,3.0.0)",
  org.eclipse.jdt.debug.ui.console,