Skip to content

Commit d2fc62e

Browse files
mp911demp911de
committed
Remove duplicate plugin setup from parent pom.
Closes #3474
1 parent 1fc50dd commit d2fc62e

File tree

2 files changed

+46
-119
lines changed

2 files changed

+46
-119
lines changed

‎pom.xml

-116
Original file line numberDiff line numberDiff line change
@@ -118,43 +118,6 @@
118118
</repository>
119119
</repositories>
120120
</profile>
121-
<profile>
122-
<id>all-dbs</id>
123-
<build>
124-
<plugins>
125-
<plugin>
126-
<groupId>org.apache.maven.plugins</groupId>
127-
<artifactId>maven-surefire-plugin</artifactId>
128-
<executions>
129-
<execution>
130-
<id>mysql-test</id>
131-
<phase>test</phase>
132-
<goals>
133-
<goal>test</goal>
134-
</goals>
135-
<configuration>
136-
<includes>
137-
<include>**/MySql*IntegrationTests.java</include>
138-
</includes>
139-
</configuration>
140-
</execution>
141-
<execution>
142-
<id>postgres-test</id>
143-
<phase>test</phase>
144-
<goals>
145-
<goal>test</goal>
146-
</goals>
147-
<configuration>
148-
<includes>
149-
<include>**/Postgres*IntegrationTests.java</include>
150-
</includes>
151-
</configuration>
152-
</execution>
153-
</executions>
154-
</plugin>
155-
</plugins>
156-
</build>
157-
</profile>
158121
<profile>
159122
<id>eclipselink-next</id>
160123
<properties>
@@ -185,85 +148,6 @@
185148
</dependencies>
186149

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

‎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)