P2Export: fix feature and bundle version qualifier

biz.aQute.bndlib/src/aQute/bnd/build/Project.java

@@ -2908,7 +2908,7 @@ public Container getDeliverable(String bsn, Map<String, String> attrs) throws Ex
 			for (Builder b : pb.getSubBuilders()) {
 				if (b.getBsn()
 					.equals(bsn)) {
-					String version = b.getVersion();
+					String version = getVersion(bsn).toString();
 					Container c = new Container(this, bsn, version, Container.TYPE.PROJECT, getOutputFile(bsn, version),
 						null, attrs, null);
 					return c;

biz.aQute.bndlib/src/aQute/bnd/osgi/Builder.java

@@ -470,38 +470,12 @@ public void analyze() throws Exception {
 		String version = getProperty(BUNDLE_VERSION);
 		if (version != null) {
 			version = cleanupVersion(version);
-			version = doSnapshot(version);
+			version = doSnapshot(version, getProperty(Constants.SNAPSHOT));
 			setProperty(BUNDLE_VERSION, version);
 		}
 	}
 
-	private String doSnapshot(String version) {
-		String snapshot = getProperty(SNAPSHOT);
-		if (snapshot == null) {
-			return version;
-		}
-		if (snapshot.isEmpty()) {
-			snapshot = null;
-		}
-		Version v = Version.parseVersion(version);
-		String q = v.getQualifier();
-		if (q == null) {
-			return version;
-		}
-		if (q.equals("SNAPSHOT")) {
-			q = snapshot;
-		} else if (q.endsWith("-SNAPSHOT")) {
-			int end = q.length() - "SNAPSHOT".length();
-			if (snapshot == null) {
-				q = q.substring(0, end - 1);
-			} else {
-				q = q.substring(0, end) + snapshot;
-			}
-		} else {
-			return version;
-		}
-		return new Version(v.getMajor(), v.getMinor(), v.getMicro(), q).toString();
-	}
+
 
 	public void cleanupVersion(Packages packages, String defaultVersion) {
 		cleanupVersion(packages, defaultVersion, "external");
@@ -2267,6 +2241,33 @@ private static boolean isIdentical(Resource a, Resource b) {
 		}
 	}
 
+	public static String doSnapshot(String version, String snapshot) {
+
+		if (snapshot == null) {
+			return version;
+		}
+		if (snapshot.isEmpty()) {
+			snapshot = null;
+		}
+		Version v = Version.parseVersion(version);
+		String q = v.getQualifier();
+		if (q == null) {
+			return version;
+		}
+		if (q.equals("SNAPSHOT")) {
+			q = snapshot;
+		} else if (q.endsWith("-SNAPSHOT")) {
+			int end = q.length() - "SNAPSHOT".length();
+			if (snapshot == null) {
+				q = q.substring(0, end - 1);
+			} else {
+				q = q.substring(0, end) + snapshot;
+			}
+		} else {
+			return version;
+		}
+		return new Version(v.getMajor(), v.getMinor(), v.getMicro(), q).toString();
+	}
 
 
 }

biz.aQute.repository/src/aQute/p2/export/P2Export.java

@@ -959,6 +959,7 @@ private BundleId getFeatureId(Processor definition) {
 			}
 		}
 
+		version = Builder.doSnapshot(version, definition.get(Constants.SNAPSHOT));
 		return getBundleId(featureName, version);
 	}
 

biz.aQute.repository/test/aQute/p2/export/P2PublisherTest.java

