Skip to content

Commit 0f5e380

Browse files
vharsekovharseko
authored
Drop the stale animal-sniffer Java 1.7 API check from persistit (#276)
* Drop the stale animal-sniffer Java 1.7 API check from persistit The persistit modules pinned animal-sniffer to the signature org.codehaus.mojo.signature:java17:1.0 — the Java 1.7 API surface — inherited from the upstream Akiban Persistit build. The project compiles at maven.compiler.release=11, so the check enforced a baseline three releases below the declared one, and javac already enforces the real baseline natively via `release`. The check was redundant and wrong. It never ran in CI until #270 switched the build from `mvn package` to `mvn verify`: animal-sniffer binds to the verify phase. Once it started running it failed on Java 8 APIs merged earlier under `mvn package` — ThreadLocal.withInitial (#228) and Long.hashCode(long) (#232). Remove the plugin declarations from the core and ui modules along with the signature properties in the parent. Nothing else refers to it: there are no @IgnoreJRERequirement annotations in the tree. * Add the missing license headers to the persistit poms The three persistit poms carried no license header. They are not upstream Akiban files: they were added in #12 when the build artifacts were reorganized, so there is no upstream owner to preserve. Use the CDDL block of the root pom, which is their parent, with a standalone 3A Systems copyright covering 2020 (when the files were added) through the current year.
1 parent 3f8c989 commit 0f5e380

3 files changed

Lines changed: 45 additions & 36 deletions

File tree

‎persistit/core/pom.xml‎

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,19 @@
11
<?xml version="1.0"?>
2+
<!--
3+
The contents of this file are subject to the terms of the Common Development and
4+
Distribution License (the License). You may not use this file except in compliance with the
5+
License.
6+
7+
You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the
8+
specific language governing permission and limitations under the License.
9+
10+
When distributing Covered Software, include this CDDL Header Notice in each file and include
11+
the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL
12+
Header, with the fields enclosed by brackets [] replaced by your own identifying
13+
information: "Portions copyright [year] [name of copyright owner]".
14+
15+
Copyright 2020-2026 3A Systems, LLC.
16+
-->
217
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
318
<modelVersion>4.0.0</modelVersion>
419

@@ -85,10 +100,6 @@
85100
<artifactId>license-maven-plugin</artifactId>
86101
<version>2.6</version>
87102
</plugin>
88-
<plugin>
89-
<groupId>org.codehaus.mojo</groupId>
90-
<artifactId>animal-sniffer-maven-plugin</artifactId>
91-
</plugin>
92103
</plugins>
93104
</build>
94105
</project>

‎persistit/pom.xml‎

Lines changed: 15 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,19 @@
11
<?xml version="1.0"?>
2+
<!--
3+
The contents of this file are subject to the terms of the Common Development and
4+
Distribution License (the License). You may not use this file except in compliance with the
5+
License.
6+
7+
You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the
8+
specific language governing permission and limitations under the License.
9+
10+
When distributing Covered Software, include this CDDL Header Notice in each file and include
11+
the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL
12+
Header, with the fields enclosed by brackets [] replaced by your own identifying
13+
information: "Portions copyright [year] [name of copyright owner]".
14+
15+
Copyright 2020-2026 3A Systems, LLC.
16+
-->
217
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
318
<modelVersion>4.0.0</modelVersion>
419

@@ -22,11 +37,6 @@
2237
</modules>
2338

2439
<properties>
25-
<!-- To configure animal-sniffer to check API compat -->
26-
<animal-sniffer.signature.groupId>org.codehaus.mojo.signature</animal-sniffer.signature.groupId>
27-
<animal-sniffer.signature.artifactId>java17</animal-sniffer.signature.artifactId>
28-
<animal-sniffer.signature.version>1.0</animal-sniffer.signature.version>
29-
<version.animal-sniffer.plugin>1.20</version.animal-sniffer.plugin>
3040
<version.maven-license.plugin>2.6</version.maven-license.plugin>
3141
</properties>
3242

@@ -45,29 +55,6 @@
4555
<pluginManagement>
4656
<!-- Plugins ordered by shortname (assembly, antrun ...) -->
4757
<plugins>
48-
<plugin>
49-
<groupId>org.codehaus.mojo</groupId>
50-
<artifactId>animal-sniffer-maven-plugin</artifactId>
51-
<version>${version.animal-sniffer.plugin}</version>
52-
<configuration>
53-
<signature>
54-
<groupId>${animal-sniffer.signature.groupId}</groupId>
55-
<artifactId>${animal-sniffer.signature.artifactId}</artifactId>
56-
<version>${animal-sniffer.signature.version}</version>
57-
</signature>
58-
<skip>${skipSanityChecks}</skip>
59-
</configuration>
60-
<executions>
61-
<execution>
62-
<id>enforce-java-api-compatibility</id>
63-
<phase>verify</phase>
64-
<goals>
65-
<goal>check</goal>
66-
</goals>
67-
</execution>
68-
</executions>
69-
</plugin>
70-
7158
<plugin>
7259
<groupId>org.codehaus.mojo</groupId>
7360
<artifactId>build-helper-maven-plugin</artifactId>

‎persistit/ui/pom.xml‎

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,19 @@
11
<?xml version="1.0"?>
2+
<!--
3+
The contents of this file are subject to the terms of the Common Development and
4+
Distribution License (the License). You may not use this file except in compliance with the
5+
License.
6+
7+
You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the
8+
specific language governing permission and limitations under the License.
9+
10+
When distributing Covered Software, include this CDDL Header Notice in each file and include
11+
the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL
12+
Header, with the fields enclosed by brackets [] replaced by your own identifying
13+
information: "Portions copyright [year] [name of copyright owner]".
14+
15+
Copyright 2020-2026 3A Systems, LLC.
16+
-->
217
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
318
<modelVersion>4.0.0</modelVersion>
419

@@ -26,10 +41,6 @@
2641
<groupId>com.mycila</groupId>
2742
<artifactId>license-maven-plugin</artifactId>
2843
</plugin>
29-
<plugin>
30-
<groupId>org.codehaus.mojo</groupId>
31-
<artifactId>animal-sniffer-maven-plugin</artifactId>
32-
</plugin>
3344
</plugins>
3445
</build>
3546
</project>

0 commit comments

Comments
 (0)