From 582c4841fc997204f97c77d8f3585a235860922a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jorge=20Sol=C3=B3rzano?= <jorsol@gmail.com>
Date: Wed, 26 Jun 2024 00:50:00 +0000
Subject: [PATCH] release: scram 3.1
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Jorge Solórzano <jorsol@gmail.com>
---
 CHANGELOG.md                                  | 49 +++++--------------
 coverage-report/pom.xml                       |  2 +-
 pom.xml                                       |  2 +-
 scram-client/pom.xml                          |  2 +-
 scram-client/src/it/jpms-scram-client/pom.xml |  2 +-
 scram-common/pom.xml                          |  2 +-
 scram-parent/pom.xml                          | 15 +++---
 7 files changed, 25 insertions(+), 49 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 97acfde..05cd63c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,10 +2,18 @@
 All notable changes to this project will be documented in this file.
 
 ## [Unreleased]
+
+## [3.1] - 2024-06-26
 ### :building_construction: Improvements
-- Ensure the LICENSE file is included in the Jar file.
+- Ensure the `LICENSE` file is included in the Jar file.
+- Update of the `saslprep` dependency to 2.2.
+
+### :ghost: Maintenance
+- Added coverage report module.
+- Updated dependencies and maven plugins.
+- Remove `nexus-staging-maven-plugin`.
 
-## 3.0 - 2024-04-03
+## [3.0] - 2024-04-03
 ### :boom: Breaking changes
 - :warning: Full refactor of the `scram` java implementation, this release is compatible with Java 8+, but it's incompatible with previous releases :warning:
 
@@ -28,37 +36,6 @@ All notable changes to this project will be documented in this file.
 - Migrate the main repo back to GitHub.
 - Remove the shaded Bouncy Castle pbkdf2 and base64 implementation used for Java 7 support.
 
-# 2.1
-
-* Updated saslprep to version 1.1 to remove a build dependency coming from stringprep module
-
-# 2.0
-
-* Out of beta testing
-
-# 2.0-beta3
-
-* Fixed licenses issues
-
-# 2.0-beta2
-
-* Added saslprep tests
-
-# 2.0-beta1
-
-* Add new dependency StringPrep
-
-# 1.9-beta1
-
-* API change to be compatible with Java 7
-* Added standard SASLPrep
-* Failover to bouncy castle implementation of PBKDF2WithHmacSHA256 to support Oracle JDK 7
-
-# 1.0.0-beta.2
-
-* Fix maven issue and javadoc
-
-# 1.0.0-beta.1
-
-* First version
-
+[3.0]: https://github.com/ongres/scram/compare/2.1...3.0
+[3.1]: https://github.com/ongres/scram/compare/3.0...3.1
+[Unreleased]: https://github.com/ongres/scram/compare/3.1...main
diff --git a/coverage-report/pom.xml b/coverage-report/pom.xml
index 283b62e..79b4983 100644
--- a/coverage-report/pom.xml
+++ b/coverage-report/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.ongres.scram</groupId>
     <artifactId>scram-parent</artifactId>
-    <version>3.1-SNAPSHOT</version>
+    <version>3.1</version>
     <relativePath>../scram-parent/pom.xml</relativePath>
   </parent>
 
diff --git a/pom.xml b/pom.xml
index 0afca1d..cd8688f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.ongres.scram</groupId>
     <artifactId>scram-parent</artifactId>
-    <version>3.1-SNAPSHOT</version>
+    <version>3.1</version>
     <relativePath>scram-parent/pom.xml</relativePath>
   </parent>
 
diff --git a/scram-client/pom.xml b/scram-client/pom.xml
index 280e2ae..fc22968 100644
--- a/scram-client/pom.xml
+++ b/scram-client/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.ongres.scram</groupId>
     <artifactId>scram-parent</artifactId>
-    <version>3.1-SNAPSHOT</version>
+    <version>3.1</version>
     <relativePath>../scram-parent/pom.xml</relativePath>
   </parent>
 
