You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ro...@apache.org on 2022/08/30 11:57:04 UTC
[qpid-jms] branch 1.x updated (aee9993d -> 20c27842)
This is an automated email from the ASF dual-hosted git repository.
robbie pushed a change to branch 1.x
in repository https://gitbox.apache.org/repos/asf/qpid-jms.git
from aee9993d QPIDJMS-570: Update to Netty 4.1.78 (and to netty-tcnative 2.0.53 test dep)
new 68ecb7a3 QPIDJMS-572 Ensure that readable buffer string read consumes the bytes
new baeb13d7 NO-JIRA: update xcode version to one using JDK17, remove linux dist and use [same] default
new f0a3b00e NO-JIRA: update GHA env target, older one is now headed for removal
new 209f5e88 NO-JIRA: add workflow_dispatch trigger to GHA config
new d6ae7390 QPIDJMS-576: update to apache parent pom 27
new 20c27842 QPIDJMS-576: actually, you know, update to apache parent pom 27
The 6 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.github/workflows/build.yml | 4 ++--
.travis.yml | 3 +--
pom.xml | 11 +++--------
.../qpid/jms/provider/amqp/message/AmqpReadableBuffer.java | 4 ++--
.../jms/provider/amqp/message/AmqpReadableBufferTest.java | 2 ++
5 files changed, 10 insertions(+), 14 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org
[qpid-jms] 06/06: QPIDJMS-576: actually, you know, update to apache parent pom 27
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
robbie pushed a commit to branch 1.x
in repository https://gitbox.apache.org/repos/asf/qpid-jms.git
commit 20c27842ac677893161c4052a7fdd7daee9f4dc5
Author: Robbie Gemmell <ro...@apache.org>
AuthorDate: Tue Aug 30 12:31:03 2022 +0100
QPIDJMS-576: actually, you know, update to apache parent pom 27
(cherry picked from commit 5dc4ed94c73631e32e9daaac27156dd8c424c6a5)
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index fa40b716..9562318a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.apache</groupId>
<artifactId>apache</artifactId>
- <version>23</version>
+ <version>27</version>
</parent>
<modelVersion>4.0.0</modelVersion>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org
[qpid-jms] 05/06: QPIDJMS-576: update to apache parent pom 27
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
robbie pushed a commit to branch 1.x
in repository https://gitbox.apache.org/repos/asf/qpid-jms.git
commit d6ae7390774eb03cfe95ad5721777376f1584d5f
Author: Robbie Gemmell <ro...@apache.org>
AuthorDate: Tue Aug 30 12:30:53 2022 +0100
QPIDJMS-576: update to apache parent pom 27
(cherry picked from commit 3ba4cbe828e74aa4008563efe094b7518eecc01d)
---
pom.xml | 9 ++-------
1 file changed, 2 insertions(+), 7 deletions(-)
diff --git a/pom.xml b/pom.xml
index 558865cd..fa40b716 100644
--- a/pom.xml
+++ b/pom.xml
@@ -60,15 +60,15 @@
<maven-eclipse-plugin-version>2.10</maven-eclipse-plugin-version>
<maven-idea-plugin-version>2.5</maven-idea-plugin-version>
<maven-bundle-plugin-version>5.1.2</maven-bundle-plugin-version>
- <maven-enforcer-plugin-version>3.0.0-M3</maven-enforcer-plugin-version>
<findbugs-maven-plugin-version>3.0.2</findbugs-maven-plugin-version>
<jacoco-plugin-version>0.8.6</jacoco-plugin-version>
- <surefire.version>2.22.2</surefire.version>
<maven.compiler.source>11</maven.compiler.source>
<maven.compiler.target>11</maven.compiler.target>
<maven.compiler.release>11</maven.compiler.release>
+ <project.build.outputTimestamp>2022-08-29T15:38:01Z</project.build.outputTimestamp>
+
<!-- Test properties -->
<maven.test.redirectTestOutputToFile>true</maven.test.redirectTestOutputToFile>
<surefire.runOrder>filesystem</surefire.runOrder>
@@ -297,11 +297,6 @@
<downloadJavadocs>true</downloadJavadocs>
</configuration>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-enforcer-plugin</artifactId>
- <version>${maven-enforcer-plugin-version}</version>
- </plugin>
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org
[qpid-jms] 03/06: NO-JIRA: update GHA env target, older one is now headed for removal
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
robbie pushed a commit to branch 1.x
in repository https://gitbox.apache.org/repos/asf/qpid-jms.git
commit f0a3b00ed48f7f337d514f6b72c9d6119680b7be
Author: Robbie Gemmell <ro...@apache.org>
AuthorDate: Tue Aug 30 12:30:31 2022 +0100
NO-JIRA: update GHA env target, older one is now headed for removal
(cherry picked from commit 929e00358f01462d57dea0ee52501f511f7f5907)
---
.github/workflows/build.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index a8cc5e80..d504d700 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -4,7 +4,7 @@ on: [push, pull_request]
jobs:
build:
- runs-on: ubuntu-18.04
+ runs-on: ubuntu-20.04
strategy:
fail-fast: false
matrix:
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org
[qpid-jms] 01/06: QPIDJMS-572 Ensure that readable buffer string read consumes the bytes
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
robbie pushed a commit to branch 1.x
in repository https://gitbox.apache.org/repos/asf/qpid-jms.git
commit 68ecb7a3e36f2d17b7b17fed33ba607591ed4209
Author: Timothy Bish <ta...@gmail.com>
AuthorDate: Thu Jul 7 15:06:52 2022 -0400
QPIDJMS-572 Ensure that readable buffer string read consumes the bytes
Ensures that when reading a string the readable buffer consumes the
bytes by advancing the read index as defined in the interface API docs.
(cherry picked from commit f7564d558dfc364284b1bd099242d044d422514c)
---
.../org/apache/qpid/jms/provider/amqp/message/AmqpReadableBuffer.java | 4 ++--
.../apache/qpid/jms/provider/amqp/message/AmqpReadableBufferTest.java | 2 ++
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/message/AmqpReadableBuffer.java b/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/message/AmqpReadableBuffer.java
index 6ae43bbf..828fd18f 100644
--- a/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/message/AmqpReadableBuffer.java
+++ b/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/message/AmqpReadableBuffer.java
@@ -209,11 +209,11 @@ public class AmqpReadableBuffer implements ReadableBuffer {
@Override
public String readUTF8() throws CharacterCodingException {
- return buffer.toString(StandardCharsets.UTF_8);
+ return buffer.readCharSequence(buffer.readableBytes(), StandardCharsets.UTF_8).toString();
}
@Override
public String readString(CharsetDecoder decoder) throws CharacterCodingException {
- return buffer.toString(StandardCharsets.UTF_8);
+ return buffer.readCharSequence(buffer.readableBytes(), decoder.charset()).toString();
}
}
diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/provider/amqp/message/AmqpReadableBufferTest.java b/qpid-jms-client/src/test/java/org/apache/qpid/jms/provider/amqp/message/AmqpReadableBufferTest.java
index fc5c99f3..3eaa130d 100644
--- a/qpid-jms-client/src/test/java/org/apache/qpid/jms/provider/amqp/message/AmqpReadableBufferTest.java
+++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/provider/amqp/message/AmqpReadableBufferTest.java
@@ -444,6 +444,7 @@ public class AmqpReadableBufferTest {
AmqpReadableBuffer buffer = new AmqpReadableBuffer(byteBuffer);
assertEquals(testString, buffer.readUTF8());
+ assertFalse(buffer.hasRemaining());
}
@Test
@@ -455,5 +456,6 @@ public class AmqpReadableBufferTest {
AmqpReadableBuffer buffer = new AmqpReadableBuffer(byteBuffer);
assertEquals(testString, buffer.readString(StandardCharsets.UTF_8.newDecoder()));
+ assertFalse(buffer.hasRemaining());
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org
[qpid-jms] 02/06: NO-JIRA: update xcode version to one using JDK17, remove linux dist and use [same] default
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
robbie pushed a commit to branch 1.x
in repository https://gitbox.apache.org/repos/asf/qpid-jms.git
commit baeb13d7c38453e6ed7d009d39dd07be3bb9f029
Author: Robbie Gemmell <ro...@apache.org>
AuthorDate: Tue Aug 30 12:30:20 2022 +0100
NO-JIRA: update xcode version to one using JDK17, remove linux dist and use [same] default
(cherry picked from commit 50dcd0fc2c377ec50c1de23a3f9747268de3b953)
---
.travis.yml | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index dea183ad..1ad51b93 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,9 +3,8 @@ matrix:
include:
- os: linux
jdk: openjdk11
- dist: xenial
- os: osx
- osx_image: xcode12.5
+ osx_image: xcode13.1
cache:
directories:
- $HOME/.m2
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org
[qpid-jms] 04/06: NO-JIRA: add workflow_dispatch trigger to GHA config
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
robbie pushed a commit to branch 1.x
in repository https://gitbox.apache.org/repos/asf/qpid-jms.git
commit 209f5e88f86765f9afe14f7ae0c51d7111acde46
Author: Robbie Gemmell <ro...@apache.org>
AuthorDate: Tue Aug 30 12:30:44 2022 +0100
NO-JIRA: add workflow_dispatch trigger to GHA config
(cherry picked from commit a080f5c5edf910f73a7e7d6448c9038ce61ee1bb)
---
.github/workflows/build.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index d504d700..516447d2 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -1,6 +1,6 @@
name: "Build"
-on: [push, pull_request]
+on: [push, pull_request, workflow_dispatch]
jobs:
build:
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org