MdcInjectionFilterTest - added additional event filtering

.github/workflows/ci.yaml

@@ -0,0 +1,73 @@
+# SPDX-License-Identifier: Apache-2.0
+name: Java CI
+
+on:
+  # Build only the production branches on push, so internal feature branches do not trigger a build twice (once on push, once on the pull request).
+  push:
+    # Restricts push builds to these branches, even if the workflow is copied to another branch.
+    branches:
+      - 2.0.X
+      - 2.1.X
+      - 2.2.X
+  # Build every pull request targeting the branch this workflow lives on.
+  pull_request:
+
+# Permissions are granted per job.
+permissions: { }
+
+# Check all pushes to production branches, but interrupt a PR job if a new commit is pushed.
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+  cancel-in-progress: ${{ github.event_name == 'pull_request' }}
+
+jobs:
+  test:
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        os: [ubuntu-latest, windows-latest, macos-latest]
+        java-version: [17, 21, 25]
+        distribution: [temurin]
+      fail-fast: false
+    name: Test JDK ${{ matrix.java-version }}, ${{ matrix.os }}
+
+    # Actions from the `actions` and `github` organizations are pinned to a major version tag rather than a commit SHA.
+    # This is a deliberate decision:
+    #
+    # - Those organizations have strong expertise in securing GitHub Actions.
+    # - A compromise of either organization would likely also compromise the GitHub Actions service itself, so pinning would not help.
+    # - These actions release frequently.
+    #
+    # The residual risk is deemed acceptable in exchange for less Dependabot churn across the maintained branches.
+    steps:
+
+      - name: Checkout repository
+        uses: actions/checkout@v6
+        with:
+          # Don't persist the GitHub token used to check out the repository.
+          persist-credentials: false
+
+      - name: Set up JDK
+        uses: actions/setup-java@v5
+        with:
+          java-version: ${{ matrix.java-version }}
+          distribution: ${{ matrix.distribution }}
+          cache: maven
+
+      - name: Test with Maven
+        shell: bash
+        run: |
+          mvn verify \
+          -Pserial \
+          --show-version --batch-mode --errors --no-transfer-progress
+
+      # Upload the test results, even when the build failed.
+      - name: Upload test reports
+        if: always()
+        uses: actions/upload-artifact@v7
+        with:
+          name: "test-report-${{matrix.os}}-${{matrix.distribution}}-${{matrix.java-version}}-${{github.run_number}}-${{github.run_attempt}}"
+          # Don't warn or fail when no tests ran (e.g. a compilation failure).
+          if-no-files-found: ignore
+          path: |
+            **/target/surefire-reports

.gitignore

@@ -0,0 +1,15 @@
+.classpath
+.project
+.settings
+.wtpmodules
+*.ipr
+*.iws
+*.iml
+target/
+bin/
+*.log
+.deployables
+.clover
+META-INF/
+Dockerfile
+/.idea/

Jenkinsfile

@@ -0,0 +1,182 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+pipeline {
+  agent any
+
+  tools {
+    maven 'maven_3_latest'
+    jdk params.jdkVersion
+  }
+
+  options {
+      // Configure an overall timeout for the build of ten hours.
+      timeout(time: 20, unit: 'HOURS')
+      // When we have test-fails e.g. we don't need to run the remaining steps
+      buildDiscarder(logRotator(numToKeepStr: '5', artifactNumToKeepStr: '5'))
+      disableConcurrentBuilds()
+  }
+
+  parameters {
+      choice(name: 'nodeLabel', choices: ['ubuntu', 'arm', 'Windows']) 
+      choice(name: 'jdkVersion', choices: ['jdk_11_latest', 'jdk_17_latest', 'jdk_21_latest', 'jdk_22_latest', 'jdk_11_latest_windows', 'jdk_17_latest_windows', 'jdk_21_latest_windows', 'jdk_22_latest_windows']) 
+      booleanParam(name: 'deployEnabled', defaultValue: false)
+      booleanParam(name: 'sonarEnabled', defaultValue: false)
+      booleanParam(name: 'testsEnabled', defaultValue: true)
+  }
+
+  triggers {
+    cron('@weekly')
+    pollSCM('@daily')
+  }
+
+  stages {
+    stage('Initialization') {
+      steps {
+        echo "running on ${env.NODE_NAME}"
+        echo 'Building branch ' + env.BRANCH_NAME
+        echo 'Using PATH ' + env.PATH
+      }
+    }
+
+    stage('Cleanup') {
+      steps {
+        echo 'Cleaning up the workspace'
+        deleteDir()
+      }
+    }
+
+    stage('Checkout') {
+      steps {
+        echo 'Checking out branch ' + env.BRANCH_NAME
+        checkout scm
+      }
+    }
+
+    stage('Build JDK 22 Linux') {
+      tools {
+        jdk "jdk_22_latest"
+      }
+      steps {
+        echo 'Building JDK 22 Linux'
+        sh 'java -version'
+        sh 'mvn -version'
+        sh 'mvn clean install -Pserial'
+      }
+    }
+
+    stage('Build JDK 21 Linux') {
+      tools {
+        jdk "jdk_21_latest"
+      }
+      steps {
+        echo 'Building JDK 21 Linux'
+        sh 'java -version'
+        sh 'mvn -version'
+        sh 'mvn clean install -Pserial'
+      }
+    }
+
+    stage('Build JDK 17 Linux') {
+      tools {
+        jdk "jdk_17_latest"
+      }
+      steps {
+        echo 'Building JDK 17 Linux'
+        sh 'java -version'
+        sh 'mvn -version'
+        sh 'mvn clean install -Pserial'
+      }
+    }
+
+    stage('Build JDK 11 Linux') {
+      tools {
+        jdk "jdk_11_latest"
+      }
+      steps {
+        echo 'Building JDK 11 Linux'
+        sh 'java -version'
+        sh 'mvn -version'
+        sh 'mvn clean install -Pserial'
+      }
+    }
+
+    /*--- Comment out Windows builds for the moment ---*/
+    /*    
+    stage('Build JDK 22 Windows') {
+      tools {
+        jdk "jdk_22_latest_windows"
+      }
+      steps {
+        echo 'Building JDK 22 Windows'
+        sh 'java -version'
+        sh 'mvn -version'
+        sh 'mvn clean install -Pserial'
+      }
+    }
+
+    stage('Build JDK 21 Windows') {
+      tools {
+        jdk "jdk_21_latest_windows"
+      }
+      steps {
+        echo 'Building JDK 21 Windows'
+        sh 'java -version'
+        sh 'mvn -version'
+        sh 'mvn clean install -Pserial'
+      }
+    }
+
+    stage('Build JDK 17 Windows') {
+      tools {
+        jdk "jdk_17_latest_windows"
+      }
+      steps {
+        echo 'Building JDK 17 Windows'
+        sh 'java -version'
+        sh 'mvn -version'
+        sh 'mvn clean install -Pserial'
+      }
+    }
+
+    stage('Build JDK 11 Windows') {
+      tools {
+        jdk "jdk_11_latest_windows"
+      }
+      steps {
+        echo 'Building JDK 11 Windows'
+        sh 'java -version'
+        sh 'mvn -version'
+        sh 'mvn clean install -Pserial'
+      }
+    }
+
+    stage('Build JDK 8 Windows') {
+      tools {
+        jdk "jdk_1.8_latest_windows"
+      }
+      steps {
+        echo 'Building JDK 8 Windows'
+        sh 'java -version'
+        sh 'mvn -version'
+        sh 'mvn clean install -Pserial'
+      }
+    }
+    ---*/
+  }
+}

