From 8fcf5185314936bb55c61ebb59d82181e6b1d032 Mon Sep 17 00:00:00 2001
From: rogierc <rogierc@teslanet.nl>
Date: Sat, 27 Jan 2024 14:52:46 +0100
Subject: [PATCH] pipeline

--HG--
branch : v300
---
 AgentDockerfile  |  4 +---
 Jenkinsfile      | 22 +++++++++++-----------
 README.md        | 26 ++++++++++++++++++++++----
 RELEASE_NOTES.md |  4 ++++
 pom.xml          |  7 ++++---
 5 files changed, 42 insertions(+), 21 deletions(-)

diff --git a/AgentDockerfile b/AgentDockerfile
index 4eda1f2..2e0df25 100644
--- a/AgentDockerfile
+++ b/AgentDockerfile
@@ -3,12 +3,10 @@ FROM maven:3.9.6-eclipse-temurin-8-alpine
 #add packages
 #libgcc adds cyphersuites not available in alpine by default
 #shadow adds useradd and groupadd
-RUN apk --update-cache add libgcc shadow git gpg gpg-agent && apk cache clean
+RUN apk --update-cache add libgcc shadow musl python3 mercurial gpg gpg-agent && apk cache clean
 
 ENV JENKINS_HOME /home/jenkins
 ENV JENKINS_KEYS /var/lib/jenkins_keys
-
-#set user
 ENV GNUPGHOME "${JENKINS_KEYS}/.gnupg"
 
 # Set user and group
diff --git a/Jenkinsfile b/Jenkinsfile
index 65700ee..d29a28f 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -15,7 +15,7 @@ pipeline
         dockerfile
         {
             filename 'AgentDockerfile'
-            args '--network sonar_network --volume jenkins_keys:/var/lib/jenkins_keys --volume "jenkinsagent_m2repo:/home/jenkins/.m2/repository' }
+            args '--network sonar_network --volume jenkins_keys:/var/lib/jenkins_keys --volume jenkinsagent_m2repo:/home/jenkins/.m2/repository --add-host $REPO_ALIAS' }
     }
     options
     { 
@@ -31,18 +31,18 @@ pipeline
             }
             steps
             {
-               sh '''
-                git config user.email "jenkins@teslanet.nl"
-                git config user.name "jenkins"
-                mvn -B -s $MVN_SETTINGS release:clean
-                '''
+ 				sh '''
+		            mvn --errors --batch-mode --settings $MVN_SETTINGS release:clean
+	            '''
             }
         }
         stage('build')
         {
             steps
             {
-                sh 'mvn -B -s $MVN_SETTINGS clean package -DskipTests'
+                sh '''
+                	mvn --errors --batch-mode --settings $MVN_SETTINGS clean package -DskipTests
+                '''
             }
         }
         stage('verify')
@@ -56,7 +56,7 @@ pipeline
             }
             steps
             {
-                sh 'mvn -B -s $MVN_SETTINGS verify sonar:sonar -Psonar'
+                sh 'mvn --errors --batch-mode --settings $MVN_SETTINGS verify sonar:sonar -Psonar'
             }
         }
         stage('verify and deploy')
@@ -67,7 +67,7 @@ pipeline
             }
              steps
             {
-                sh 'mvn -B -s $MVN_SETTINGS deploy sonar:sonar -Psonar'
+                sh 'mvn --errors --batch-mode --settings $MVN_SETTINGS deploy sonar:sonar -Psonar'
             }
         }
         stage('release-prepare')
@@ -78,7 +78,7 @@ pipeline
             }
             steps
             {
-               sh 'mvn -B -s $MVN_SETTINGS release:prepare'
+		   		sh 'mvn --errors --batch-mode --settings $MVN_SETTINGS release:prepare'
             }
         }
         stage('release-perform')
@@ -89,7 +89,7 @@ pipeline
             }
             steps
             {
-               sh 'mvn -B -s $MVN_SETTINGS release:perform'
+               sh 'mvn --errors --batch-mode --settings $MVN_SETTINGS release:perform'
             }
         }
     }
diff --git a/README.md b/README.md
index a018ded..6f23838 100644
--- a/README.md
+++ b/README.md
@@ -13,17 +13,21 @@ The complete Mule CoAP Connector documentation can be found at [Teslanet.nl](htt
 ## Mule supported versions
 * Mule 4.3+
 
-## Implemented CoAP specifications
-The CoAP protocol is supported as defined in:
+## The CoAP protocol
+The CoAP protocol is an Internet Standard published by [IETF](https://www.ietf.org/) in:
 
 * [IETF rfc 6690](https://www.rfc-editor.org/rfc/rfc6690)
 * [IETF rfc 7252](https://www.rfc-editor.org/rfc/rfc7252)
 * [IETF rfc 7641](https://www.rfc-editor.org/rfc/rfc7641)
 * [IETF rfc 7959](https://www.rfc-editor.org/rfc/rfc7959)
+* [IETF rfc 8132 ](https://www.rfc-editor.org/rfc/rfc8132)
+
+and other.
 
 ## Uses
 
-* [Californium](https://www.eclipse.org/californium/) 3.10.0
+* [Californium](https://www.eclipse.org/californium/) 2.8.0
+* [Californium](https://www.eclipse.org/californium/) 3.10.0 (development)
 
 ## Installation
 
@@ -35,7 +39,21 @@ add following dependency to your `pom.xml`:
     <dependency>
         <groupId>nl.teslanet.mule.connectors.coap</groupId>
         <artifactId>mule-coap-connector</artifactId>
-        <version>3.0.0-M1</version>
+        <version>2.1.1</version>
+        <classifier>mule-plugin</classifier>
+    </dependency>
+  
+```
+
+To use the latest development milestone, 
+add following dependency to your `pom.xml`:
+
+```xml
+  
+    <dependency>
+        <groupId>nl.teslanet.mule.connectors.coap</groupId>
+        <artifactId>mule-coap-connector</artifactId>
+        <version>3.0.0-M2</version>
         <classifier>mule-plugin</classifier>
     </dependency>
   
diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
index bbf7c89..0e2f977 100644
--- a/RELEASE_NOTES.md
+++ b/RELEASE_NOTES.md
@@ -1,6 +1,10 @@
 # Mule CoAP Connector Release Notes
 ![Mule-Coap logo](icon/icon.svg)
 
+## Development milestone 3.0.0-M2
+
+* Californium 3.10.0 upgrade 
+
 ## Release 2.1.1
 
 * Californium 2.8.0 update.
diff --git a/pom.xml b/pom.xml
index 5056292..f2bdb99 100644
--- a/pom.xml
+++ b/pom.xml
@@ -73,9 +73,9 @@
 	</properties>
 
 	<scm>
-		<connection>scm:git:https://github.com/teslanet-nl/mule-coap-connector.git</connection>
-		<developerConnection>scm:git:https://github.com/teslanet-nl/mule-coap-connector.git</developerConnection>
-		<url>https://github.com/teslanet-nl/mule-coap-connector/tree/main</url>
+		<connection>${mule-coap-connector.connection}</connection>
+		<developerConnection>${mule-coap-connector.developerConnection}</developerConnection>
+		<url>${mule-coap-connector.url}</url>
 		<tag>HEAD</tag>
 	</scm>
 
@@ -237,6 +237,7 @@ Contributors:
 				<version>2.5.3</version>
 				<configuration>
 					<username>${release.user}</username>
+					<password>${release.password}</password>
 					<autoVersionSubmodules>true</autoVersionSubmodules>
 					<useReleaseProfile>false</useReleaseProfile>
 					<releaseProfiles>release</releaseProfiles>