diff --git a/scram-client/src/it/jpms-scram-client/pom.xml b/scram-client/src/it/jpms-scram-client/pom.xml
index d696d75..9ae1558 100644
--- a/scram-client/src/it/jpms-scram-client/pom.xml
+++ b/scram-client/src/it/jpms-scram-client/pom.xml
@@ -7,7 +7,7 @@
   <groupId>com.ongres.scram.it</groupId>
   <artifactId>jpms-scram-client</artifactId>
   <name>JPMS Scram Client</name>
-  <version>3.1-SNAPSHOT</version>
+  <version>3.1</version>
 
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
diff --git a/scram-common/pom.xml b/scram-common/pom.xml
index 2a1120a..3ddcad9 100644
--- a/scram-common/pom.xml
+++ b/scram-common/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.ongres.scram</groupId>
     <artifactId>scram-parent</artifactId>
-    <version>3.1-SNAPSHOT</version>
+    <version>3.1</version>
     <relativePath>../scram-parent/pom.xml</relativePath>
   </parent>
 
diff --git a/scram-parent/pom.xml b/scram-parent/pom.xml
index 89f5e31..77346b5 100644
--- a/scram-parent/pom.xml
+++ b/scram-parent/pom.xml
@@ -4,7 +4,7 @@
 
   <groupId>com.ongres.scram</groupId>
   <artifactId>scram-parent</artifactId>
-  <version>3.1-SNAPSHOT</version>
+  <version>3.1</version>
   <packaging>pom</packaging>
 
   <name>SCRAM - Parent</name>
@@ -44,6 +44,7 @@
   <scm child.scm.connection.inherit.append.path="false" child.scm.developerConnection.inherit.append.path="false" child.scm.url.inherit.append.path="false">
     <connection>scm:git:https://github.com/ongres/scram.git</connection>
     <developerConnection>scm:git:git@github.com:ongres/scram.git</developerConnection>
+    <tag>3.1</tag>
     <url>https://github.com/ongres/scram</url>
   </scm>
 
@@ -54,12 +55,12 @@
 
   <distributionManagement>
     <repository>
-      <id>ossrh-release</id>
+      <id>ossrh</id>
       <name>OSSRH Release repository</name>
       <url>https://oss.sonatype.org/service/local/staging/deploy/maven2</url>
     </repository>
     <snapshotRepository>
-      <id>ossrh-snapshot</id>
+      <id>ossrh</id>
       <name>OSSRH Snapshot repository</name>
       <url>https://oss.sonatype.org/content/repositories/snapshots</url>
     </snapshotRepository>
@@ -71,11 +72,11 @@
     <base.java.version>8</base.java.version>
     <maven.compiler.source>${base.java.version}</maven.compiler.source>
     <maven.compiler.target>${base.java.version}</maven.compiler.target>
-    <project.build.outputTimestamp>2024-04-03T17:00:00Z</project.build.outputTimestamp>
+    <project.build.outputTimestamp>2024-06-26T00:50:00Z</project.build.outputTimestamp>
     <!-- Dependency versions -->
     <jetbrains-annotations.version>24.1.0</jetbrains-annotations.version>
     <junit5.version>5.10.2</junit5.version>
-    <saslprep.version>2.1</saslprep.version>
+    <saslprep.version>2.2</saslprep.version>
     <!-- Plugins versions -->
     <compiler-plugin.version>3.13.0</compiler-plugin.version>
     <jar-plugin.version>3.4.2</jar-plugin.version>
@@ -486,9 +487,7 @@
               <compilerArgs>
                 <arg>-Xlint:all</arg>
                 <arg>-XDcompilePolicy=simple</arg>
-                <arg>-Xplugin:ErrorProne \
-                  -XepAllErrorsAsWarnings \
-                  -XepDisableWarningsInGeneratedCode</arg>
+                <arg>-Xplugin:ErrorProne -XepAllErrorsAsWarnings -XepDisableWarningsInGeneratedCode</arg>
                 <!-- Required on JDK 16+ due to JEP 396 -->
                 <arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED</arg>
                 <arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED</arg>