You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by gn...@apache.org on 2022/11/23 12:22:35 UTC
[maven-mvnd] branch master updated: Fix usage of the wrong groovy plugin
This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-mvnd.git
The following commit(s) were added to refs/heads/master by this push:
new b8297e2 Fix usage of the wrong groovy plugin
b8297e2 is described below
commit b8297e2ab63232ffea74460b9b5d3e03c93966dd
Author: Guillaume Nodet <gn...@gmail.com>
AuthorDate: Wed Nov 23 11:22:23 2022 +0100
Fix usage of the wrong groovy plugin
---
pom.xml | 42 ++++++++++++++++++++++--------------------
1 file changed, 22 insertions(+), 20 deletions(-)
diff --git a/pom.xml b/pom.xml
index d32021c..4cb4da8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -487,8 +487,8 @@ limitations under the License.</inlineHeader>
</executions>
</plugin>
<plugin>
- <groupId>org.codehaus.gmaven</groupId>
- <artifactId>groovy-maven-plugin</artifactId>
+ <groupId>org.codehaus.gmavenplus</groupId>
+ <artifactId>gmavenplus-plugin</artifactId>
<executions>
<execution>
<id>set-platform-properties</id>
@@ -497,24 +497,26 @@ limitations under the License.</inlineHeader>
</goals>
<phase>generate-sources</phase>
<configuration>
- <source>// Naming conventions coined by GraalVM
- // https://github.com/graalvm/graalvm-ce-builds/releases/
- String osName = System.getProperty('os.name').toLowerCase(Locale.ROOT)
- if (osName.startsWith('windows')) {
- project.properties['os.detected.name'] = 'windows'
- } else if (osName.startsWith('linux')) {
- project.properties['os.detected.name'] = 'linux'
- } else if (osName.startsWith('osx') || osName.startsWith('mac os x')) {
- project.properties['os.detected.name'] = 'darwin'
- } else {
- project.properties['os.detected.name'] = osName
- }
- String osArch = System.getProperty('os.arch').toLowerCase(Locale.ROOT)
- if (osArch.equals('amd64') || osArch.equals('x86_64')) {
- project.properties['os.detected.arch'] = 'amd64'
- } else {
- project.properties['os.detected.arch'] = osArch
- }</source>
+ <scripts>
+ <script>// Naming conventions coined by GraalVM
+ // https://github.com/graalvm/graalvm-ce-builds/releases/
+ String osName = System.getProperty('os.name').toLowerCase(Locale.ROOT)
+ if (osName.startsWith('windows')) {
+ project.properties['os.detected.name'] = 'windows'
+ } else if (osName.startsWith('linux')) {
+ project.properties['os.detected.name'] = 'linux'
+ } else if (osName.startsWith('osx') || osName.startsWith('mac os x')) {
+ project.properties['os.detected.name'] = 'darwin'
+ } else {
+ project.properties['os.detected.name'] = osName
+ }
+ String osArch = System.getProperty('os.arch').toLowerCase(Locale.ROOT)
+ if (osArch.equals('amd64') || osArch.equals('x86_64')) {
+ project.properties['os.detected.arch'] = 'amd64'
+ } else {
+ project.properties['os.detected.arch'] = osArch
+ }</script>
+ </scripts>
</configuration>
</execution>
</executions>