Skip to content

Commit 5bdba15

Browse files
committed
Minor pom changes
1 parent 46d4bc9 commit 5bdba15

1 file changed

Lines changed: 13 additions & 33 deletions

File tree

pom.xml

Lines changed: 13 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
32
<!--
43
Licensed to the Apache Software Foundation (ASF) under one
54
or more contributor license agreements. See the NOTICE file
@@ -19,8 +18,10 @@ specific language governing permissions and limitations
1918
under the License.
2019
-->
2120

22-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
23-
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
21+
<project xmlns="http://maven.apache.org/POM/4.0.0"
22+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
23+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
24+
http://maven.apache.org/xsd/maven-4.0.0.xsd">
2425

2526
<modelVersion>4.0.0</modelVersion>
2627

@@ -33,7 +34,6 @@ under the License.
3334
<groupId>org.apache.datasketches</groupId>
3435
<artifactId>datasketches-java</artifactId>
3536
<version>3.1.0</version>
36-
<packaging>jar</packaging>
3737

3838
<name>${project.artifactId}</name>
3939
<description>Core sketch algorithms used alone and by other Java repositories in the DataSketches library.</description>
@@ -127,34 +127,9 @@ under the License.
127127
<coveralls-maven-plugin.version>4.3.0</coveralls-maven-plugin.version>
128128
<!-- other -->
129129
<lifecycle-mapping.version>1.0.0</lifecycle-mapping.version>
130-
<git-commit-id-maven-plugin.version>5.0.0</git-commit-id-maven-plugin.version>
130+
<git-commit-id-maven-plugin.version>4.0.4</git-commit-id-maven-plugin.version>
131131
</properties>
132132

133-
<repositories>
134-
<repository>
135-
<id>apache.snapshots</id>
136-
<name>Apache Snapshot Repository</name>
137-
<url>https://repository.apache.org/content/groups/snapshots/org/apache/datasketches/</url>
138-
<releases>
139-
<enabled>false</enabled>
140-
</releases>
141-
<snapshots>
142-
<enabled>true</enabled>
143-
</snapshots>
144-
</repository>
145-
<repository>
146-
<id>apache</id>
147-
<name>Apache Releases Repository</name>
148-
<url>https://repository.apache.org/content/repositories/releases/org/apache/datasketches/</url>
149-
<releases>
150-
<enabled>true</enabled>
151-
</releases>
152-
<snapshots>
153-
<enabled>false</enabled>
154-
</snapshots>
155-
</repository>
156-
</repositories>
157-
158133
<dependencies>
159134
<!-- UNIQUE FOR THIS JAVA COMPONENT -->
160135
<dependency>
@@ -251,10 +226,10 @@ under the License.
251226
<configuration>
252227
<rules>
253228
<requireJavaVersion>
254-
<version>${java.version}</version>
229+
<version>[1.8,1.9),[8,14)</version>
255230
</requireJavaVersion>
256231
<requireMavenVersion>
257-
<version>${maven.version},</version>
232+
<version>[${maven.version},)</version>
258233
</requireMavenVersion>
259234
<bannedDependencies>
260235
<excludes>
@@ -462,6 +437,10 @@ under the License.
462437

463438
<profile>
464439
<id>strict</id>
440+
<!-- The error prone compiler is only currently supported for compilation in JDK 8 -->
441+
<activation>
442+
<jdk>[1.8, 1.9),8</jdk>
443+
</activation>
465444
<build>
466445
<pluginManagement>
467446
<plugins>
@@ -522,7 +501,8 @@ under the License.
522501
<format>json</format>
523502
<generateGitPropertiesFile>true</generateGitPropertiesFile>
524503
<generateGitPropertiesFilename>${project.build.directory}/git.properties</generateGitPropertiesFilename>
525-
<failOnNoGitDirectory>true</failOnNoGitDirectory>
504+
<!-- Maven commands are sometimes run on the release artifact directly, which is not a Git repository -->
505+
<failOnNoGitDirectory>false</failOnNoGitDirectory>
526506
<failOnUnableToExtractRepoInfo>true</failOnUnableToExtractRepoInfo>
527507
<commitIdGenerationMode>full</commitIdGenerationMode>
528508
<includeOnlyProperties>

0 commit comments

Comments
 (0)