Merge pull request #246 from LorenzoBettini/version-update-experiments

Version update experiments
LorenzoBettini · Sep 3, 2020 · f0523c1 · f0523c1
2 parents 1b3d775 + 358e381
commit f0523c1
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 7 deletions.
diff --git a/edelta.parent/edelta.bom/pom.xml b/edelta.parent/edelta.bom/pom.xml
@@ -2,15 +2,18 @@
   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>
+  <groupId>io.github.lorenzobettini.edelta</groupId>
+  <artifactId>edelta.bom</artifactId>
+  <version>2.0.1-SNAPSHOT</version>
+  <!-- IMPORTANT: the parent's version (unrelated to this artifact's version) 
+    must come after this artifact's version to make the increment_version.ant behave 
+    correctly. -->
   <parent>
     <groupId>io.github.lorenzobettini.xtextutils</groupId>
     <artifactId>xtext-tycho-parent</artifactId>
     <version>0.2.2</version>
     <relativePath></relativePath>
   </parent>
-  <groupId>io.github.lorenzobettini.edelta</groupId>
-  <artifactId>edelta.bom</artifactId>
-  <version>2.0.1-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <name>Edelta BOM</name>

diff --git a/edelta.parent/releng/releasing/increment_versions.ant b/edelta.parent/releng/releasing/increment_versions.ant
@@ -1,9 +1,25 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <project name="IncrementVersionsTask" basedir="." default="set-version">
 
-	<!-- Make sure this points to the root folder of your project -->
+	<!-- IMPORTANT: Make sure this points to the root folder of your project -->
 	<property name="WORKSPACE" location="${ant.file}/../../../" />
 
+	<!--
+		IMPORTANT: this will update the first occurrence of <version> in POMs,
+		so if one of your POM inherits from an external parent with an unrelated number
+		make sure the <parent> part comes after the <version> part of the POM
+		you want to update. For example,
+		
+		<groupId>your group id</groupId>
+		<artifactId>your artifact id</artifactId>
+		<version>the version you want to update</version>
+		<parent>
+			<groupId>external parent group id</groupId>
+			<artifactId>external parent artifact id</artifactId>
+			<version>external parent version that must not be updated</version>
+		</parent>
+	-->
+
 	<!--Set these properties manually when increasing versions -->
 	<property name="version.major" value="2" />
 	<property name="version.minor" value="0" />

diff --git a/edelta.parent/releng/releasing/release.properties b/edelta.parent/releng/releasing/release.properties
@@ -1,5 +1,5 @@
 #Build version
-#Thu, 03 Sep 2020 10:15:15 +0200
+#Thu, 03 Sep 2020 14:45:00 +0200
 
 version_main=2.0.1
 version_osgi=2.0.1.qualifier

diff --git a/edelta.parent/set-version.txt b/edelta.parent/set-version.txt
@@ -1,8 +1,7 @@
 # setting the version in pom.xml and MANIFEST.MF files
 # From the root folder
 
-# NOTE: If you use the increment_version.ant file, then remember that it will
-# update the very first version encountered: this breaks the edelta.bom
+# NOTE: better to use the increment_version.ant file
 
 ./mvnw -f edelta.parent/edelta.bom/pom.xml \
     versions:set -DnewVersion=2.0.0-SNAPSHOT \