From 5b9cc4a2a5fe84979f079937ba25528c01e563ac Mon Sep 17 00:00:00 2001 From: Maciej Lew Date: Wed, 30 Oct 2024 08:54:52 +0100 Subject: [PATCH 1/6] [maven-release-plugin] prepare for next development iteration --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 440d15c..8660b9e 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ pl.smsapi smsapi-lib jar - 3.0.0 + 3.0.1-SNAPSHOT smsapi-lib http://www.smsapi.pl/ SMSAPI client library @@ -12,7 +12,7 @@ https://github.com/smsapi/smsapi-java-client.git scm:git:ssh://git@github.com/smsapi/smsapi-java-client.git scm:git:ssh://git@github.com/smsapi/smsapi-java-client.git - v3.0.0 + v3.0.0-RC13 From 60e0a85149c628c4448587f59840fff36399f29c Mon Sep 17 00:00:00 2001 From: Maciej Lew Date: Wed, 30 Oct 2024 08:59:37 +0100 Subject: [PATCH 2/6] Adds v3.0.0 changelog entry --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6e1bb68..3ef40ce 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,8 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) a ## [Unreleased] +## [3.0.0] - 2024-10-30 + ## [3.0.0-RC17] - 2024-10-29 ### Changed - `pl.smsapi.api.action.subusers.SubuserAdd` and `pl.smsapi.api.action.subusers.SubuserEdit` actions setters, fluent interface added From 90724437528093636f141946d3d2da33e1797526 Mon Sep 17 00:00:00 2001 From: Maciej Lew Date: Wed, 30 Oct 2024 09:09:31 +0100 Subject: [PATCH 3/6] Adds v3.0.0 readme entry --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index c72bd35..c9b6cad 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,7 @@ Add following in your project **pom.xml** file: pl.smsapi smsapi-lib - 3.0.0-RC15 + 3.0.0 ``` From d3d37213649321e72a563ee20541310ac2d2851f Mon Sep 17 00:00:00 2001 From: Maciej Lew Date: Thu, 14 Nov 2024 13:07:29 +0100 Subject: [PATCH 4/6] Fixes User-Agent header --- CHANGELOG.md | 2 ++ pom.xml | 22 ++++++++++++++----- .../java/pl/smsapi/proxy/ProxyNative.java | 19 ++++++++++------ .../smsapi-java-client.properties | 1 + 4 files changed, 32 insertions(+), 12 deletions(-) create mode 100644 src/main/resources-filtered/smsapi-java-client.properties diff --git a/CHANGELOG.md b/CHANGELOG.md index 3ef40ce..6f67a99 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,8 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html). ## [Unreleased] +### Fixed +- User-Agent header ## [3.0.0] - 2024-10-30 diff --git a/pom.xml b/pom.xml index 8660b9e..5a71c80 100644 --- a/pom.xml +++ b/pom.xml @@ -45,11 +45,6 @@ commons-codec 1.10 - - org.apache.maven - maven-model - 3.9.8 - @@ -67,6 +62,14 @@ + + + + src/main/resources-filtered + true + + + @@ -150,6 +153,15 @@ + + org.apache.maven.plugins + maven-resources-plugin + 3.3.1 + + ISO-8859-1 + + + diff --git a/src/main/java/pl/smsapi/proxy/ProxyNative.java b/src/main/java/pl/smsapi/proxy/ProxyNative.java index e0d7a88..926b601 100644 --- a/src/main/java/pl/smsapi/proxy/ProxyNative.java +++ b/src/main/java/pl/smsapi/proxy/ProxyNative.java @@ -1,8 +1,5 @@ package pl.smsapi.proxy; -import org.apache.maven.model.Model; -import org.apache.maven.model.io.xpp3.MavenXpp3Reader; -import org.codehaus.plexus.util.xml.pull.XmlPullParserException; import pl.smsapi.api.authenticationStrategy.AuthenticationStrategy; import pl.smsapi.exception.ProxyException; @@ -89,11 +86,19 @@ public String execute(String endpoint, Map data, Map Date: Mon, 18 Nov 2024 13:20:07 +0100 Subject: [PATCH 5/6] Prepares for 3.0.1 release --- CHANGELOG.md | 2 ++ README.md | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6f67a99..9d06621 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,8 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html). ## [Unreleased] + +## [3.0.1] - 2024-11-18 ### Fixed - User-Agent header diff --git a/README.md b/README.md index c9b6cad..b2770ad 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,7 @@ Add following in your project **pom.xml** file: pl.smsapi smsapi-lib - 3.0.0 + 3.0.1 ``` From 16bd610f102d272c67440c50dab910defee8a685 Mon Sep 17 00:00:00 2001 From: Maciej Lew Date: Mon, 18 Nov 2024 13:21:12 +0100 Subject: [PATCH 6/6] [maven-release-plugin] prepare release v3.0.1 --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 5a71c80..ef96498 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ pl.smsapi smsapi-lib jar - 3.0.1-SNAPSHOT + 3.0.1 smsapi-lib http://www.smsapi.pl/ SMSAPI client library @@ -12,7 +12,7 @@ https://github.com/smsapi/smsapi-java-client.git scm:git:ssh://git@github.com/smsapi/smsapi-java-client.git scm:git:ssh://git@github.com/smsapi/smsapi-java-client.git - v3.0.0-RC13 + v3.0.1