Skip to content

Commit e7a0a59

Browse files
committed
Specify release flag to build on newer JDKs
* Add maven.compiler.release option to force correct cross-compilation to Java 11 when building with a JDK newer than 11, such as JDK 17 * Remove unnecessary java source, target, and encoding config from plugins when those are already specified by properties * Fix submodule for core/in-memory-accumulo to point to in-memory-accumulo's main branch instead of the one being developed for the accumulo4 branch * Also fix the license name for Apache-2.0 (the recommended name is the SPDX name) and drop .txt from the license URL
1 parent 439dbef commit e7a0a59

File tree

5 files changed

+15
-27
lines changed

5 files changed

+15
-27
lines changed

microservices/configcheck/pom.xml

+3-6
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@
1313
</repository>
1414
</distributionManagement>
1515
<properties>
16-
<java.version>11</java.version>
17-
<maven.compiler.source>${java.version}</maven.compiler.source>
18-
<maven.compiler.target>${java.version}</maven.compiler.target>
16+
<maven.compiler.release>11</maven.compiler.release>
17+
<maven.compiler.source>${maven.compiler.release}</maven.compiler.source>
18+
<maven.compiler.target>${maven.compiler.release}</maven.compiler.target>
1919
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
2020
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
2121
<spotbugs.excludes.file />
@@ -209,9 +209,6 @@
209209
<configuration>
210210
<configFile>eclipse/Eclipse-Datawave-Codestyle.xml</configFile>
211211
<lineEnding>LF</lineEnding>
212-
<compilerSource>${maven.compiler.source}</compilerSource>
213-
<compilerCompliance>${maven.compiler.source}</compilerCompliance>
214-
<compilerTargetPlatform>${maven.compiler.target}</compilerTargetPlatform>
215212
</configuration>
216213
</plugin>
217214
<plugin>

pom.xml

+5-16
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
<url>https://code.nsa.gov/datawave</url>
1111
<licenses>
1212
<license>
13-
<name>The Apache License, Version 2.0</name>
14-
<url>https://www.apache.org/licenses/LICENSE-2.0.txt</url>
13+
<name>Apache-2.0</name>
14+
<url>https://www.apache.org/licenses/LICENSE-2.0</url>
1515
</license>
1616
</licenses>
1717
<modules>
@@ -34,8 +34,9 @@
3434
</repository>
3535
</distributionManagement>
3636
<properties>
37-
<maven.compiler.source>11</maven.compiler.source>
38-
<maven.compiler.target>11</maven.compiler.target>
37+
<maven.compiler.release>11</maven.compiler.release>
38+
<maven.compiler.source>${maven.compiler.release}</maven.compiler.source>
39+
<maven.compiler.target>${maven.compiler.release}</maven.compiler.target>
3940
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
4041
<surefire.forkCount>1C</surefire.forkCount>
4142
<version.accumulo>2.1.2</version.accumulo>
@@ -1371,9 +1372,6 @@
13711372
<removeTrailingWhitespace>true</removeTrailingWhitespace>
13721373
<configFile>eclipse/Eclipse-Datawave-Codestyle.xml</configFile>
13731374
<lineEnding>LF</lineEnding>
1374-
<compilerSource>${maven.compiler.source}</compilerSource>
1375-
<compilerCompliance>${maven.compiler.source}</compilerCompliance>
1376-
<compilerTargetPlatform>${maven.compiler.target}</compilerTargetPlatform>
13771375
</configuration>
13781376
<dependencies>
13791377
<dependency>
@@ -1483,11 +1481,8 @@
14831481
<artifactId>maven-compiler-plugin</artifactId>
14841482
<version>3.8.1</version>
14851483
<configuration>
1486-
<encoding>UTF-8</encoding>
14871484
<showDeprecation>true</showDeprecation>
14881485
<showWarnings>true</showWarnings>
1489-
<source>${maven.compiler.source}</source>
1490-
<target>${maven.compiler.target}</target>
14911486
<compilerArgs>
14921487
<arg>-Xlint:all</arg>
14931488
<arg>-Xlint:-processing</arg>
@@ -1671,7 +1666,6 @@
16711666
<artifactId>maven-resources-plugin</artifactId>
16721667
<version>2.7</version>
16731668
<configuration>
1674-
<encoding>UTF-8</encoding>
16751669
<escapeString>\</escapeString>
16761670
</configuration>
16771671
<dependencies>
@@ -1814,10 +1808,6 @@
18141808
<artifactId>read-properties</artifactId>
18151809
</plugin>
18161810
<?SORTPOM RESUME?>
1817-
<plugin>
1818-
<groupId>org.apache.maven.plugins</groupId>
1819-
<artifactId>maven-compiler-plugin</artifactId>
1820-
</plugin>
18211811
</plugins>
18221812
</build>
18231813
<profiles>
@@ -1937,7 +1927,6 @@
19371927
</goals>
19381928
<phase>package</phase>
19391929
<configuration>
1940-
<encoding>UTF-8</encoding>
19411930
<outputDirectory>${project.build.directory}/apidocs</outputDirectory>
19421931
<additionalJOption>-J-Xmx768m</additionalJOption>
19431932
<tags>

warehouse/ingest-ssdeep/pom.xml

+3-2
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,9 @@
88
</parent>
99
<artifactId>datawave-ingest-ssdeep</artifactId>
1010
<properties>
11-
<maven.compiler.source>11</maven.compiler.source>
12-
<maven.compiler.target>11</maven.compiler.target>
11+
<maven.compiler.release>11</maven.compiler.release>
12+
<maven.compiler.source>${maven.compiler.release}</maven.compiler.source>
13+
<maven.compiler.target>${maven.compiler.release}</maven.compiler.target>
1314
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
1415
</properties>
1516
<dependencies>

warehouse/ssdeep-common/pom.xml

+3-2
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,9 @@
88
</parent>
99
<artifactId>datawave-ssdeep-common</artifactId>
1010
<properties>
11-
<maven.compiler.source>11</maven.compiler.source>
12-
<maven.compiler.target>11</maven.compiler.target>
11+
<maven.compiler.release>11</maven.compiler.release>
12+
<maven.compiler.source>${maven.compiler.release}</maven.compiler.source>
13+
<maven.compiler.target>${maven.compiler.release}</maven.compiler.target>
1314
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
1415
</properties>
1516
<dependencies>

0 commit comments

Comments
 (0)