hiifong/pmd
1
0
Fork 0
forked from phoedos/pmd
Code Pull Requests Activity

[dist] Make mvnw executable in source dist zip

Browse Source 
Fixes #4867
This commit is contained in:
Andreas Dangel 2024-03-21 10:07:12 +01:00
parent 8df40cccf5
commit 73952508cc
No known key found for this signature in database
GPG Key ID: 93450DF2DF9A3FA3
5 changed files with 32 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
docs/pages/release_notes.md
View File

@ -357,6 +357,7 @@ The rules have been moved into categories with PMD 6.
* [#4823](https://github.com/pmd/pmd/pull/4823): Update to use renamed pmd-designer
* [#4827](https://github.com/pmd/pmd/pull/4827): \[compat6] Support config errors and cpd for csharp
* [#4830](https://github.com/pmd/pmd/issues/4830): Consolidate packages in each maven module
* [#4867](https://github.com/pmd/pmd/issues/4867): \[dist] ./mvnw command not found in dist-src
* apex
* [#3766](https://github.com/pmd/pmd/issues/3766): \[apex] Replace Jorje with fully open source front-end
* [#4828](https://github.com/pmd/pmd/issues/4828): \[apex] Support null coalescing operator ?? (apex 60)

1
docs/pages/release_notes_pmd7.md
View File

@ -3164,6 +3164,7 @@ No changes.
* [#4823](https://github.com/pmd/pmd/pull/4823): Update to use renamed pmd-designer
* [#4827](https://github.com/pmd/pmd/pull/4827): \[compat6] Support config errors and cpd for csharp
* [#4830](https://github.com/pmd/pmd/issues/4830): Consolidate packages in each maven module
* [#4867](https://github.com/pmd/pmd/issues/4867): \[dist] ./mvnw command not found in dist-src
* ant
* [#4080](https://github.com/pmd/pmd/issues/4080): \[ant] Split off Ant integration into a new submodule
* core

12
pmd-dist/src/main/resources/assemblies/pmd-src.xml
View File

@ -10,11 +10,22 @@
<baseDirectory>pmd-src-${project.version}</baseDirectory>
<fileSets>
<fileSet>
<useDefaultExcludes>false</useDefaultExcludes>
<directory>${project.basedir}/..</directory>
<outputDirectory></outputDirectory>
<includes>
<include>mvnw</include>
</includes>
<fileMode>0755</fileMode>
</fileSet>
<fileSet>
<useDefaultExcludes>false</useDefaultExcludes>
<directory>${project.basedir}/..</directory>
<outputDirectory></outputDirectory>
<excludes>
<exclude>mvnw</exclude> <!-- added already above -->
<exclude>.git/**</exclude>
<exclude>**/target/**</exclude>
<exclude>**/bin/**</exclude>
@ -40,6 +51,7 @@
<exclude>docs/.bundle/**</exclude>
<exclude>docs/vendor/**</exclude>
<exclude>docs/_site/**</exclude>
<exclude>node_modules/**</exclude>
<exclude>pmd-core/dependency-reduced-pom.xml</exclude>
</excludes>

12
pmd-dist/src/test/java/net/sourceforge/pmd/dist/SourceDistributionIT.java vendored
View File

@ -4,6 +4,7 @@
package net.sourceforge.pmd.dist;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertTrue;
@ -12,6 +13,8 @@ import java.util.HashSet;
import java.util.List;
import java.util.Set;
import org.apache.commons.compress.archivers.zip.ZipArchiveEntry;
import org.apache.commons.compress.archivers.zip.ZipFile;
import org.junit.jupiter.api.Test;
import net.sourceforge.pmd.PMDVersion;
@ -28,6 +31,14 @@ class SourceDistributionIT {
assertTrue(getSourceDistribution().exists());
}
@Test
void mavenWrapperShouldBeExecutable() throws Exception {
try (ZipFile zip = ZipFile.builder().setFile(getSourceDistribution()).get()) {
ZipArchiveEntry mavenWrapper = zip.getEntry(BASE_PATH + "/mvnw");
assertEquals(ZipFileExtractor.OWNER_EXECUTABLE, mavenWrapper.getUnixMode() & ZipFileExtractor.OWNER_EXECUTABLE);
}
}
@Test
void verifyExclusions() throws Exception {
Set<String> exclusions = new HashSet<>();
@ -35,6 +46,7 @@ class SourceDistributionIT {
exclusions.add(BASE_PATH + "/.ci/files/private-env");
exclusions.add(BASE_PATH + "/.ci/files/public-env");
exclusions.add(BASE_PATH + "/.ci/files/release-signing-key-D0BF1D737C9A1C22.gpg.gpg");
exclusions.add(BASE_PATH + "/node_modules/.bin/all-contributors");
List<String> files = ZipFileExtractor.readZipFile(getSourceDistribution().toPath());
for (String file : files) {

12
pmd-dist/src/test/java/net/sourceforge/pmd/dist/ZipFileExtractor.java vendored
View File

@ -7,9 +7,9 @@ package net.sourceforge.pmd.dist;
import static org.junit.jupiter.api.Assertions.assertTrue;
import java.io.File;
import java.io.FileOutputStream;
import java.io.InputStream;
import java.io.OutputStream;
import java.nio.file.Files;
import java.nio.file.Path;
import java.util.ArrayList;
import java.util.Enumeration;
@ -27,7 +27,7 @@ import net.sourceforge.pmd.internal.util.IOUtil;
*/
public class ZipFileExtractor {
// unix file permission for executable flag by owner
private static final int OWNER_EXECUTABLE = 0x40;
static final int OWNER_EXECUTABLE = 0x40;
private ZipFileExtractor() {
// Helper class
@ -40,7 +40,7 @@ public class ZipFileExtractor {
* @throws Exception if any error happens during extraction
*/
public static void extractZipFile(Path zipPath, Path tempDir) throws Exception {
try (ZipFile zip = new ZipFile(zipPath.toFile())) {
try (ZipFile zip = ZipFile.builder().setFile(zipPath.toFile()).get()) {
Enumeration<ZipArchiveEntry> entries = zip.getEntries();
while (entries.hasMoreElements()) {
ZipArchiveEntry entry = entries.nextElement();
@ -49,11 +49,11 @@ public class ZipFileExtractor {
assertTrue(file.mkdirs());
} else {
try (InputStream data = zip.getInputStream(entry);
OutputStream fileOut = new FileOutputStream(file);) {
OutputStream fileOut = Files.newOutputStream(file.toPath());) {
IOUtil.copy(data, fileOut);
}
if ((entry.getUnixMode() & OWNER_EXECUTABLE) == OWNER_EXECUTABLE) {
file.setExecutable(true);
assertTrue(file.setExecutable(true));
}
}
}
@ -68,7 +68,7 @@ public class ZipFileExtractor {
*/
public static List<String> readZipFile(Path zipPath) throws Exception {
List<String> result = new ArrayList<>();
try (ZipFile zip = new ZipFile(zipPath.toFile())) {
try (ZipFile zip = ZipFile.builder().setFile(zipPath.toFile()).get()) {
Enumeration<ZipArchiveEntry> entries = zip.getEntries();
while (entries.hasMoreElements()) {
ZipArchiveEntry entry = entries.nextElement();