Skip to content

Commit 89b9633

Browse files
slawekjaranowskislawekjaranowski
committed
[MINVOKER-365] Allow to pre-build script to set user properties
1 parent b8aed81 commit 89b9633

File tree

13 files changed

+394
-122
lines changed

13 files changed

+394
-122
lines changed

‎src/it/MINVOKER-365-user-poperties-from-pre-build/pom.xml

Lines changed: 65 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,65 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
3+
<!--
4+
Licensed to the Apache Software Foundation (ASF) under one
5+
or more contributor license agreements. See the NOTICE file
6+
distributed with this work for additional information
7+
regarding copyright ownership. The ASF licenses this file
8+
to you under the Apache License, Version 2.0 (the
9+
"License"); you may not use this file except in compliance
10+
with the License. You may obtain a copy of the License at
11+
12+
http://www.apache.org/licenses/LICENSE-2.0
13+
14+
Unless required by applicable law or agreed to in writing,
15+
software distributed under the License is distributed on an
16+
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
17+
KIND, either express or implied. See the License for the
18+
specific language governing permissions and limitations
19+
under the License.
20+
-->
21+
22+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
23+
<modelVersion>4.0.0</modelVersion>
24+
25+
<groupId>org.apache.maven.plugins.invoker.its</groupId>
26+
<artifactId>minvoker-335</artifactId>
27+
<version>1.0-SNAPSHOT</version>
28+
<packaging>pom</packaging>
29+
30+
<description>
31+
Test to check a user properties generated by pre-build
32+
</description>
33+
34+
<properties>
35+
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
36+
<version.maven-enforcer-plugin>@version.maven-enforcer-plugin@</version.maven-enforcer-plugin>
37+
<version.maven-clean-plugin>@version.maven-clean-plugin@</version.maven-clean-plugin>
38+
</properties>
39+
40+
<build>
41+
<plugins>
42+
<plugin>
43+
<groupId>org.apache.maven.plugins</groupId>
44+
<artifactId>maven-invoker-plugin</artifactId>
45+
<version>@project.version@</version>
46+
<executions>
47+
<execution>
48+
<id>integration-test</id>
49+
<phase>initialize</phase>
50+
<goals>
51+
<goal>run</goal>
52+
</goals>
53+
</execution>
54+
</executions>
55+
<configuration>
56+
<goals>
57+
<goal>clean</goal>
58+
<goal>initialize</goal>
59+
</goals>
60+
</configuration>
61+
</plugin>
62+
</plugins>
63+
</build>
64+
65+
</project>

‎src/it/MINVOKER-365-user-poperties-from-pre-build/src/it/project/pom.xml

Lines changed: 60 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,60 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
3+
<!--
4+
Licensed to the Apache Software Foundation (ASF) under one
5+
or more contributor license agreements. See the NOTICE file
6+
distributed with this work for additional information
7+
regarding copyright ownership. The ASF licenses this file
8+
to you under the Apache License, Version 2.0 (the
9+
"License"); you may not use this file except in compliance
10+
with the License. You may obtain a copy of the License at
11+
12+
http://www.apache.org/licenses/LICENSE-2.0
13+
14+
Unless required by applicable law or agreed to in writing,
15+
software distributed under the License is distributed on an
16+
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
17+
KIND, either express or implied. See the License for the
18+
specific language governing permissions and limitations
19+
under the License.
20+
-->
21+
22+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
23+
<modelVersion>4.0.0</modelVersion>
24+
<groupId>org.apache.maven.plugins.invoker.its</groupId>
25+
<artifactId>minvoker-365</artifactId>
26+
<version>0.1-SNAPSHOT</version>
27+
<packaging>pom</packaging>
28+
29+
<build>
30+
<plugins>
31+
<plugin>
32+
<groupId>org.apache.maven.plugins</groupId>
33+
<artifactId>maven-clean-plugin</artifactId>
34+
<version>@version.maven-clean-plugin@</version>
35+
</plugin>
36+
<plugin>
37+
<groupId>org.apache.maven.plugins</groupId>
38+
<artifactId>maven-enforcer-plugin</artifactId>
39+
<version>@version.maven-enforcer-plugin@</version>
40+
<executions>
41+
<execution>
42+
<phase>initialize</phase>
43+
<goals>
44+
<goal>enforce</goal>
45+
</goals>
46+
</execution>
47+
</executions>
48+
<configuration>
49+
<rules>
50+
<requireFilesExist>
51+
<files>
52+
<file>${testFile}</file>
53+
</files>
54+
</requireFilesExist>
55+
</rules>
56+
</configuration>
57+
</plugin>
58+
</plugins>
59+
</build>
60+
</project>

