[Git][java-team/jboss-xnio][master] 4 commits: Declare compliance with Debian Policy 4.5.1.
Markus Koschany
gitlab at salsa.debian.org
Sat Dec 5 23:38:24 GMT 2020
Markus Koschany pushed to branch master at Debian Java Maintainers / jboss-xnio
Commits:
ae73e3df by Markus Koschany at 2020-12-06T00:23:50+01:00
Declare compliance with Debian Policy 4.5.1.
- - - - -
b6305ba0 by Markus Koschany at 2020-12-06T00:27:30+01:00
New upstream version 3.8.4
- - - - -
582ad327 by Markus Koschany at 2020-12-06T00:27:37+01:00
Update upstream source from tag 'upstream/3.8.4'
Update to upstream version '3.8.4'
with Debian dir bbf1025529bd5af4f94570d538c6e63af7601412
- - - - -
6513a644 by Markus Koschany at 2020-12-06T00:28:59+01:00
Update changelog
- - - - -
9 changed files:
- + .github/workflows/ci.yml
- .gitignore
- api/pom.xml
- api/src/main/java/org/xnio/ssl/JsseSslConduitEngine.java
- api/src/main/java/org/xnio/ssl/JsseSslStreamConnection.java
- debian/changelog
- debian/control
- nio-impl/pom.xml
- pom.xml
Changes:
=====================================
.github/workflows/ci.yml
=====================================
@@ -0,0 +1,106 @@
+# This workflow will build a Java project with Maven
+# For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-maven
+
+name: XNIO CI
+
+on:
+ pull_request:
+ types: [opened, synchronize, reopened, ready_for_review]
+
+jobs:
+ build-all:
+ name: Compile (no tests) with JDK 8
+ runs-on: ubuntu-latest
+ steps:
+ - uses: actions/checkout at v2
+ - uses: AdoptOpenJDK/install-jdk at v1
+ name: Install JDK 8
+ with:
+ version: 8
+ - name: Build
+ run: mvn -U -B -fae -DskipTests clean install
+ - name: Tar Maven Repo
+ shell: bash
+ run: tar -czf maven-repo.tgz -C ~ .m2/repository
+ - name: Persist Maven Repo
+ uses: actions/upload-artifact at v1
+ with:
+ name: maven-repo
+ path: maven-repo.tgz
+ - uses: actions/upload-artifact at v2
+ if: failure()
+ with:
+ name: surefire-reports-build
+ path: '**/surefire-reports/*.txt'
+ test-matrix:
+ name: ${{ matrix.module }}-${{ matrix.openjdk_impl}}-${{ matrix.jdk }}-${{ matrix.os }}
+ runs-on: ${{ matrix.os }}
+ needs: build-all
+ strategy:
+ fail-fast: false
+ matrix:
+ module: [api, nio-impl]
+ os: [ubuntu-20.04, windows-latest, macos-latest]
+ jdk: [8, 11]
+ openjdk_impl: [hotspot, openj9]
+ exclude:
+ - os: macos-latest
+ openjdk_impl: openj9
+ - os: windows-latest
+ openjdk_impl: openj9
+ steps:
+ - name: Configure runner - Linux
+ if: contains(matrix.os, 'ubuntu')
+ run: |
+ sudo bash -c "echo '127.0.0.1 localhost localhost.localdomain localhost4 localhost4.localdomain4' > /etc/hosts"
+ sudo bash -c "echo '::1 localhost localhost.localdomain localhost6 localhost6.localdomain6' >> /etc/hosts"
+ sudo apt-get update
+ sudo apt-get install openssl net-tools -y
+ sudo sysctl -w net.ipv4.ip_local_port_range="13000 64000"
+ sudo sysctl -w net.ipv4.tcp_tw_reuse=0
+ - name: Configure Runner - Windows
+ if: contains(matrix.os, 'windows')
+ run: |
+ echo '127.0.0.1 localhost localhost.localdomain localhost4 localhost4.localdomain4' > %SystemRoot%\System32\drivers\etc\hosts
+ echo '::1 localhost localhost.localdomain localhost6 localhost6.localdomain6' >> %SystemRoot%\System32\drivers\etc\hosts
+ choco install openssl --version=1.1.1.4 -y
+ refreshenv
+ shell: cmd
+ - name: Configure Runner - OSX
+ if: contains(matrix.os, 'macos')
+ run: |
+ brew update
+ brew install openssl
+ brew link --force openssl
+ export PATH="/usr/local/opt/openssl at 1.1/bin:$PATH"
+ echo 'export PATH="/usr/local/opt/openssl at 1.1/bin:$PATH"' >> /Users/runner/.bash_profile
+ openssl version -a
+ which openssl
+ - name: Run netstat (pre)
+ if: always()
+ run: netstat -an
+ shell: bash
+ - uses: actions/checkout at v2
+ - name: Download Maven Repo
+ uses: actions/download-artifact at v1
+ with:
+ name: maven-repo
+ path: .
+ - name: Extract Maven Repo
+ shell: bash
+ run: tar -xzf maven-repo.tgz -C ~
+ - name: Set up JDK ${{ matrix.java }}
+ uses: AdoptOpenJDK/install-jdk at v1
+ with:
+ version: ${{ matrix.jdk }}
+ impl: ${{ matrix.jdk_impl }}
+ - name: Run Tests
+ run: mvn -U -B -fae test -pl ${{ matrix.module }}
+ - uses: actions/upload-artifact at v2
+ if: failure()
+ with:
+ name: surefire-reports-${{ matrix.module }}-${{ matrix.openjdk_impl}}-${{ matrix.jdk }}-${{ matrix.os }}
+ path: '**/surefire-reports/*.txt'
+ - name: Run netstat (post)
+ if: always()
+ run: netstat -an
\ No newline at end of file
=====================================
.gitignore
=====================================
@@ -7,3 +7,4 @@ target
*.ipr
*~
out
+*.versionsBackup
=====================================
api/pom.xml
=====================================
@@ -37,7 +37,7 @@
<parent>
<groupId>org.jboss.xnio</groupId>
<artifactId>xnio-all</artifactId>
- <version>3.8.2.Final</version>
+ <version>3.8.4.Final</version>
</parent>
<dependencies>
=====================================
api/src/main/java/org/xnio/ssl/JsseSslConduitEngine.java
=====================================
@@ -930,6 +930,32 @@ final class JsseSslConduitEngine {
}
}
+ /**
+ * Closes the engine for both inbound and outbound connection, and discards this engine's internal
+ * resources immediately without handshaking if this engine has not been used.
+ *
+ * @throws IOException
+ */
+ void close() throws IOException {
+ if (isFirstHandshake()) {
+ setFlags(WRITE_SHUT_DOWN|WRITE_COMPLETE|READ_SHUT_DOWN);
+ closeEngine();
+ } else {
+ try {
+ closeInbound();
+ } catch (Throwable t) {
+ try {
+ closeOutbound();
+ } catch (Throwable t2) {
+ t2.addSuppressed(t);
+ throw t2;
+ }
+ throw t;
+ }
+ closeOutbound();
+ }
+ }
+
/**
* Indicates if outbound is closed.
*
=====================================
api/src/main/java/org/xnio/ssl/JsseSslStreamConnection.java
=====================================
@@ -39,7 +39,7 @@ import org.xnio.conduits.StreamSourceConduit;
/**
* StreamConnection with SSL support.
- *
+ *
* @author <a href="mailto:frainone at redhat.com">Flavia Rainone</a>
*
*/
@@ -121,6 +121,9 @@ public final class JsseSslStreamConnection extends SslConnection {
safeClose(connection);
throw e;
}
+ } else {
+ //still need to close the engine, as it is allocated eagerly
+ sslConduitEngine.close();
}
connection.close();
}
@@ -203,4 +206,4 @@ public final class JsseSslStreamConnection extends SslConnection {
}
ChannelListeners.<SslConnection>invokeChannelListener(this, listener);
}
-}
\ No newline at end of file
+}
=====================================
debian/changelog
=====================================
@@ -1,3 +1,10 @@
+jboss-xnio (3.8.4-1) unstable; urgency=medium
+
+ * New upstream version 3.8.4.
+ * Declare compliance with Debian Policy 4.5.1.
+
+ -- Markus Koschany <apo at debian.org> Sun, 06 Dec 2020 00:28:15 +0100
+
jboss-xnio (3.8.2-1) unstable; urgency=medium
* New upstream version 3.8.2.
=====================================
debian/control
=====================================
@@ -20,7 +20,7 @@ Build-Depends:
libwildfly-client-config-java,
libwildfly-common-java,
maven-debian-helper (>= 1.5)
-Standards-Version: 4.5.0
+Standards-Version: 4.5.1
Vcs-Git: https://salsa.debian.org/java-team/jboss-xnio.git
Vcs-Browser: https://salsa.debian.org/java-team/jboss-xnio
Homepage: http://xnio.jboss.org/
=====================================
nio-impl/pom.xml
=====================================
@@ -31,7 +31,7 @@
<parent>
<groupId>org.jboss.xnio</groupId>
<artifactId>xnio-all</artifactId>
- <version>3.8.2.Final</version>
+ <version>3.8.4.Final</version>
</parent>
<properties>
=====================================
pom.xml
=====================================
@@ -32,7 +32,7 @@
<artifactId>xnio-all</artifactId>
<packaging>pom</packaging>
<name>XNIO Parent POM</name>
- <version>3.8.2.Final</version>
+ <version>3.8.4.Final</version>
<description>The aggregator POM of the XNIO project</description>
<licenses>
View it on GitLab: https://salsa.debian.org/java-team/jboss-xnio/-/compare/38ce89645a7fac03d58d7cd003dc268312b07611...6513a6446a0fbcf83e44c50bb528ef47ad0ef67a
--
View it on GitLab: https://salsa.debian.org/java-team/jboss-xnio/-/compare/38ce89645a7fac03d58d7cd003dc268312b07611...6513a6446a0fbcf83e44c50bb528ef47ad0ef67a
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-java-commits/attachments/20201205/99419aa9/attachment.html>
More information about the pkg-java-commits
mailing list