#183: Removed crutch for managing versions, now that we have a better…

… way to automate version management in CI/CD pipline using the buildhelper built in maven plugin
bbottema · Feb 12, 2019 · 7676c01 · 7676c01
1 parent 6146e80
commit 7676c01
Show file tree

Hide file tree

Showing 10 changed files with 25 additions and 28 deletions.
diff --git a/how to release.txt b/how to release.txt
@@ -10,13 +10,13 @@ That, or you can install one of the binaries to import the key, from here: https
 To release:
 
  1. update release notes and github readme page (don't commit)
- 2. remove SNAPSHOT version from the <library.version> property and execute "mvn versions:set -DgenerateBackupPoms=false"
+ 2. remove SNAPSHOT version from the <version> property
  4. mvn -DperformRelease=true clean deploy
             (set password in settings.xml or use local pgp key password, for which the public key must have been sent to a public key server,
             eg: gpg --keyserver hkp://keyserver.ubuntu.com --send-keys 05AC6403)
 		    server needed in settings.xml (see below)
  5. Go to https://oss.sonatype.org and release the artifact so it is submitted to Maven Central
- 6. add new SNAPSHOT version to the <library.version> property, execute "mvn versions:set -DgenerateBackupPoms=false" and commit everything
+ 6. add new SNAPSHOT version to the <version> property, execute and commit everything
 
 maven's settings.xml:
 

diff --git a/modules/authenticated-socks-module/pom.xml b/modules/authenticated-socks-module/pom.xml
@@ -23,7 +23,7 @@
         <dependency>
             <groupId>org.simplejavamail</groupId>
             <artifactId>core-module</artifactId>
-            <version>${library.version}</version>
+            <version>${project.version}</version>
         </dependency>
     </dependencies>
 

diff --git a/modules/cli-module/pom.xml b/modules/cli-module/pom.xml
@@ -23,7 +23,7 @@
         <dependency>
             <groupId>org.simplejavamail</groupId>
             <artifactId>simple-java-mail</artifactId>
-            <version>${library.version}</version>
+            <version>${project.version}</version>
             <scope>compile</scope>
         </dependency>
 
@@ -45,29 +45,29 @@
         <dependency>
             <groupId>org.simplejavamail</groupId>
             <artifactId>authenticated-socks-module</artifactId>
-            <version>${library.version}</version>
+            <version>${project.version}</version>
             <scope>runtime</scope>
             <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>org.simplejavamail</groupId>
             <artifactId>dkim-module</artifactId>
-            <version>${library.version}</version>
+            <version>${project.version}</version>
             <scope>runtime</scope>
             <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>org.simplejavamail</groupId>
             <artifactId>outlook-module</artifactId>
-            <version>${library.version}</version>
+            <version>${project.version}</version>
             <scope>runtime</scope>
         </dependency>
 
         <!-- test -->
         <dependency>
             <groupId>org.simplejavamail</groupId>
             <artifactId>core-test-module</artifactId>
-            <version>${library.version}</version>
+            <version>${project.version}</version>
             <scope>test</scope>
         </dependency>
     </dependencies>

diff --git a/modules/core-test-module/pom.xml b/modules/core-test-module/pom.xml
@@ -21,7 +21,7 @@
         <dependency>
             <groupId>org.simplejavamail</groupId>
             <artifactId>core-module</artifactId>
-            <version>${library.version}</version>
+            <version>${project.version}</version>
             <scope>compile</scope>
         </dependency>
     </dependencies>

diff --git a/modules/dkim-module/pom.xml b/modules/dkim-module/pom.xml
@@ -23,7 +23,7 @@
         <dependency>
             <groupId>org.simplejavamail</groupId>
             <artifactId>core-module</artifactId>
-            <version>${library.version}</version>
+            <version>${project.version}</version>
         </dependency>
 
         <!-- needed for dkim support -->

diff --git a/modules/jacoco-aggregator-module/pom.xml b/modules/jacoco-aggregator-module/pom.xml
@@ -19,49 +19,49 @@
 		<dependency>
 			<groupId>org.simplejavamail</groupId>
 			<artifactId>core-module</artifactId>
-			<version>${library.version}</version>
+			<version>${project.version}</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.simplejavamail</groupId>
 			<artifactId>core-test-module</artifactId>
-			<version>${library.version}</version>
+			<version>${project.version}</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.simplejavamail</groupId>
 			<artifactId>authenticated-socks-module</artifactId>
-			<version>${library.version}</version>
+			<version>${project.version}</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.simplejavamail</groupId>
 			<artifactId>dkim-module</artifactId>
-			<version>${library.version}</version>
+			<version>${project.version}</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.simplejavamail</groupId>
 			<artifactId>cli-module</artifactId>
-			<version>${library.version}</version>
+			<version>${project.version}</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.simplejavamail</groupId>
 			<artifactId>outlook-module</artifactId>
-			<version>${library.version}</version>
+			<version>${project.version}</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.simplejavamail</groupId>
 			<artifactId>simple-java-mail</artifactId>
-			<version>${library.version}</version>
+			<version>${project.version}</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.simplejavamail</groupId>
 			<artifactId>spring-module</artifactId>
-			<version>${library.version}</version>
+			<version>${project.version}</version>
 			<scope>compile</scope>
 		</dependency>
 	</dependencies>

diff --git a/modules/outlook-module/pom.xml b/modules/outlook-module/pom.xml
@@ -23,7 +23,7 @@
         <dependency>
             <groupId>org.simplejavamail</groupId>
             <artifactId>core-module</artifactId>
-            <version>${library.version}</version>
+            <version>${project.version}</version>
             <scope>compile</scope>
         </dependency>
 

diff --git a/modules/simple-java-mail/pom.xml b/modules/simple-java-mail/pom.xml
@@ -27,35 +27,35 @@
         <dependency>
             <groupId>org.simplejavamail</groupId>
             <artifactId>core-module</artifactId>
-            <version>${library.version}</version>
+            <version>${project.version}</version>
             <scope>compile</scope>
         </dependency>
 
         <!-- optional support modules -->
         <dependency>
             <groupId>org.simplejavamail</groupId>
             <artifactId>authenticated-socks-module</artifactId>
-            <version>${library.version}</version>
+            <version>${project.version}</version>
             <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>org.simplejavamail</groupId>
             <artifactId>dkim-module</artifactId>
-            <version>${library.version}</version>
+            <version>${project.version}</version>
             <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>org.simplejavamail</groupId>
             <artifactId>outlook-module</artifactId>
-            <version>${library.version}</version>
+            <version>${project.version}</version>
             <optional>true</optional>
         </dependency>
 
         <!-- testing -->
         <dependency>
             <groupId>org.simplejavamail</groupId>
             <artifactId>core-test-module</artifactId>
-            <version>${library.version}</version>
+            <version>${project.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>

diff --git a/modules/spring-module/pom.xml b/modules/spring-module/pom.xml
@@ -27,7 +27,7 @@
         <dependency>
             <groupId>org.simplejavamail</groupId>
             <artifactId>simple-java-mail</artifactId>
-            <version>${library.version}</version>
+            <version>${project.version}</version>
         </dependency>
 
         <!-- spring support (optional) -->

diff --git a/pom.xml b/pom.xml
@@ -6,14 +6,12 @@
     <groupId>org.simplejavamail</groupId>
     <artifactId>maven-master-project</artifactId>
     <packaging>pom</packaging>
-    <!-- update by fixing library.version and then "mvn versions:set" -->
     <version>6.0.0.beta-SNAPSHOT.2</version>
 
     <name>Simple Java Mail - Maven master project</name>
     <url>http://www.simplejavamail.org/</url>
 
     <properties>
-        <library.version>6.0.0.beta-SNAPSHOT.2</library.version>
         <java.version>1.7</java.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <compiler.encoding>UTF-8</compiler.encoding>
@@ -22,7 +20,6 @@
         <log4j-slf4j-impl.version>2.6.1</log4j-slf4j-impl.version>
         <log4j-api.version>2.6.1</log4j-api.version>
         <log4j-core.version>2.6.1</log4j-core.version>
-        <newVersion>${library.version}</newVersion> <!-- used by the maven versions plugins when updating all modules at once -->
     </properties>
 
     <licenses>