Skip to content

Commit 0bc4894

Browse files
committed
Change Micro-Version schema in wrapped archetype artifacts to 100-steps
Before the Maven-archetype artifacts where obtained and wrapped in the TP, when they were embedded in a single 'o.e.m2e.archetype.common' bundle, said bundle had the version 3.2.104 and used 100er step as micro version where the hundreds matched the version of the original maven artifact's version. This schema should be preserved for now to not have back-steps in versions until the next minor of Maven archetype is available.
1 parent 32fb362 commit 0bc4894

File tree

2 files changed

+5
-4
lines changed

2 files changed

+5
-4
lines changed

org.eclipse.m2e.feature/build.properties

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,3 @@
1313
bin.includes = feature.xml,\
1414
feature.properties,\
1515
p2.inf
16-
pom.model.property.tycho.baseline.skip = true

target-platform/target-platform.target

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,8 @@
123123
Bundle-Name: M2Eclipse's ${mvnArtifactId}
124124
version: ${version_cleanup;${mvnVersion}}
125125
Bundle-SymbolicName: org.eclipse.m2e.archetype.common
126-
Bundle-Version: ${version}.1
126+
# Change the following value to '${version}' once the next minor version of archetype is availble
127+
Bundle-Version: ${versionmask;==;${version}}.104
127128
Bundle-Vendor: Eclipse.org - m2e
128129
Eclipse-ExtensibleAPI: true
129130
Export-Package: META-INF.plexus;-noimport:=true;x-internal:=true, \
@@ -157,9 +158,10 @@ Import-Package: org.jdom2*
157158
Bundle-Name: M2Eclipse's ${mvnArtifactId}
158159
version: ${version_cleanup;${mvnVersion}}
159160
Bundle-SymbolicName: org.eclipse.m2e.archetype.${replacestring;${mvnArtifactId};archetype-}
160-
Bundle-Version: ${version}.1
161+
# Change the following value to '${version}' once the next minor version of archetype is availble
162+
Bundle-Version: ${version}.2
161163
Bundle-Vendor: Eclipse.org - m2e
162-
Fragment-Host: org.eclipse.m2e.archetype.common;bundle-version="${range;[===,+);3.2.1}"
164+
Fragment-Host: org.eclipse.m2e.archetype.common;bundle-version="${range;[===,+);3.2.104}"
163165
Export-Package: org.apache.maven.*;-noimport:=true;provider=m2e;mandatory:=provider;version="${version}";x-friends:="org.eclipse.m2e.core.ui"
164166
Import-Package: !*
165167
]]></instructions>

0 commit comments

Comments
 (0)