apache/maven-mvnd
1
0
Fork 0
mirror of https://github.com/apache/maven-mvnd.git synced 2025-09-10 13:15:27 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Default value must be manually handled (#953)

Browse Source 
Default must be manually handled, i missed this.

Fixes #912
This commit is contained in:
Tamas Cservenak
2024-05-22 16:33:29 +02:00
committed by GitHub
parent 80cd4bf3c5
commit 6de743152c
10 changed files with 205 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
client/src/main/java/org/mvndaemon/mvnd/client/DaemonParameters.java
View File

@@ -491,16 +491,21 @@ public class DaemonParameters {
private static List<CoreExtension> filterCoreExtensions(List<CoreExtension> coreExtensions) {
Set<String> exclusions = new HashSet<>();
String exclusionsString =
systemProperty(Environment.MVND_CORE_EXTENSIONS_EXCLUDE).asString();
String exclusionsString = systemProperty(Environment.MVND_CORE_EXTENSIONS_EXCLUDE)
.orDefault()
.asString();
if (exclusionsString != null) {
exclusions.addAll(Arrays.stream(exclusionsString.split(","))
.filter(e -> e != null && !e.trim().isEmpty())
.collect(Collectors.toList()));
}
if (!exclusions.isEmpty()) {
return coreExtensions.stream()
.filter(e -> !exclusions.contains(e.getGroupId() + ":" + e.getArtifactId()))
.collect(Collectors.toList());
} else {
return coreExtensions;
}
}
private static Properties loadProperties(Path path) {

24
integration-tests/src/test/java/org/mvndaemon/mvnd/it/MavenConfIgnoreExtDefNativeIT.java Normal file
View File

@@ -0,0 +1,24 @@
/*
* 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.mvndaemon.mvnd.it;
import org.mvndaemon.mvnd.junit.MvndNativeTest;
@MvndNativeTest(projectDir = "src/test/projects/maven-conf-ignore-ext-def")
class MavenConfIgnoreExtDefNativeIT extends MavenConfNativeIT {}

27
integration-tests/src/test/java/org/mvndaemon/mvnd/it/MavenConfIgnoreExtDefTest.java Normal file
View File

@@ -0,0 +1,27 @@
/*
* 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.mvndaemon.mvnd.it;
import org.junit.jupiter.api.condition.DisabledOnOs;
import org.junit.jupiter.api.condition.OS;
import org.mvndaemon.mvnd.junit.MvndTest;
@DisabledOnOs(OS.LINUX)
@MvndTest(projectDir = "src/test/projects/maven-conf-ignore-ext-def")
class MavenConfIgnoreExtDefTest extends MavenConfIgnoreExtDefNativeIT {}

34
integration-tests/src/test/java/org/mvndaemon/mvnd/it/MavenConfIgnoreExtNativeIT.java Normal file
View File

@@ -0,0 +1,34 @@
/*
* 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.mvndaemon.mvnd.it;
import java.util.ArrayList;
import java.util.List;
import org.mvndaemon.mvnd.junit.MvndNativeTest;
@MvndNativeTest(projectDir = "src/test/projects/maven-conf-ignore-ext")
class MavenConfIgnoreExtNativeIT extends MavenConfNativeIT {
@Override
protected List<String> mvndParams() {
ArrayList<String> result = new ArrayList<>(super.mvndParams());
result.add("-Dmvnd.coreExtensionsExclude=foo:bar");
return result;
}
}

24
integration-tests/src/test/java/org/mvndaemon/mvnd/it/MavenConfIgnoreExtTest.java Normal file
View File

@@ -0,0 +1,24 @@
/*
* 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.mvndaemon.mvnd.it;
import org.mvndaemon.mvnd.junit.MvndTest;
@MvndTest(projectDir = "src/test/projects/maven-conf-ignore-ext")
class MavenConfIgnoreExtTest extends MavenConfIgnoreExtNativeIT {}

19
integration-tests/src/test/java/org/mvndaemon/mvnd/it/MavenConfNativeIT.java
View File

@@ -21,6 +21,8 @@ package org.mvndaemon.mvnd.it;
import javax.inject.Inject;
import java.io.IOException;
import java.util.Arrays;
import java.util.List;
import org.junit.jupiter.api.Test;
import org.mvndaemon.mvnd.assertj.TestClientOutput;
@@ -43,17 +45,20 @@ class MavenConfNativeIT {
void version() throws IOException, InterruptedException {
final TestClientOutput o = new TestClientOutput();
// this test also exercise the "-D foo=bar" syntax for defining properties
client.execute(
o,
client.execute(o, mvndParams().toArray(new String[0])).assertSuccess();
String conf = parameters.mvndHome().resolve("mvn").resolve("conf").toString();
assertTrue(
o.getMessages().stream().anyMatch(m -> m.toString().contains(conf)), "Output should contain " + conf);
}
protected List<String> mvndParams() {
return Arrays.asList(
"org.apache.maven.plugins:maven-help-plugin:3.2.0:evaluate",
"-D",
"expression=maven.conf",
"-q",
"-DforceStdout",
"--raw-streams")
.assertSuccess();
String conf = parameters.mvndHome().resolve("mvn").resolve("conf").toString();
assertTrue(
o.getMessages().stream().anyMatch(m -> m.toString().contains(conf)), "Output should contain " + conf);
"--raw-streams",
"-X");
}
}

9
integration-tests/src/test/projects/maven-conf-ignore-ext-def/.mvn/extensions.xml Normal file
View File

@@ -0,0 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<extensions>
<!-- By def ignored: basically the build should "just work" -->
<extension>
<groupId>io.takari.maven</groupId>
<artifactId>takari-smart-builder</artifactId>
<version>0.6.4</version>
</extension>
</extensions>

27
integration-tests/src/test/projects/maven-conf-ignore-ext-def/pom.xml Normal file
View File

@@ -0,0 +1,27 @@
<!--
Copyright 2019-2022 the original author or authors.
Licensed 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.
-->
<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>org.mvndaemon.mvnd.test.maven-conf</groupId>
<artifactId>maven-conf-ignore-ext-def</artifactId>
<version>0.0.1-SNAPSHOT</version>
<packaging>pom</packaging>
</project>

9
integration-tests/src/test/projects/maven-conf-ignore-ext/.mvn/extensions.xml Normal file
View File

@@ -0,0 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<extensions>
<!-- nonexistent: if not ignored, will explode -->
<extension>
<groupId>foo</groupId>
<artifactId>bar</artifactId>
<version>1.0.0</version>
</extension>
</extensions>

27
integration-tests/src/test/projects/maven-conf-ignore-ext/pom.xml Normal file
View File

@@ -0,0 +1,27 @@
<!--
Copyright 2019-2022 the original author or authors.
Licensed 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.
-->
<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>org.mvndaemon.mvnd.test.maven-conf</groupId>
<artifactId>maven-conf-ignore-ext</artifactId>
<version>0.0.1-SNAPSHOT</version>
<packaging>pom</packaging>
</project>