Skip to content

Commit 9f4a4a5

Browse files
committed
Release Process update POM to 6.1.0.
Update plugins. Fine tune maven enforcer parameters.
1 parent e5f9dcf commit 9f4a4a5

1 file changed

Lines changed: 15 additions & 21 deletions

File tree

pom.xml

Lines changed: 15 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ under the License.
3333

3434
<groupId>org.apache.datasketches</groupId>
3535
<artifactId>datasketches-java</artifactId>
36-
<version>6.1.0-SNAPSHOT</version>
36+
<version>6.1.0</version>
3737
<packaging>jar</packaging>
3838

3939
<name>${project.artifactId}</name>
@@ -93,8 +93,9 @@ under the License.
9393
<testng.check-cpp-historical-files>check_cpp_historical_files</testng.check-cpp-historical-files>
9494

9595
<!-- System-wide properties -->
96-
<maven.version>3.6.3</maven.version>
97-
<java.version>8</java.version>
96+
<maven.version>[3.6.3,4.0.0)</maven.version>
97+
<java.version>1.8</java.version>
98+
<require-java.version>[1.8,9.0),[11.0,12.0),[17,18)</require-java.version>
9899
<maven.compiler.source>${java.version}</maven.compiler.source>
99100
<maven.compiler.target>${java.version}</maven.compiler.target>
100101
<argLine>-Xmx4g -Duser.language=en -Duser.country=US -Dfile.encoding=UTF-8</argLine>
@@ -107,15 +108,15 @@ under the License.
107108
<!-- org.apache.maven plugins -->
108109
<maven-assembly-plugin.version>3.7.1</maven-assembly-plugin.version>
109110
<maven-compiler-plugin.version>3.13.0</maven-compiler-plugin.version>
110-
<maven-deploy-plugin.version>3.1.2</maven-deploy-plugin.version>
111-
<maven-enforcer-plugin.version>3.4.1</maven-enforcer-plugin.version>
112-
<maven-gpg-plugin.version>3.2.3</maven-gpg-plugin.version>
113-
<maven-jar-plugin.version>3.4.1</maven-jar-plugin.version>
114-
<maven-javadoc-plugin.version>3.6.3</maven-javadoc-plugin.version>
115-
<maven-release-plugin.version>3.0.1</maven-release-plugin.version>
111+
<maven-deploy-plugin.version>3.1.3</maven-deploy-plugin.version>
112+
<maven-enforcer-plugin.version>3.5.0</maven-enforcer-plugin.version>
113+
<maven-gpg-plugin.version>3.2.5</maven-gpg-plugin.version>
114+
<maven-jar-plugin.version>3.4.2</maven-jar-plugin.version>
115+
<maven-javadoc-plugin.version>3.8.0</maven-javadoc-plugin.version>
116+
<maven-release-plugin.version>3.1.1</maven-release-plugin.version>
116117
<maven-remote-resources-plugin.version>3.2.0</maven-remote-resources-plugin.version>
117118
<maven-source-plugin.version>3.3.1</maven-source-plugin.version>
118-
<maven-surefire-failsafe-plugins.version>3.2.5</maven-surefire-failsafe-plugins.version> <!-- for surefire, failsafe and surefire-report-->
119+
<maven-surefire-failsafe-plugins.version>3.4.0</maven-surefire-failsafe-plugins.version> <!-- for surefire, failsafe and surefire-report-->
119120
<!-- com.github plugins -->
120121
<git-commit-id-plugin.version>4.9.10</git-commit-id-plugin.version>
121122
<!-- org.apache.creadur plugins -->
@@ -126,7 +127,7 @@ under the License.
126127
<!-- org.jacoco maven plugins -->
127128
<jacoco-maven-plugin.version>0.8.12</jacoco-maven-plugin.version>
128129
<!-- org.mojohaus plugins -->
129-
<versions-maven-plugin.version>2.16.2</versions-maven-plugin.version>
130+
<versions-maven-plugin.version>2.17.1</versions-maven-plugin.version>
130131
<!-- other -->
131132
<lifecycle-mapping.version>1.0.0</lifecycle-mapping.version>
132133
</properties>
@@ -145,13 +146,6 @@ under the License.
145146
<version>${testng.version}</version>
146147
<scope>test</scope>
147148
</dependency>
148-
<!--
149-
<dependency>
150-
<groupId>org.apache.datasketches</groupId>
151-
<artifactId>datasketches-java-common</artifactId>
152-
<version>1.0.0</version>
153-
</dependency>
154-
-->
155149
</dependencies>
156150

157151
<build>
@@ -190,10 +184,10 @@ under the License.
190184
<configuration>
191185
<rules>
192186
<requireJavaVersion>
193-
<version>[1.8.0,9.0),[11.0,12.0)</version>
187+
<version>${require-java.version}</version>
194188
</requireJavaVersion>
195189
<requireMavenVersion>
196-
<version>[${maven.version},)</version>
190+
<version>${maven.version}</version>
197191
</requireMavenVersion>
198192
<bannedDependencies>
199193
<excludes>
@@ -626,7 +620,7 @@ under the License.
626620
<profile>
627621
<id>java8only</id>
628622
<activation>
629-
<jdk>[1.8,1.9),8</jdk>
623+
<jdk>[1.8,9)</jdk>
630624
</activation>
631625
</profile>
632626

0 commit comments

Comments
 (0)