Skip to content

Commit dbc6979

Browse files
leerholeerho
committed
update update_main
1 parent 67c3b91 commit dbc6979

2 files changed

Lines changed: 57 additions & 43 deletions

File tree

‎pom.xml‎

Lines changed: 55 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,14 @@ under the License.
3535
<url>https://datasketches.apache.org/</url>
3636
<inceptionYear>2015</inceptionYear>
3737

38+
<licenses>
39+
<license>
40+
<name>Apache-2.0</name>
41+
<url>https://www.apache.org/licenses/LICENSE-2.0.txt</url>
42+
<distribution>repo</distribution>
43+
</license>
44+
</licenses>
45+
3846
<mailingLists>
3947
<mailingList>
4048
<name>DataSketches Developers</name>
@@ -59,6 +67,19 @@ under the License.
5967
<tag>HEAD</tag>
6068
</scm>
6169

70+
<distributionManagement>
71+
<repository>
72+
<id>apache.releases.https</id>
73+
<name>Apache Release Distribution Repository</name>
74+
<url>https://repository.apache.org/service/local/staging/deploy/maven2</url>
75+
</repository>
76+
<snapshotRepository>
77+
<id>apache.snapshots.https</id>
78+
<name>Apache Development Snapshot Repository</name>
79+
<url>https://repository.apache.org/content/repositories/snapshots</url>
80+
</snapshotRepository>
81+
</distributionManagement>
82+
6283
<issueManagement>
6384
<system>GitHub</system>
6485
<url>https://github.com/apache/${project.artifactId}/issues</url>
@@ -93,30 +114,30 @@ under the License.
93114
<jvm.locale.encoding>-Dfile.encoding=UTF-8</jvm.locale.encoding>
94115
<jvm.args>${jvm.mem} ${jvm.locale.language} ${jvm.locale.country} ${jvm.locale.encoding}</jvm.args>
95116
<charset.encoding>UTF-8</charset.encoding>
117+
<project.build.outputTimestamp>2026-01-09T19:00:20Z</project.build.outputTimestamp>
96118
<project.build.sourceEncoding>${charset.encoding}</project.build.sourceEncoding>
97119
<project.build.resourceEncoding>${charset.encoding}</project.build.resourceEncoding>
120+
<project.reporting.inputEncoding>${charset.encoding}</project.reporting.inputEncoding>
98121
<project.reporting.outputEncoding>${charset.encoding}</project.reporting.outputEncoding>
99122
<project.reporting.outputDirectory>${project.build.directory}/site</project.reporting.outputDirectory>
100123
<maven.build.timestamp.format>yyyy-MM-dd'T'HH-mm-ss'Z'</maven.build.timestamp.format>
101124

102-
<!-- org.apache.maven plugins -->
103-
<maven-assembly-plugin.version>3.8.0</maven-assembly-plugin.version>
125+
<!-- org.apache.maven plugins -->
104126
<maven-compiler-plugin.version>3.15.0</maven-compiler-plugin.version>
105127
<maven-deploy-plugin.version>3.1.4</maven-deploy-plugin.version>
106128
<maven-enforcer-plugin.version>3.6.2</maven-enforcer-plugin.version>
107129
<maven-gpg-plugin.version>3.2.8</maven-gpg-plugin.version>
130+
<maven-install-plugin.version>3.1.4</maven-install-plugin.version>
108131
<maven-jar-plugin.version>3.4.2</maven-jar-plugin.version>
109132
<maven-javadoc-plugin.version>3.12.0</maven-javadoc-plugin.version>
110133
<maven-release-plugin.version>3.3.1</maven-release-plugin.version>
111134
<maven-source-plugin.version>3.4.0</maven-source-plugin.version>
112135
<maven-surefire-failsafe-plugins.version>3.5.4</maven-surefire-failsafe-plugins.version> <!-- surefire, failsafe, surefire-report -->
136+
<maven-toolchains-plugin.version>3.2.0</maven-toolchains-plugin.version>
113137

114-
<!-- org.apache.rat plugins -->
138+
<!-- org.apache.rat plugins -->
115139
<apache-rat-plugin.version>0.17</apache-rat-plugin.version>
116140

117-
<!-- Not covered by Apache Parent POM-->
118-
<maven-toolchains-plugin.version>3.2.0</maven-toolchains-plugin.version>
119-
120141
<!-- com.github maven plugins -->
121142
<coveralls-repo-token></coveralls-repo-token>
122143
<coveralls-maven-plugin.version>5.0.0</coveralls-maven-plugin.version>
@@ -131,6 +152,31 @@ under the License.
131152
<lifecycle-mapping.version>1.0.0</lifecycle-mapping.version>
132153
</properties>
133154

