Skip to content

Commit 69dd5eb

Browse files
committed
Removed JDK8 profiles
Signed-off-by: David Matějček <[email protected]> # Conflicts: # pom.xml
1 parent 83ffba3 commit 69dd5eb

File tree

2 files changed

+6
-65
lines changed

2 files changed

+6
-65
lines changed

functional-tests/pom.xml

Lines changed: 0 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -237,42 +237,6 @@
237237
</build>
238238

239239
<profiles>
240-
<!-- add tools.jar to path when on Linux or Windows -->
241-
<profile>
242-
<id>tools.jar</id>
243-
<activation>
244-
<file>
245-
<exists>${java.home}/../lib/tools.jar</exists>
246-
</file>
247-
</activation>
248-
<dependencies>
249-
<dependency>
250-
<groupId>com.sun</groupId>
251-
<artifactId>tools</artifactId>
252-
<version>1.6.0</version>
253-
<scope>system</scope>
254-
<systemPath>${java.home}/../lib/tools.jar</systemPath>
255-
</dependency>
256-
</dependencies>
257-
<build>
258-
<plugins>
259-
<plugin>
260-
<groupId>org.apache.maven.plugins</groupId>
261-
<artifactId>maven-antrun-plugin</artifactId>
262-
<dependencies>
263-
<dependency>
264-
<groupId>com.sun</groupId>
265-
<artifactId>tools</artifactId>
266-
<version>1.6.0</version>
267-
<scope>system</scope>
268-
<systemPath>${java.home}/../lib/tools.jar</systemPath>
269-
</dependency>
270-
</dependencies>
271-
</plugin>
272-
</plugins>
273-
</build>
274-
</profile>
275-
276240
<profile>
277241
<id>all-tests</id>
278242
<build>

pom.xml

Lines changed: 6 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
<groupId>org.eclipse.ee4j</groupId>
2727
<artifactId>project</artifactId>
2828
<version>1.0.9</version>
29-
<relativePath/>
29+
<relativePath/>
3030
</parent>
3131

3232
<groupId>org.glassfish.corba</groupId>
@@ -104,9 +104,7 @@
104104
<copyright.template>make/copyright-information/copyright.txt</copyright.template>
105105
<copyright.update>false</copyright.update>
106106

107-
<jdkVersion>8</jdkVersion>
108-
<maven.compiler.source>${jdkVersion}</maven.compiler.source>
109-
<maven.compiler.target>${jdkVersion}</maven.compiler.target>
107+
<maven.compiler.release>11</maven.compiler.release>
110108
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
111109
<sonar.dynamicAnalysis>false</sonar.dynamicAnalysis>
112110
<pfl-version>5.0.0</pfl-version>
@@ -176,7 +174,6 @@
176174
<plugin>
177175
<groupId>org.apache.maven.plugins</groupId>
178176
<artifactId>maven-jar-plugin</artifactId>
179-
<version>3.4.2</version>
180177
<configuration>
181178
<archive>
182179
<manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
@@ -334,7 +331,7 @@
334331
<version>3.8.0</version>
335332
</plugin>
336333
<plugin>
337-
<groupId>org.apache.maven.plugins</groupId>
334+
<groupId>org.apache.maven.plugins</groupId>
338335
<artifactId>maven-enforcer-plugin</artifactId>
339336
<version>3.5.0</version>
340337
</plugin>
@@ -343,7 +340,7 @@
343340
<artifactId>maven-gpg-plugin</artifactId>
344341
<version>3.2.7</version>
345342
</plugin>
346-
<plugin>
343+
<plugin>
347344
<groupId>org.apache.maven.plugins</groupId>
348345
<artifactId>maven-source-plugin</artifactId>
349346
<version>3.3.1</version>
@@ -352,7 +349,7 @@
352349
<groupId>org.apache.maven.plugins</groupId>
353350
<artifactId>maven-javadoc-plugin</artifactId>
354351
<version>3.11.2</version>
355-
</plugin>
352+
</plugin>
356353
<plugin>
357354
<groupId>org.apache.maven.plugins</groupId>
358355
<artifactId>maven-compiler-plugin</artifactId>
@@ -412,18 +409,6 @@
412409
</reporting>
413410

414411
<profiles>
415-
416-
<!-- ignore javadoc lint checks, enabled by default in JDK 1.8 (really want to run based on toolchain selection) -->
417-
<profile>
418-
<id>disable-java8-doclint</id>
419-
<activation>
420-
<jdk>[1.8,)</jdk>
421-
</activation>
422-
<properties>
423-
<additionalparam>-Xdoclint:none</additionalparam>
424-
</properties>
425-
</profile>
426-
427412
<profile>
428413
<!-- include required legal artifacts in module jars -->
429414
<id>install-legal-files</id>
@@ -463,13 +448,5 @@
463448
</plugins>
464449
</build>
465450
</profile>
466-
<profile>
467-
<id>compiler-release-with-jdk9plus</id>
468-
<activation>
469-
<jdk>[9,)</jdk>
470-
</activation>
471-
<properties>
472-
<maven.compiler.release>${jdkVersion}</maven.compiler.release>
473-
</properties>
474-
</profile> </profiles>
451+
</profiles>
475452
</project>

0 commit comments

Comments
 (0)