@@ -55,29 +55,29 @@ void testBasic() throws Exception {
 				Jar content = new Jar("content.jar", jar.getResource("content.jar")
 					.openInputStream());
 				Jar featureMain = new Jar("feature.jar",
-					jar.getResource("features/bndtools.main.feature_7.0.0.0000-SNAPSHOT.jar")
+					jar.getResource("features/bndtools.main.feature_7.0.0.0000-RC1.jar")
 					.openInputStream());
 				Jar featurePde = new Jar("feature.jar",
-					jar.getResource("features/bndtools.pde.feature_7.0.0.0000-SNAPSHOT.jar")
+					jar.getResource("features/bndtools.pde.feature_7.0.0.0000-RC1.jar")
 					.openInputStream())) {
 
 				Resource metainf = jar.getResource("META-INF/MANIFEST.MF");
 				assertNotNull(metainf);
 				// notice the timestamp portion 0000 which should be in
 				// MANIFEST.MF
-				assertEquals("7.0.0.0000-SNAPSHOT", jar.getManifest()
+				assertEquals("7.0.0.0000-RC1", jar.getManifest()
 					.getMainAttributes()
 					.getValue(Constants.BUNDLE_VERSION));
 
 				// but in pom.properties we want just
-				// 7.0.0-SNAPSHOT (without the timestamp 0000 portion)
+				// 7.0.0-RC1(without the timestamp 0000 portion)
 				Resource pomproperties = jar.getResource("META-INF/maven/org.bndtools/org.bndtools.p2/pom.properties");
 				assertNotNull(pomproperties);
 				try (InputStream is = pomproperties.openInputStream()) {
 					String pomprops = new String(is.readAllBytes());
 					assertThat(pomprops).contains("groupId=org.bndtools");
 					assertThat(pomprops).contains("artifactId=org.bndtools.p2");
-					assertThat(pomprops).contains("version=7.0.0-SNAPSHOT");
+					assertThat(pomprops).contains("version=7.0.0-RC1");
 				}
 
 				InputStream xmlArtifactsIs = artifacts.getResource("artifacts.xml")

biz.aQute.repository/testdata/p2-publish/ws-1/cnf/build.bnd

@@ -3,7 +3,9 @@
 		locations           ='${fileuri;${workspace}/cnf/repo/index.xml}'; \
 		name                ='P2'
 
-Bundle-Version 800
+-snapshot: RC1
+base.version:           7.0.0.0000
+Bundle-Version:         ${base.version}-SNAPSHOT
 
 
 -groupid:               org.bndtools

biz.aQute.repository/testdata/p2-publish/ws-1/p1/expected-feature.main.xml

@@ -1,4 +1,4 @@
-<feature id="bndtools.main.feature" version="7.0.0.0000-SNAPSHOT" label="Bndtools" provider-name="bnd">
+<feature id="bndtools.main.feature" version="7.0.0.0000-RC1" label="Bndtools" provider-name="bnd">
   <description url="https://bnd.bndtools.org/"><![CDATA[OSGi Development Tools for Eclipse based on bnd.]]></description>
   <copyright><![CDATA[Copyright bndtools]]></copyright>
   <license url="https://opensource.org/licenses/Apache-2.0"><![CDATA[SPDX-License-Identifier: (Apache-2.0 OR EPL-2.0)

biz.aQute.repository/testdata/p2-publish/ws-1/p1/expected-feature.pde.xml

@@ -1,4 +1,4 @@
-<feature id="bndtools.pde.feature" version="7.0.0.0000-SNAPSHOT" label="Bndtools PDE" provider-name="bnd">
+<feature id="bndtools.pde.feature" version="7.0.0.0000-RC1" label="Bndtools PDE" provider-name="bnd">
   <description url="https://bnd.bndtools.org/"><![CDATA[PDE integration for Bndtools]]></description>
   <copyright><![CDATA[Copyright bndtools]]></copyright>
   <license url="https://opensource.org/licenses/Apache-2.0"><![CDATA[Simple license description]]></license>
@@ -7,7 +7,7 @@
     <discovery url="https://bndtools.jfrog.io/bndtools/update-latest" label="Bndtools Update Site"/>
   </url>
   <requires>
-    <import feature="bndtools.main.feature.feature.group" version="7.0.0.0000-SNAPSHOT" match="perfect"/>
+    <import feature="bndtools.main.feature.feature.group" version="7.0.0.0000-RC1" match="perfect"/>
     <import feature="org.eclipse.pde.feature.group" version="3.14.1300" match="equivalent"/>
   </requires>
   <plugin id="bndtools.pde" version="[7.0.0.202306291715-SNAPSHOT,7.0.0.202306291715-SNAPSHOT]" unpack="false"/>

biz.aQute.repository/testdata/p2-publish/ws-1/p1/features.bnd

@@ -1,5 +1,4 @@
 Bundle-SymbolicName: org.bndtools.p2
-Bundle-Version  7.0.0.0000-SNAPSHOT
 Bundle-License:  \
     ASL-2.0;\
         file="license.txt";\