This is an automated email from the ASF dual-hosted git repository.
asf-gitbox-commits pushed a commit to branch 2.2.X
in repository https://gitbox.apache.org/repos/asf/mina.git
The following commit(s) were added to refs/heads/2.2.X by this push:
new 2d500f6fc Fix for DIRMINA-1192 & DIRMINA-1193
2d500f6fc is described below
commit 2d500f6fccc0dbef8ffcd3fd611251a8f0dc3eb1
Author: emmanuel lecharny <[email protected]>
AuthorDate: Sat Apr 25 08:43:27 2026 +0200
Fix for DIRMINA-1192 & DIRMINA-1193
---
.../filter/codec/ParallelProtocolEncoderTest.java | 19 +++++++
.../org/apache/mina/filter/ssl/SslFilterMain.java | 19 +++++++
.../mina/transport/socket/nio/DIRMINA1041Test.java | 19 +++++++
.../mina/transport/socket/nio/DIRMINA1172Test.java | 20 ++++++-
.../org/apache/mina/example/rce/MinaClient.java | 21 ++++++-
.../org/apache/mina/example/rce/MinaServer.java | 21 ++++++-
.../org/apache/mina/example/rce/Reflections.java | 21 ++++++-
pom.xml | 64 ++++++++++++----------
8 files changed, 170 insertions(+), 34 deletions(-)
diff --git
a/mina-core/src/test/java/org/apache/mina/filter/codec/ParallelProtocolEncoderTest.java
b/mina-core/src/test/java/org/apache/mina/filter/codec/ParallelProtocolEncoderTest.java
index f4d8ffc05..7ed0e886d 100644
---
a/mina-core/src/test/java/org/apache/mina/filter/codec/ParallelProtocolEncoderTest.java
+++
b/mina-core/src/test/java/org/apache/mina/filter/codec/ParallelProtocolEncoderTest.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.filter.codec;
import static org.junit.Assert.assertTrue;
diff --git
a/mina-core/src/test/java/org/apache/mina/filter/ssl/SslFilterMain.java
b/mina-core/src/test/java/org/apache/mina/filter/ssl/SslFilterMain.java
index a2dd900fd..c85168e9c 100644
--- a/mina-core/src/test/java/org/apache/mina/filter/ssl/SslFilterMain.java
+++ b/mina-core/src/test/java/org/apache/mina/filter/ssl/SslFilterMain.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.filter.ssl;
import java.io.IOException;
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..0ddff9930 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,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.transport.socket.nio;
import org.apache.mina.core.buffer.IoBuffer;
diff --git
a/mina-core/src/test/java/org/apache/mina/transport/socket/nio/DIRMINA1172Test.java
b/mina-core/src/test/java/org/apache/mina/transport/socket/nio/DIRMINA1172Test.java
index 673a6c4dd..8bac372c3 100644
---
a/mina-core/src/test/java/org/apache/mina/transport/socket/nio/DIRMINA1172Test.java
+++
b/mina-core/src/test/java/org/apache/mina/transport/socket/nio/DIRMINA1172Test.java
@@ -1,4 +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.transport.socket.nio;
import static org.junit.Assert.*;
diff --git
a/mina-example/src/main/java/org/apache/mina/example/rce/MinaClient.java
b/mina-example/src/main/java/org/apache/mina/example/rce/MinaClient.java
index 50a8c5b9b..5b6eb10d1 100644
--- a/mina-example/src/main/java/org/apache/mina/example/rce/MinaClient.java
+++ b/mina-example/src/main/java/org/apache/mina/example/rce/MinaClient.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.example.rce;
import org.apache.mina.core.future.ConnectFuture;
@@ -32,4 +51,4 @@ public class MinaClient {
System.out.println("Received from server: " + message);
}
}
-}
\ No newline at end of file
+}
diff --git
a/mina-example/src/main/java/org/apache/mina/example/rce/MinaServer.java
b/mina-example/src/main/java/org/apache/mina/example/rce/MinaServer.java
index 60b134308..c8033bc43 100644
--- a/mina-example/src/main/java/org/apache/mina/example/rce/MinaServer.java
+++ b/mina-example/src/main/java/org/apache/mina/example/rce/MinaServer.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.example.rce;
import org.apache.mina.core.buffer.matcher.FullClassNameMatcher;
@@ -60,4 +79,4 @@ public class MinaServer {
session.write("Server Response: " + message);
}
}
-}
\ No newline at end of file
+}
diff --git
a/mina-example/src/main/java/org/apache/mina/example/rce/Reflections.java
b/mina-example/src/main/java/org/apache/mina/example/rce/Reflections.java
index 5827ebbe7..b4d7d554c 100644
--- a/mina-example/src/main/java/org/apache/mina/example/rce/Reflections.java
+++ b/mina-example/src/main/java/org/apache/mina/example/rce/Reflections.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.example.rce;
import com.nqzero.permit.Permit;
@@ -89,4 +108,4 @@ public class Reflections {
throw e;
}
}
-}
\ No newline at end of file
+}
diff --git a/pom.xml b/pom.xml
index a0696c0e1..c33980136 100644
--- a/pom.xml
+++ b/pom.xml
@@ -664,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>
@@ -858,6 +828,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>
@@ -888,6 +859,39 @@
<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>
