Skip to content

Commit 9160128

Browse files
committed
Cleanup SDG Maven parent and spring-data-geode module POM files.
Move all build plugin configuraton to the parent. Remove the 'ci' and 'distribute' build profile specific 'maven-javadoc-plugin' configuration. Resolves spring-projectsgh-538.
1 parent 9030ae3 commit 9160128

File tree

2 files changed

+23
-71
lines changed

2 files changed

+23
-71
lines changed

pom.xml

+23-48
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@
5656

5757
<build>
5858
<plugins>
59+
5960
<plugin>
6061
<groupId>org.apache.maven.plugins</groupId>
6162
<artifactId>maven-javadoc-plugin</artifactId>
@@ -64,60 +65,34 @@
6465
<dependencySourceExclude>org.apache.geode:geode-gfsh</dependencySourceExclude>
6566
</dependencySourceExcludes>
6667
<failOnWarnings>false</failOnWarnings>
67-
<links>
68+
<links combine.children="append">
6869
<link>https://geode.apache.org/releases/latest/javadoc/</link>
6970
</links>
7071
</configuration>
7172
</plugin>
73+
74+
<plugin>
75+
<groupId>org.apache.maven.plugins</groupId>
76+
<artifactId>maven-surefire-plugin</artifactId>
77+
<configuration>
78+
<argLine>--add-opens java.base/java.nio=ALL-UNNAMED --add-opens java.base/java.util=ALL-UNNAMED</argLine>
79+
<includes>
80+
<include>**/*Tests.java</include>
81+
<include>**/*Test.java</include>
82+
</includes>
83+
<reuseForks>false</reuseForks>
84+
<systemProperties>
85+
<java.util.logging.config.file>${basedir}/src/test/resources/java-util-logging.properties</java.util.logging.config.file>
86+
<gemfire.disableShutdownHook>true</gemfire.disableShutdownHook>
87+
<logback.log.level>error</logback.log.level>
88+
<spring.profiles.active>apache-geode</spring.profiles.active>
89+
</systemProperties>
90+
</configuration>
91+
</plugin>
92+
7293
</plugins>
7394
</build>
7495

75-
<profiles>
76-
77-
<profile>
78-
<id>ci</id>
79-
<build>
80-
<plugins>
81-
<plugin>
82-
<groupId>org.apache.maven.plugins</groupId>
83-
<artifactId>maven-javadoc-plugin</artifactId>
84-
<configuration>
85-
<dependencySourceExcludes>
86-
<dependencySourceExclude>org.apache.geode:geode-gfsh</dependencySourceExclude>
87-
</dependencySourceExcludes>
88-
<failOnWarnings>false</failOnWarnings>
89-
<links>
90-
<link>https://geode.apache.org/releases/latest/javadoc/</link>
91-
</links>
92-
</configuration>
93-
</plugin>
94-
</plugins>
95-
</build>
96-
</profile>
97-
98-
<profile>
99-
<id>distribute</id>
100-
<build>
101-
<plugins>
102-
<plugin>
103-
<groupId>org.apache.maven.plugins</groupId>
104-
<artifactId>maven-javadoc-plugin</artifactId>
105-
<configuration>
106-
<dependencySourceExcludes>
107-
<dependencySourceExclude>org.apache.geode:geode-gfsh</dependencySourceExclude>
108-
</dependencySourceExcludes>
109-
<failOnWarnings>false</failOnWarnings>
110-
<links>
111-
<link>https://geode.apache.org/releases/latest/javadoc/</link>
112-
</links>
113-
</configuration>
114-
</plugin>
115-
</plugins>
116-
</build>
117-
</profile>
118-
119-
</profiles>
120-
12196
<repositories>
12297

12398
<repository>
@@ -137,7 +112,7 @@
137112
</releases>
138113
</repository>
139114

140-
<!--
115+
<!--
141116
<repository>
142117
<id>apache-snapshots</id>
143118
<url>https://repository.apache.org/content/repositories/orgapachegeode-1060</url>

spring-data-geode/pom.xml

-23
Original file line numberDiff line numberDiff line change
@@ -254,29 +254,6 @@
254254

255255
</dependencies>
256256

257-
<build>
258-
<plugins>
259-
<plugin>
260-
<groupId>org.apache.maven.plugins</groupId>
261-
<artifactId>maven-surefire-plugin</artifactId>
262-
<configuration>
263-
<argLine>--add-opens java.base/java.nio=ALL-UNNAMED --add-opens java.base/java.util=ALL-UNNAMED</argLine>
264-
<includes>
265-
<include>**/*Tests.java</include>
266-
<include>**/*Test.java</include>
267-
</includes>
268-
<reuseForks>false</reuseForks>
269-
<systemProperties>
270-
<java.util.logging.config.file>${basedir}/src/test/resources/java-util-logging.properties</java.util.logging.config.file>
271-
<gemfire.disableShutdownHook>true</gemfire.disableShutdownHook>
272-
<logback.log.level>error</logback.log.level>
273-
<spring.profiles.active>apache-geode</spring.profiles.active>
274-
</systemProperties>
275-
</configuration>
276-
</plugin>
277-
</plugins>
278-
</build>
279-
280257
<profiles>
281258

282259
<profile>

0 commit comments

Comments
 (0)