Skip to content

Commit f9e04c5

Browse files
mp911demp911de
committed
Remove duplicate plugin setup from parent pom.
Closes #3474
1 parent 4db0ac2 commit f9e04c5

File tree

2 files changed

+46
-119
lines changed

2 files changed

+46
-119
lines changed

Diff for: ‎pom.xml

-116
Original file line numberDiff line numberDiff line change
@@ -111,43 +111,6 @@
111111
</repository>
112112
</repositories>
113113
</profile>
114-
<profile>
115-
<id>all-dbs</id>
116-
<build>
117-
<plugins>
118-
<plugin>
119-
<groupId>org.apache.maven.plugins</groupId>
120-
<artifactId>maven-surefire-plugin</artifactId>
121-
<executions>
122-
<execution>
123-
<id>mysql-test</id>
124-
<phase>test</phase>
125-
<goals>
126-
<goal>test</goal>
127-
</goals>
128-
<configuration>
129-
<includes>
130-
<include>**/MySql*IntegrationTests.java</include>
131-
</includes>
132-
</configuration>
133-
</execution>
134-
<execution>
135-
<id>postgres-test</id>
136-
<phase>test</phase>
137-
<goals>
138-
<goal>test</goal>
139-
</goals>
140-
<configuration>
141-
<includes>
142-
<include>**/Postgres*IntegrationTests.java</include>
143-
</includes>
144-
</configuration>
145-
</execution>
146-
</executions>
147-
</plugin>
148-
</plugins>
149-
</build>
150-
</profile>
151114
<profile>
152115
<id>eclipselink-next</id>
153116
<properties>
@@ -188,85 +151,6 @@
188151
</dependencies>
189152

190153
<build>
191-
<plugins>
192-
193-
<plugin>
194-
<groupId>org.apache.maven.plugins</groupId>
195-
<artifactId>maven-surefire-plugin</artifactId>
196-
<dependencies>
197-
<dependency>
198-
<groupId>org.springframework</groupId>
199-
<artifactId>spring-instrument</artifactId>
200-
<version>${spring}</version>
201-
<scope>runtime</scope>
202-
</dependency>
203-
</dependencies>
204-
<executions>
205-
<execution>
206-
<!-- override the default-test execution and exclude everything -->
207-
<id>default-test</id>
208-
<configuration>
209-
<excludes>
210-
<exclude>**/*</exclude>
211-
</excludes>
212-
</configuration>
213-
</execution>
214-
<execution>
215-
<id>unit-test</id>
216-
<goals>
217-
<goal>test</goal>
218-
</goals>
219-
<phase>test</phase>
220-
<configuration>
221-
<includes>
222-
<include>**/*UnitTests.java</include>
223-
</includes>
224-
</configuration>
225-
</execution>
226-
<execution>
227-
<id>integration-test</id>
228-
<goals>
229-
<goal>test</goal>
230-
</goals>
231-
<phase>test</phase>
232-
<configuration>
233-
<includes>
234-
<include>**/*IntegrationTests.java</include>
235-
<include>**/*Tests.java</include>
236-
</includes>
237-
<excludes>
238-
<exclude>**/*UnitTests.java</exclude>
239-
<exclude>**/OpenJpa*</exclude>
240-
<exclude>**/EclipseLink*</exclude>
241-
<exclude>**/MySql*</exclude>
242-
<exclude>**/Postgres*</exclude>
243-
</excludes>
244-
<argLine>
245-
-javaagent:${settings.localRepository}/org/springframework/spring-instrument/${spring}/spring-instrument-${spring}.jar
246-
</argLine>
247-
</configuration>
248-
</execution>
249-
<execution>
250-
<id>eclipselink-test</id>
251-
<goals>
252-
<goal>test</goal>
253-
</goals>
254-
<phase>test</phase>
255-
<configuration>
256-
<includes>
257-
<include>**/EclipseLink*Tests.java</include>
258-
</includes>
259-
<argLine>
260-
-javaagent:${settings.localRepository}/org/eclipse/persistence/org.eclipse.persistence.jpa/${eclipselink}/org.eclipse.persistence.jpa-${eclipselink}.jar
261-
-javaagent:${settings.localRepository}/org/springframework/spring-instrument/${spring}/spring-instrument-${spring}.jar
262-
</argLine>
263-
</configuration>
264-
</execution>
265-
</executions>
266-
</plugin>
267-
268-
</plugins>
269-
270154
<pluginManagement>
271155
<plugins>
272156
<plugin>

Diff for: ‎spring-data-jpa/pom.xml

+46-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
2-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3-
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
2+
<project xmlns="http://maven.apache.org/POM/4.0.0"
3+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
45

56
<modelVersion>4.0.0</modelVersion>
67

@@ -336,7 +337,8 @@
336337
<phase>generate-sources</phase>
337338
<configuration>
338339
<visitor>true</visitor>
339-
<sourceDirectory>${project.basedir}/src/main/antlr4</sourceDirectory>
340+
<sourceDirectory>${project.basedir}/src/main/antlr4
341+
</sourceDirectory>
340342
</configuration>
341343
</execution>
342344
</executions>
@@ -427,4 +429,45 @@
427429
</plugins>
428430
</build>
429431

432+
<profiles>
433+
<profile>
434+
<id>all-dbs</id>
435+
<build>
436+
<plugins>
437+
<plugin>
438+
<groupId>org.apache.maven.plugins</groupId>
439+
<artifactId>maven-surefire-plugin</artifactId>
440+
<executions>
441+
<execution>
442+
<id>mysql-test</id>
443+
<phase>test</phase>
444+
<goals>
445+
<goal>test</goal>
446+
</goals>
447+
<configuration>
448+
<includes>
449+
<include>**/MySql*IntegrationTests.java</include>
450+
</includes>
451+
</configuration>
452+
</execution>
453+
<execution>
454+
<id>postgres-test</id>
455+
<phase>test</phase>
456+
<goals>
457+
<goal>test</goal>
458+
</goals>
459+
<configuration>
460+
<includes>
461+
<include>**/Postgres*IntegrationTests.java
462+
</include>
463+
</includes>
464+
</configuration>
465+
</execution>
466+
</executions>
467+
</plugin>
468+
</plugins>
469+
</build>
470+
</profile>
471+
</profiles>
472+
430473
</project>

0 commit comments

Comments
 (0)