‎src/it/MINVOKER-365-user-poperties-from-pre-build/src/it/project/postbuild.groovy

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
/*
2+
* Licensed to the Apache Software Foundation (ASF) under one
3+
* or more contributor license agreements. See the NOTICE file
4+
* distributed with this work for additional information
5+
* regarding copyright ownership. The ASF licenses this file
6+
* to you under the Apache License, Version 2.0 (the
7+
* "License"); you may not use this file except in compliance
8+
* with the License. You may obtain a copy of the License at
9+
*
10+
* http://www.apache.org/licenses/LICENSE-2.0
11+
*
12+
* Unless required by applicable law or agreed to in writing,
13+
* software distributed under the License is distributed on an
14+
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
15+
* KIND, either express or implied. See the License for the
16+
* specific language governing permissions and limitations
17+
* under the License.
18+
*/
19+
20+
def logs = new File(basedir, 'build.log').text
21+
22+
assert logs.contains('[INFO] Clean is skipped.')

‎src/it/MINVOKER-365-user-poperties-from-pre-build/src/it/project/prebuild.groovy

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
import java.nio.file.Files
2+
3+
/*
4+
* Licensed to the Apache Software Foundation (ASF) under one
5+
* or more contributor license agreements. See the NOTICE file
6+
* distributed with this work for additional information
7+
* regarding copyright ownership. The ASF licenses this file
8+
* to you under the Apache License, Version 2.0 (the
9+
* "License"); you may not use this file except in compliance
10+
* with the License. You may obtain a copy of the License at
11+
*
12+
* http://www.apache.org/licenses/LICENSE-2.0
13+
*
14+
* Unless required by applicable law or agreed to in writing,
15+
* software distributed under the License is distributed on an
16+
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
17+
* KIND, either express or implied. See the License for the
18+
* specific language governing permissions and limitations
19+
* under the License.
20+
*/
21+
22+
def userProperties = context.get('userProperties')
23+
24+
def testFilePath = Files.createTempFile('minvoker-365-prefix', 'suffix')
25+
userProperties.put('testFile', testFilePath.toString())
26+
userProperties.put('maven.clean.skip', 'true')

‎src/it/MINVOKER-365-user-poperties-from-pre-build/verify.groovy

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
/*
2+
* Licensed to the Apache Software Foundation (ASF) under one
3+
* or more contributor license agreements. See the NOTICE file
4+
* distributed with this work for additional information
5+
* regarding copyright ownership. The ASF licenses this file
6+
* to you under the Apache License, Version 2.0 (the
7+
* "License"); you may not use this file except in compliance
8+
* with the License. You may obtain a copy of the License at
9+
*
10+
* http://www.apache.org/licenses/LICENSE-2.0
11+
*
12+
* Unless required by applicable law or agreed to in writing,
13+
* software distributed under the License is distributed on an
14+
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
15+
* KIND, either express or implied. See the License for the
16+
* specific language governing permissions and limitations
17+
* under the License.
18+
*/
19+
20+
def logs = new File(basedir, 'build.log').text
21+
22+
// check if properties are pass to execution
23+
if (System.getProperty("os.name").toLowerCase(Locale.ROOT).contains("windows")) {
24+
assert logs.contains("-D testFile=")
25+
assert logs.contains("-D maven.clean.skip=true")
26+
} else {
27+
assert logs.contains("'-D' 'testFile=")
28+
assert logs.contains("'-D' 'maven.clean.skip=true'")
29+
}