LICENSE.jzlib.txt

@@ -2,7 +2,7 @@ JZlib 0.0.* were released under the GNU LGPL license.  Later, we have switched
 over to a BSD-style license. 
 
 ------------------------------------------------------------------------------
-Copyright (c) 2000,2001,2002,2003 ymnk, JCraft,Inc. All rights reserved.
+Copyright (c) 2000-2011 ymnk, JCraft,Inc. All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are met:

LICENSE.slf4j.txt

@@ -1,28 +1,23 @@
-Copyright (c) 2004-2007 QOS.ch
+Copyright (c) 2004-2022 QOS.ch Sarl (Switzerland)
 All rights reserved.
 
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, and/or sell copies of the Software, and to permit persons
-to whom the Software is furnished to do so, provided that the above
-copyright notice(s) and this permission notice appear in all copies of
-the Software and that both the above copyright notice(s) and this
-permission notice appear in supporting documentation.
+Permission is hereby granted, free  of charge, to any person obtaining
+a  copy  of this  software  and  associated  documentation files  (the
+"Software"), to  deal in  the Software without  restriction, including
+without limitation  the rights to  use, copy, modify,  merge, publish,
+distribute,  sublicense, and/or sell  copies of  the Software,  and to
+permit persons to whom the Software  is furnished to do so, subject to
+the following conditions:
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
-OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
-HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY
-SPECIAL INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER
-RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF
-CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
-CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+The  above  copyright  notice  and  this permission  notice  shall  be
+included in all copies or substantial portions of the Software.
+
+THE  SOFTWARE IS  PROVIDED  "AS  IS", WITHOUT  WARRANTY  OF ANY  KIND,
+EXPRESS OR  IMPLIED, INCLUDING  BUT NOT LIMITED  TO THE  WARRANTIES OF
+MERCHANTABILITY,    FITNESS    FOR    A   PARTICULAR    PURPOSE    AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE,  ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-Except as contained in this notice, the name of a copyright holder
-shall not be used in advertising or otherwise to promote the sale, use
-or other dealings in this Software without prior written authorization
-of the copyright holder.
 

NOTICE-bin.txt

@@ -0,0 +1,36 @@
+Apache MINA
+Copyright 2007-2026 The Apache Software Foundation.
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
+
+Please refer to each LICENSE.<component>.txt file for the
+license terms of the components that Apache MINA depends on.
+
+Message logging is provided by the SLF4J library package,
+which is open source software, written by Ceki Gülcü, and
+copyright by SLF4J.ORG and QOS.ch.  The original software is
+available from
+
+   http://www.slf4j.org/
+
+Data compression support is provided by the JZLib library package,
+which is open source software, written by JCraft, and copyright
+by JCraft.  The original software is available from
+
+   http://www.jcraft.com/jzlib/
+
+Spring framework is provided by the Spring framework library
+package, which is open source software, written by Rod Johnson
+et al, and copyright by Springframework.org.  The original
+software is available from
+
+   http://www.springframework.org/
+
+OGNL is provided by the OGNL library package, which is open source
+software, written by Drew Davidson and Luke Blanshard.  The original
+software is available from
+
+   http://www.ognl.org/
+
+