This is an automated email from the ASF dual-hosted git repository.
asf-gitbox-commits pushed a commit to branch 2.0.X
in repository https://gitbox.apache.org/repos/asf/mina.git
The following commit(s) were added to refs/heads/2.0.X by this push:
new 81b5ee07d Fix for DIRMINA-1192 & DIRMINA-1193
81b5ee07d is described below
commit 81b5ee07da6ca1dab56d8cf4533f9f9324b55de3
Author: emmanuel lecharny <[email protected]>
AuthorDate: Sat Apr 25 08:33:55 2026 +0200
Fix for DIRMINA-1192 & DIRMINA-1193
---
.../mina/core/buffer/matcher/FilenameUtils.java | 19 +++++++
.../mina/core/buffer/IoBufferHexDumperTest.java | 19 +++++++
.../filter/ssl/SslIdentificationAlgorithmTest.java | 20 +++++++
.../mina/transport/socket/nio/DIRMINA1041Test.java | 21 ++++++-
pom.xml | 66 ++++++++++++----------
5 files changed, 113 insertions(+), 32 deletions(-)
diff --git
a/mina-core/src/main/java/org/apache/mina/core/buffer/matcher/FilenameUtils.java
b/mina-core/src/main/java/org/apache/mina/core/buffer/matcher/FilenameUtils.java
index 09e3e5e18..7108e5e3f 100644
---
a/mina-core/src/main/java/org/apache/mina/core/buffer/matcher/FilenameUtils.java
+++
b/mina-core/src/main/java/org/apache/mina/core/buffer/matcher/FilenameUtils.java
@@ -1,3 +1,22 @@
+/*
+ * 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
+ *
+ * http://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.
+ *
+ */
package org.apache.mina.core.buffer.matcher;
import java.util.ArrayDeque;
diff --git
a/mina-core/src/test/java/org/apache/mina/core/buffer/IoBufferHexDumperTest.java
b/mina-core/src/test/java/org/apache/mina/core/buffer/IoBufferHexDumperTest.java
index 560a202ea..7c9d36469 100644
---
a/mina-core/src/test/java/org/apache/mina/core/buffer/IoBufferHexDumperTest.java
+++
b/mina-core/src/test/java/org/apache/mina/core/buffer/IoBufferHexDumperTest.java
@@ -1,3 +1,22 @@
+/*
+ * 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
+ *
+ * http://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.
+ *
+ */
package org.apache.mina.core.buffer;
import static org.junit.Assert.assertEquals;
diff --git
a/mina-core/src/test/java/org/apache/mina/filter/ssl/SslIdentificationAlgorithmTest.java
b/mina-core/src/test/java/org/apache/mina/filter/ssl/SslIdentificationAlgorithmTest.java
index d022ef627..ecdfdb1aa 100644
---
a/mina-core/src/test/java/org/apache/mina/filter/ssl/SslIdentificationAlgorithmTest.java
+++
b/mina-core/src/test/java/org/apache/mina/filter/ssl/SslIdentificationAlgorithmTest.java
@@ -1,3 +1,23 @@
+/*
+ * 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
+ *
+ * http://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.
+ *
+ */
+
package org.apache.mina.filter.ssl;
import org.apache.mina.core.filterchain.DefaultIoFilterChainBuilder;
diff --git
a/mina-core/src/test/java/org/apache/mina/transport/socket/nio/DIRMINA1041Test.java
b/mina-core/src/test/java/org/apache/mina/transport/socket/nio/DIRMINA1041Test.java
index 08cbf303c..3e80c76da 100644
---
a/mina-core/src/test/java/org/apache/mina/transport/socket/nio/DIRMINA1041Test.java
+++
b/mina-core/src/test/java/org/apache/mina/transport/socket/nio/DIRMINA1041Test.java
@@ -1,6 +1,25 @@
+/*
+ * 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
+ *
+ * http://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.
+ *
+ */
+
package org.apache.mina.transport.socket.nio;
-import org.apache.mina.core.buffer.IoBuffer;
import org.apache.mina.core.future.CloseFuture;
import org.apache.mina.core.future.ConnectFuture;
import org.apache.mina.core.future.WriteFuture;
diff --git a/pom.xml b/pom.xml
index 1191aad90..fc72d92cd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -95,7 +95,8 @@
<doclint>none</doclint>
<!-- Maven Plugins -->
- <version.apache.rat.plugin>0.18</version.apache.rat.plugin>
+ <!-- NOTE: do not use 0.18, which requires java 17 -->
+ <version.apache.rat.plugin>0.17</version.apache.rat.plugin>
<version.api.plugin>3.9.4</version.api.plugin>
<version.assembly.plugin>3.8.0</version.assembly.plugin>
<version.build.helper.plugin>3.6.1</version.build.helper.plugin>
@@ -663,36 +664,6 @@
<version>${version.tools.maven.plugin}</version>
</plugin>
- <plugin>
- <groupId>org.apache.rat</groupId>
- <artifactId>apache-rat-plugin</artifactId>
- <version>${version.apache.rat.plugin}</version>
- <inherited>true</inherited>
- <configuration>
- <excludeSubProjects>false</excludeSubProjects>
- <excludes>
- <!-- project excludes -->
- <exclude>**/resources/svn_ignore.txt</exclude>
- <exclude>**/resources/Reveal in Finder.launch</exclude>
- <exclude>**/target/**</exclude>
- <exclude>**/.classpath</exclude>
- <exclude>**/.project</exclude>
- <exclude>**/.settings/**</exclude>
- <exclude>**/LICENSE.*</exclude>
- <exclude>**/NOTICE-bin.txt</exclude>
- <exclude>**/resources/**</exclude>
- </excludes>
- </configuration>
- <executions>
- <execution>
- <phase>verify</phase>
- <goals>
- <goal>check</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
-
<plugin>
<groupId>org.apache.xbean</groupId>
<artifactId>maven-xbean-plugin</artifactId>
@@ -864,6 +835,7 @@
<extensions>true</extensions>
<configuration>
<instructions>
+
<Automatic-Module-Name>$(maven-symbolicname)</Automatic-Module-Name>
<Bundle-SymbolicName>${symbolicName}</Bundle-SymbolicName>
<Export-Package>${exportedPackage}.*;version=${project.version}</Export-Package>
</instructions>
@@ -894,6 +866,38 @@
<groupId>org.cyclonedx</groupId>
<artifactId>cyclonedx-maven-plugin</artifactId>
</plugin>
+
+ <plugin>
+ <groupId>org.apache.rat</groupId>
+ <artifactId>apache-rat-plugin</artifactId>
+ <version>${version.apache.rat.plugin}</version>
+ <inherited>true</inherited>
+
+ <configuration>
+ <excludeSubProjects>false</excludeSubProjects>
+ <inputExcludes>
+ <!-- project excludes -->
+ <inputExclude>**/resources/Reveal in Finder.launch</inputExclude>
+ <inputExclude>**/target/**</inputExclude>
+ <inputExclude>**/.classpath</inputExclude>
+ <inputExclude>**/.project</inputExclude>
+ <inputExclude>**/.settings/**</inputExclude>
+ <inputExclude>**/LICENSE.*</inputExclude>
+ <inputExclude>**/NOTICE-bin.txt</inputExclude>
+ <inputExclude>**/MANIFEST.MF</inputExclude>
+ <inputExclude>**/resources/**</inputExclude>
+ </inputExcludes>
+ </configuration>
+
+ <executions>
+ <execution>
+ <phase>verify</phase>
+ <goals>
+ <goal>check</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
