chore(release): 1.111.0 (#4809)

See [CHANGELOG](https://github.com/aws/jsii/blob/bump/1.111.0/CHANGELOG.md)

Author: mergify[bot]

.mergify/config.yml

@@ -133,3 +133,8 @@ pull_request_rules:
           [Conventional Commits]: https://www.conventionalcommits.org
     conditions:
       - status-failure=Validate PR Title
+priority_rules:
+  - name: priority for queue `default-squash`
+    conditions:
+      - queue-name=default-squash
+    priority: 2250

CHANGELOG.md

@@ -2,6 +2,14 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+## [1.111.0](https://github.com/aws/jsii/compare/v1.110.0...v1.111.0) (2025-04-02)
+
+
+### Bug Fixes
+
+* **java-runtime:** `ErrorStreamSink` crashes with `NullPointerException` ([#4803](https://github.com/aws/jsii/issues/4803)) ([b20be37](https://github.com/aws/jsii/commit/b20be373f55a972155242b7b3893b9e7b49b5006))
+* **pacmak:** Find the tarball location on windows even if prepack is run ([#4795](https://github.com/aws/jsii/issues/4795)) ([15f748d](https://github.com/aws/jsii/commit/15f748d9c0f8ccbae418f9e22378b7d4d4c5ed85))
+
 ## [1.110.0](https://github.com/aws/jsii/compare/v1.109.0...v1.110.0) (2025-03-19)
 
 

gh-pages/requirements-dev.txt

@@ -1,4 +1,4 @@
 mkdocs~=1.6.1
 mkdocs-awesome-pages-plugin~=2.10.1
-mkdocs-material~=9.6.9
+mkdocs-material~=9.6.10
 mkdocs-git-revision-date-plugin~=0.3.2

lerna.json

@@ -12,6 +12,6 @@
       "rejectCycles": true
     }
   },
-  "version": "1.110.0",
+  "version": "1.111.0",
   "$schema": "node_modules/lerna/schemas/lerna-schema.json"
 }

packages/@jsii/java-runtime/project/src/main/java/software/amazon/jsii/JsiiRuntime.java

@@ -516,7 +516,10 @@ private void acceptData(final boolean uninterruptible) throws IOException {
                     this.buffer.write(read);
                 }
                 if (read == '\n' || this.eof) {
-                    processLine(new String(buffer.toByteArray(), StandardCharsets.UTF_8));
+                    // don't print an empty line if we're at the end of the file and the buffer is empty.
+                    if (!this.eof || buffer.size() > 0) {
+                        processLine(new String(buffer.toByteArray(), StandardCharsets.UTF_8));
+                    }
                     buffer.reset();
                 }
             }
@@ -526,6 +529,13 @@ private void processLine(final String line) {
             try {
                 final JsonNode tree = objectMapper.readTree(line);
                 final ConsoleOutput consoleOutput = objectMapper.treeToValue(tree, ConsoleOutput.class);
+                if (consoleOutput == null) {
+                    // null means the line was empty, but the above objectMapper calls will return null
+                    // We would throw JsonProcessingException to avoid duplication, but the constructors
+                    // are protected, and the subclasses need too much information
+                    System.err.println(line);
+                    return;
+                }
                 if (consoleOutput.stderr != null) {
                     System.err.write(consoleOutput.stderr, 0, consoleOutput.stderr.length);
                 }

packages/@jsii/java-runtime/project/src/test/java/software/amazon/jsii/JsiiRuntimeTest.java

@@ -9,6 +9,29 @@
 import java.util.Collections;
 
 public final class JsiiRuntimeTest {
+
+    @Test
+    public void errorSteamSinkDoesntCrash() {
+
+        ByteArrayOutputStream err = new ByteArrayOutputStream();
+        PrintStream originalErr = System.err;
+
+        // to capture writes to System.err, which happen when the error stream
+        // sink crashes. kind of a silly...but simple, and works.
+        System.setErr(new PrintStream(err));
+
+        try {
+            final JsiiRuntime runtime = new JsiiRuntime(null, null);
+            runtime.getClient().createObject("Object", Collections.emptyList(), Collections.emptyList(),
+                    Collections.emptyList());
+            runtime.terminate();
+            Assertions.assertFalse(err.toString().contains(
+                    "Unexpected error in background thread \"software.amazon.jsii.JsiiRuntime.ErrorStreamSink\""));
+        } finally {
+            System.setErr(originalErr);
+        }
+    }
+
     @Test
     public void withNoCustomization() {
         final JsiiRuntime runtime = new JsiiRuntime(null, null);

packages/jsii-pacmak/lib/packaging.ts

@@ -1,6 +1,5 @@
 import * as fs from 'fs-extra';
 import type { Assembly, TypeSystem } from 'jsii-reflect';
-import * as os from 'os';
 import * as path from 'path';
 
 import { Scratch, shell } from './util';
@@ -79,14 +78,17 @@ export class JsiiModule {
       // Take only the last line of npm pack which should contain the
       // tarball name. otherwise, there can be a lot of extra noise there
       // from scripts that emit to STDOUT.
-      const lines = out.trim().split(os.EOL);
+      // Since we are interested in the text *after* the last newline, splitting on '\n' is correct
+      // both on Linux/Mac (EOL = '\n') and Windows (EOL = '\r\n'), and also for UNIX tools running
+      // on Windows (expected EOL = '\r\n', actual EOL = '\n').
+      const lines = out.trim().split('\n');
       const lastLine = lines[lines.length - 1].trim();
 
       if (!lastLine.endsWith('.tgz') && !lastLine.endsWith('.tar.gz')) {
         throw new Error(
           `${packCommand} did not produce tarball from ${
             this.moduleDirectory
-          } into ${tmpdir} (output was ${JSON.stringify(lines)})`,
+          } into ${tmpdir} (output was ${JSON.stringify(lines.map((l) => l.trimEnd()))})`,
         );
       }