155+
<repositories>
156+
<repository>
157+
<id>apache.snapshots</id>
158+
<name>Apache Snapshot Repository</name>
159+
<url>https://repository.apache.org/content/groups/snapshots</url>
160+
<releases>
161+
<enabled>false</enabled>
162+
</releases>
163+
<snapshots>
164+
<enabled>true</enabled>
165+
</snapshots>
166+
</repository>
167+
<repository>
168+
<id>apache</id>
169+
<name>Apache Releases Repository</name>
170+
<url>https://repository.apache.org/content/groups/public</url>
171+
<releases>
172+
<enabled>true</enabled>
173+
</releases>
174+
<snapshots>
175+
<enabled>false</enabled>
176+
</snapshots>
177+
</repository>
178+
</repositories>
179+
134180
<dependencies>
135181
<!-- Test Scope -->
136182
<dependency>
@@ -145,12 +191,6 @@ under the License.
145191
<pluginManagement>
146192
<plugins>
147193

148-
<plugin>
149-
<groupId>org.apache.maven.plugins</groupId>
150-
<artifactId>maven-assembly-plugin</artifactId>
151-
<version>${maven-assembly-plugin.version}</version>
152-
</plugin>
153-
154194
<plugin>
155195
<groupId>org.apache.maven.plugins</groupId>
156196
<artifactId>maven-compiler-plugin</artifactId>
@@ -178,10 +218,8 @@ under the License.
178218
</goals>
179219
<configuration>
180220
<rules>
181-
<!-- The normal Java enforcer rule out of the box is toolchain unaware
182-
and is really only useful for checking what java version is available
183-
via the users shell environment. It does not check that the java compiler
184-
version is sane or matches the java command version.
221+
<!-- The Java enforcer rule is toolchain unaware
222+
and is only checks the compiler used by the Maven runtime.
185223
In the context of toolchains this rule is useless.
186224
See: https://github.com/paulmoloney/maven-enforcer-toolchain-rules
187225
<requireJavaVersion> ... </requireJavaVersion>
@@ -394,11 +432,6 @@ under the License.
394432

395433
<plugins>
396434

397-
<plugin>
398-
<groupId>org.apache.maven.plugins</groupId>
399-
<artifactId>maven-assembly-plugin</artifactId>
400-
</plugin>
401-
402435
<plugin>
403436
<groupId>org.apache.maven.plugins</groupId>
404437
<artifactId>maven-compiler-plugin</artifactId>
@@ -554,6 +587,7 @@ under the License.
554587
<addBuildEnvironmentEntries>true</addBuildEnvironmentEntries>
555588
</manifest>
556589
<manifestEntries>
590+
<Automatic-Module-Name>org.apache.datasketches</Automatic-Module-Name>
557591
<Implementation-Vendor>The Apache Software Foundation</Implementation-Vendor>
558592
<GroupId-ArtifactId>${project.groupId}:${project.artifactId}</GroupId-ArtifactId>
559593
<!-- these properties are generated by the git-commit-id-maven-plugin during initialize -->
@@ -614,26 +648,6 @@ under the License.
614648
</build>
615649
</profile>
616650

617-
<!-- Disable source release assembly for 'apache-release' profile.
618-
This is performed from a script outside Maven -->
619-
<profile>
620-
<id>apache-release</id>
621-
<build>
622-
<plugins>
623-
<plugin>
624-
<artifactId>maven-assembly-plugin</artifactId>
625-
<version>${maven-assembly-plugin.version}</version>
626-
<executions>
627-
<execution>
628-
<id>source-release-assembly</id>
629-
<phase>none</phase>
630-
</execution>
631-
</executions>
632-
</plugin>
633-
</plugins>
634-
</build>
635-
</profile>
636-
637651
<profile>
638652
<id>generate-java-files</id>
639653
<build>

‎tools/SketchesCheckstyle.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -226,8 +226,7 @@ under the License.
226226
<property name="allowedAnnotations" value="Override, Test"/>
227227
</module>
228228

229-
<!-- disabled because of a Checkstyle bug with <p> after @param -->
230-
<!-- <module name="JavadocParagraph"/> -->
229+
<module name="JavadocParagraph"/>
231230

232231
<module name="JavadocTagContinuationIndentation">
233232
<property name="severity" value="ignore"/>
@@ -256,6 +255,7 @@ under the License.
256255
<property name="severity" value="warning"/>
257256
<property name="allowEscapesForControlCharacters" value="true"/>
258257
<property name="allowByTailComment" value="true"/>
258+
<property name="allowIfAllCharactersEscaped" value="true"/>
259259
<property name="allowNonPrintableEscapes" value="true"/>
260260
<metadata name="net.sf.eclipsecs.core.lastEnabledSeverity" value="inherit"/>
261261
</module>

0 commit comments

Comments
 (0)