Skip to content

Commit

Permalink
Revert "chore: replace exec-maven-plugin with gradle-maven-plugin (#1…
Browse files Browse the repository at this point in the history
…2501)" (#12551)

This reverts commit 2ecff67.
  • Loading branch information
manolo authored Dec 10, 2021
1 parent b760910 commit 66c589e
Showing 1 changed file with 37 additions and 26 deletions.
63 changes: 37 additions & 26 deletions flow-plugins/flow-gradle-plugin/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,10 @@
central repo is done within platform final releases.
</description>

<properties>
<gradle.executable>./gradlew</gradle.executable>
</properties>

<dependencies>
<dependency>
<groupId>com.vaadin</groupId>
Expand Down Expand Up @@ -51,40 +55,34 @@
</execution>
</executions>
</plugin>
<!-- run gradle tasks -->

<!-- execute Gradle command -->
<plugin>
<groupId>codes.rafael.gradlemavenplugin</groupId>
<artifactId>gradle-maven-plugin</artifactId>
<version>1.0.10</version>
<configuration>
<gradleVersion>7.3</gradleVersion>
<tasks>
<task>clean</task>
<task>build</task>
<task>javadocJar</task>
</tasks>
<args>
<arg>-x</arg>
<arg>functionalTest</arg>
<arg>-S</arg>
</args>
</configuration>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
<version>3.0.0</version>
<executions>
<execution>
<id>gradle</id>
<phase>prepare-package</phase>
<configuration>
<executable>${gradle.executable}</executable>
<arguments>
<argument>clean</argument>
<argument>build</argument>
<argument>javadocJar</argument>
<argument>-x</argument>
<argument>functionalTest</argument>
<argument>-S</argument>
</arguments>
</configuration>
<goals>
<goal>invoke</goal>
<goal>exec</goal>
</goals>
</execution>
</executions>
<dependencies>
<dependency>
<groupId>org.gradle</groupId>
<artifactId>gradle-tooling-api</artifactId>
<version>7.3-20210825160000+0000</version>
</dependency>
</dependencies>
</plugin>

<!-- copy generated JARs -->
<plugin>
<artifactId>maven-resources-plugin</artifactId>
Expand Down Expand Up @@ -140,7 +138,20 @@
</execution>
</executions>
</plugin>

</plugins>
</build>

<profiles>
<profile>
<id>windows_profile</id>
<activation>
<os>
<family>Windows</family>
</os>
</activation>
<properties>
<gradle.executable>gradlew.bat</gradle.executable>
</properties>
</profile>
</profiles>
</project>

0 comments on commit 66c589e

Please sign in to comment.