‎src/main/java/org/apache/maven/plugins/invoker/AbstractInvokerMojo.java

Lines changed: 33 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1838,24 +1838,15 @@ private boolean runBuild(
18381838
}
18391839

18401840
Map<String, Object> context = new LinkedHashMap<>();
1841+
Properties scriptUserProperties = new Properties();
1842+
context.put("userProperties", scriptUserProperties);
18411843

1842-
boolean selectorResult = true;
1844+
if (!runSelectorHook(basedir, context, logger)) {
1845+
return false;
1846+
}
18431847

18441848
try {
1845-
try {
1846-
scriptRunner.run("selector script", basedir, selectorScript, context, logger);
1847-
} catch (ScriptReturnException e) {
1848-
selectorResult = false;
1849-
return false;
1850-
} catch (ScriptException e) {
1851-
throw new RunFailureException(BuildJob.Result.ERROR, e);
1852-
}
1853-
1854-
try {
1855-
scriptRunner.run("pre-build script", basedir, preBuildHookScript, context, logger);
1856-
} catch (ScriptException e) {
1857-
throw new RunFailureException(BuildJob.Result.FAILURE_PRE_HOOK, e);
1858-
}
1849+
runPreBuildHook(basedir, context, logger);
18591850

18601851
for (int invocationIndex = 1; ; invocationIndex++) {
18611852
if (invocationIndex > 1 && !invokerProperties.isInvocationDefined(invocationIndex)) {
@@ -1889,6 +1880,7 @@ private boolean runBuild(
18891880

18901881
Properties userProperties =
18911882
getUserProperties(basedir, invokerProperties.getUserPropertiesFile(invocationIndex));
1883+
userProperties.putAll(scriptUserProperties);
18921884
request.setProperties(userProperties);
18931885

18941886
invokerProperties.configureInvocation(request, invocationIndex);
@@ -1911,12 +1903,8 @@ private boolean runBuild(
19111903
"Maven invocation failed. " + e.getMessage(), BuildJob.Result.FAILURE_BUILD);
19121904
}
19131905
}
1914-
} catch (IOException e) {
1915-
throw new MojoExecutionException(e.getMessage(), e);
19161906
} finally {
1917-
if (selectorResult) {
1918-
runPostBuildHook(basedir, context, logger);
1919-
}
1907+
runPostBuildHook(basedir, context, logger);
19201908
}
19211909
return true;
19221910
}
@@ -1931,6 +1919,31 @@ int getParallelThreadsCount() {
19311919
}
19321920
}
19331921

1922+
private boolean runSelectorHook(File basedir, Map<String, Object> context, FileLogger logger)
1923+
throws MojoExecutionException, RunFailureException {
1924+
try {
1925+
scriptRunner.run("selector script", basedir, selectorScript, context, logger);
1926+
} catch (ScriptReturnException e) {
1927+
return false;
1928+
} catch (ScriptException e) {
1929+
throw new RunFailureException(BuildJob.Result.ERROR, e);
1930+
} catch (IOException e) {
1931+
throw new MojoExecutionException(e.getMessage(), e);
1932+
}
1933+
return true;
1934+
}
1935+
1936+
private void runPreBuildHook(File basedir, Map<String, Object> context, FileLogger logger)
1937+
throws MojoExecutionException, RunFailureException {
1938+
try {
1939+
scriptRunner.run("pre-build script", basedir, preBuildHookScript, context, logger);
1940+
} catch (ScriptException e) {
1941+
throw new RunFailureException(BuildJob.Result.FAILURE_PRE_HOOK, e);
1942+
} catch (IOException e) {
1943+
throw new MojoExecutionException(e.getMessage(), e);
1944+
}
1945+
}
1946+
19341947
private void runPostBuildHook(File basedir, Map<String, Object> context, FileLogger logger)
19351948
throws MojoExecutionException, RunFailureException {
19361949
try {

‎src/site/apt/examples/post-build-script.apt.vm

Lines changed: 0 additions & 97 deletions
This file was deleted.

0 commit comments

Comments
 (0)