Skip to content

Commit 2606b5a

Browse files
committed
removed use of gradle maven plugin, reworked to use externally installed gradle through maven executor
1 parent be09670 commit 2606b5a

File tree

1 file changed

+14
-19
lines changed

1 file changed

+14
-19
lines changed

jbbp-plugins/jbbp-gradle/pom.xml

Lines changed: 14 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
<properties>
2525
<maven.compiler.source>1.8</maven.compiler.source>
2626
<maven.compiler.target>1.8</maven.compiler.target>
27+
<gradle.executable>gradle</gradle.executable>
2728
<gradleGoal>install</gradleGoal>
2829
</properties>
2930

@@ -93,29 +94,23 @@
9394
</executions>
9495
</plugin>
9596
<plugin>
96-
<groupId>org.fortasoft</groupId>
97-
<artifactId>gradle-maven-plugin</artifactId>
98-
<version>1.0.8</version>
99-
<dependencies>
100-
<dependency>
101-
<groupId>org.gradle</groupId>
102-
<artifactId>gradle-tooling-api</artifactId>
103-
<version>5.2.1</version>
104-
</dependency>
105-
</dependencies>
106-
107-
<configuration>
108-
<gradleVersion>5.4</gradleVersion>
109-
<tasks>
110-
<task>clean</task>
111-
<task>${gradleGoal}</task>
112-
</tasks>
113-
</configuration>
97+
<groupId>org.codehaus.mojo</groupId>
98+
<artifactId>exec-maven-plugin</artifactId>
11499
<executions>
115100
<execution>
101+
<id>gradle</id>
116102
<phase>compile</phase>
103+
<configuration>
104+
<executable>${gradle.executable}</executable>
105+
<arguments>
106+
<argument>${gradleGoal}</argument>
107+
<argument>-i</argument>
108+
<argument>-S</argument>
109+
<argument>--no-daemon</argument>
110+
</arguments>
111+
</configuration>
117112
<goals>
118-
<goal>invoke</goal>
113+
<goal>exec</goal>
119114
</goals>
120115
</execution>
121116
</executions>

0 commit comments

Comments
 (0)