Merge branch 'master' into 3.0.0

Author: tomaswolf

.gitattributes

@@ -22,6 +22,8 @@
 *.js            text eol=lf
 *.bat           text eol=crlf
 *.vbs           text eol=crlf
+mvnw            text eol=lf
+mvnw.cmd        text eol=crlf
 
 # These files are binary and should be left untouched
 # (binary is macro for -text -diff)

.mvn/wrapper/maven-wrapper.properties

@@ -0,0 +1,3 @@
+wrapperVersion=3.3.4
+distributionType=only-script
+distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.11/apache-maven-3.9.11-bin.zip

assembly/src/main/descriptors/unix-src.xml

@@ -40,7 +40,8 @@
                 <include>**/*.bin</include>
                 <include>**/*.jnilib</include>
                 <include>**/*.cert</include>
-                <include>**/.mvn/*</include>
+                <include>**/.mvn/**</include>
+                <include>mvnw.cmd</include>
 
                 <include>sshd-openpgp/src/test/resources/**/*</include>
             </includes>
@@ -92,6 +93,7 @@
 
                 <exclude>sshd-core/src/docs/*.txt</exclude>
                 <exclude>sshd-openpgp/src/test/resources/**/*</exclude>
+                <exclude>mvnw.cmd</exclude>
             </excludes>
             <lineEnding>unix</lineEnding>
         </fileSet>

assembly/src/main/descriptors/windows-src.xml

@@ -41,7 +41,8 @@
                 <include>**/*.jnilib</include>
                 <include>**/*.cert</include>
                 <include>**/*.sh</include>
-                <include>**/.mvn/*</include>
+                <include>**/.mvn/**</include>
+                <include>mvnw</include>
 
                 <include>sshd-openpgp/src/test/resources/**/*</include>
                 <include>sshd-core/src/test/resources/org/apache/sshd/client/opensshcerts/**/*</include>
@@ -99,6 +100,7 @@
                 <exclude>sshd-core/src/test/resources/org/apache/sshd/client/opensshcerts/**/*</exclude>
                 <exclude>sshd-benchmarks/src/main/resources/org/apache/sshd/**/*</exclude>
                 <exclude>sshd-openpgp/src/test/resources/**/*</exclude>
+                <exclude>mvnw</exclude>
             </excludes>
             <lineEnding>dos</lineEnding>
         </fileSet>