diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index dd086b7e..d911e712 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -14,12 +14,12 @@ jobs: java: [ 8, 11, 17 ] steps: - name: Check out code - uses: actions/checkout@v4.2.0 + uses: actions/checkout@v5.0.0 with: fetch-depth: 0 - name: Setup Java ${{ matrix.java }} - uses: actions/setup-java@v4.4.0 + uses: actions/setup-java@v5.0.0 with: distribution: temurin java-version: ${{ matrix.java }} diff --git a/.github/workflows/release-drafter.yml b/.github/workflows/release-drafter.yml index f45319c2..78a0ff64 100644 --- a/.github/workflows/release-drafter.yml +++ b/.github/workflows/release-drafter.yml @@ -14,7 +14,7 @@ jobs: contents: write # for release-drafter to create a GitHub release runs-on: ubuntu-latest steps: - - uses: release-drafter/release-drafter@v6.0.0 + - uses: release-drafter/release-drafter@v6.1.0 with: config-name: release-drafter-master.yml env: diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index e78829c3..64744d20 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -9,10 +9,10 @@ jobs: runs-on: ubuntu-latest steps: - name: Check out code - uses: actions/checkout@v4.2.0 + uses: actions/checkout@v5.0.0 - name: Set up Java - uses: actions/setup-java@v4.4.0 + uses: actions/setup-java@v5.0.0 with: java-version: 8 distribution: temurin @@ -40,7 +40,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Check out code - uses: actions/checkout@v4.2.0 + uses: actions/checkout@v5.0.0 with: ref: master fetch-depth: 0 @@ -55,7 +55,7 @@ jobs: run: git diff - name: Create Pull Request - uses: peter-evans/create-pull-request@v7.0.5 + uses: peter-evans/create-pull-request@v7.0.8 with: commit-message: Update versions to ${{ github.event.release.tag_name }} title: Update versions to ${{ github.event.release.tag_name }} diff --git a/pom.xml b/pom.xml index ba5a4425..762d25f1 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ org.asteriskjava asterisk-java - 3.41.0 + 3.42.0-SNAPSHOT Asterisk-Java The free Java library for Asterisk PBX integration. @@ -80,7 +80,7 @@ scm:git:git@github.com:asterisk-java/asterisk-java.git scm:git:git@github.com:asterisk-java/asterisk-java.git https://github.com/asterisk-java/asterisk-java - 3.41.0 + HEAD @@ -96,20 +96,12 @@ org.slf4j slf4j-api - 2.0.16 - compile - - - org.slf4j - slf4j-simple - 2.0.16 - test + 2.0.17 org.apache.logging.log4j log4j-core - 2.24.1 - provided + 2.24.3 org.reflections @@ -120,13 +112,13 @@ org.junit.jupiter junit-jupiter - 5.11.1 + 5.12.0 test org.assertj assertj-core - 3.26.3 + 3.27.3 test @@ -135,6 +127,12 @@ 4.10.0 test + + org.slf4j + slf4j-simple + 2.0.17 + test + @@ -178,7 +176,7 @@ org.apache.maven.plugins maven-compiler-plugin - 3.13.0 + 3.14.0 1.8 1.8 @@ -187,7 +185,7 @@ org.apache.maven.plugins maven-surefire-plugin - 3.5.0 + 3.5.4 org.apache.maven.plugins @@ -233,7 +231,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.10.1 + 3.11.2 attach-javadocs @@ -270,7 +268,7 @@ org.apache.maven.plugins maven-gpg-plugin - 3.2.7 + 3.2.8 sign-artifacts diff --git a/src/main/java/org/asteriskjava/manager/event/QueueMemberAddedEvent.java b/src/main/java/org/asteriskjava/manager/event/QueueMemberAddedEvent.java index b4644cc1..9bf217bc 100644 --- a/src/main/java/org/asteriskjava/manager/event/QueueMemberAddedEvent.java +++ b/src/main/java/org/asteriskjava/manager/event/QueueMemberAddedEvent.java @@ -40,6 +40,9 @@ public class QueueMemberAddedEvent extends AbstractQueueMemberEvent { private String stateinterface; private Boolean ringinuse; + private Integer logintime; + private Integer wrapuptime; + private Integer lastpause; public QueueMemberAddedEvent(Object source) { super(source); @@ -192,4 +195,28 @@ public Boolean getRinginuse() { public void setRinginuse(Boolean ringinuse) { this.ringinuse = ringinuse; } + + public Integer getLoginTime() { + return logintime; + } + + public void setLoginTime(Integer logintime) { + this.logintime = logintime; + } + + public Integer getWrapupTime() { + return wrapuptime; + } + + public void setWrapupTime(Integer wrapuptime) { + this.wrapuptime = wrapuptime; + } + + public Integer getLastPause() { + return lastpause; + } + + public void setLastPause(Integer lastpause) { + this.lastpause = lastpause; + } } diff --git a/src/main/java/org/asteriskjava/manager/event/QueueMemberRemovedEvent.java b/src/main/java/org/asteriskjava/manager/event/QueueMemberRemovedEvent.java index d03a4e88..9d9da69b 100644 --- a/src/main/java/org/asteriskjava/manager/event/QueueMemberRemovedEvent.java +++ b/src/main/java/org/asteriskjava/manager/event/QueueMemberRemovedEvent.java @@ -40,6 +40,9 @@ public class QueueMemberRemovedEvent extends AbstractQueueMemberEvent { Boolean ringinuse; Long lastcall; Integer status; + Integer logintime; + Integer wrapuptime; + Integer lastpause; public QueueMemberRemovedEvent(Object source) { @@ -124,4 +127,28 @@ public Integer getStatus() { public void setStatus(Integer status) { this.status = status; } + + public Integer getLoginTime() { + return logintime; + } + + public void setLoginTime(Integer logintime) { + this.logintime = logintime; + } + + public Integer getWrapupTime() { + return wrapuptime; + } + + public void setWrapupTime(Integer wrapuptime) { + this.wrapuptime = wrapuptime; + } + + public Integer getLastPause() { + return lastpause; + } + + public void setLastPause(Integer lastpause) { + this.lastpause = lastpause; + } }