Skip to content

Commit 7df51fb

Browse files
authored
Merge pull request #709 from apache/javadoc_yml_and_pom_fixes
Editing commits via the web inserted "CR"s into the workflow!
2 parents 6acf50c + 80e3787 commit 7df51fb

File tree

2 files changed

+4
-29
lines changed

2 files changed

+4
-29
lines changed

.github/workflows/javadoc.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ on:
1010
tag_ref:
1111
description: 'Existing Git Tag to deploy (e.g., 1.0.0):'
1212
required: true
13-
default: '99.0.0' # unlikely to conflict if accidentally used. Can be left blank
13+
default: '99.0.0' # unlikely to conflict if accidentally used. Can be left blank
1414

1515
jobs:
1616
build-and-deploy-javadoc:

pom.xml

Lines changed: 3 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ under the License.
2828
<parent>
2929
<groupId>org.apache</groupId>
3030
<artifactId>apache</artifactId>
31-
<version>32</version>
31+
<version>35</version>
3232
</parent>
3333

3434
<groupId>org.apache.datasketches</groupId>
@@ -92,8 +92,6 @@ under the License.
9292
<!-- System-wide properties -->
9393
<maven.version>3.9.11</maven.version>
9494
<java.version>25</java.version>
95-
<!-- Reproducable Builds, arbitrary, fixed date
96-
<project.build.outputTimestamp>2025-12-01T00:00:00Z</project.build.outputTimestamp> -->
9795
<!-- removed: g -Duser.language=en -Duser.country=US -Dfile.encoding=UTF-8 -->
9896
<jvm.options>-Xmx4g</jvm.options> <!-- use space to separate args -->
9997
<charset.encoding>UTF-8</charset.encoding>
@@ -103,18 +101,7 @@ under the License.
103101
<maven.build.timestamp.format>yyyy-MM-dd'T'HH-mm-ss'Z'</maven.build.timestamp.format>
104102

105103
<!-- org.apache.maven plugins -->
106-
<maven-assembly-plugin.version>3.7.1</maven-assembly-plugin.version>
107-
<maven-compiler-plugin.version>3.14.1</maven-compiler-plugin.version>
108-
<maven-dependency-plugin.version>3.9.0</maven-dependency-plugin.version>
109-
<maven-deploy-plugin.version>3.1.4</maven-deploy-plugin.version>
110-
<maven-enforcer-plugin.version>3.6.2</maven-enforcer-plugin.version>
111-
<maven-gpg-plugin.version>3.2.8</maven-gpg-plugin.version>
112-
<maven-jar-plugin.version>3.4.2</maven-jar-plugin.version> <!--3.5.0 fails -->
113104
<maven-javadoc-plugin.version>3.12.0</maven-javadoc-plugin.version>
114-
<maven-release-plugin.version>3.2.0</maven-release-plugin.version>
115-
<maven-source-plugin.version>3.3.1</maven-source-plugin.version>
116-
<!-- for surefire, failsafe and surefire-report: -->
117-
<maven-surefire-failsafe-plugins.version>3.5.4</maven-surefire-failsafe-plugins.version>
118105
<maven-toolchains-plugin.version>3.2.0</maven-toolchains-plugin.version>
119106
<!-- com.github plugins -->
120107
<git-commit-id-plugin.version>4.9.10</git-commit-id-plugin.version>
@@ -147,13 +134,11 @@ under the License.
147134
<plugin>
148135
<groupId>org.apache.maven.plugins</groupId>
149136
<artifactId>maven-assembly-plugin</artifactId>
150-
<version>${maven-assembly-plugin.version}</version>
151137
</plugin>
152138

153139
<plugin>
154140
<groupId>org.apache.maven.plugins</groupId>
155141
<artifactId>maven-compiler-plugin</artifactId>
156-
<version>${maven-compiler-plugin.version}</version>
157142
<configuration>
158143
<fork>true</fork>
159144
<release>${java.version}</release>
@@ -166,21 +151,18 @@ under the License.
166151
<plugin>
167152
<groupId>org.apache.maven.plugins</groupId>
168153
<artifactId>maven-dependency-plugin</artifactId>
169-
<version>${maven-dependency-plugin.version}</version>
170154
</plugin>
171155

172156
<plugin>
173157
<!-- We want to deploy the artifacts to a staging location for perusal -->
174158
<!-- Apache Parent pom: apache-release profile -->
175159
<groupId>org.apache.maven.plugins</groupId>
176160
<artifactId>maven-deploy-plugin</artifactId>
177-
<version>${maven-deploy-plugin.version}</version>
178161
</plugin>
179162

180163
<plugin>
181164
<groupId>org.apache.maven.plugins</groupId>
182165
<artifactId>maven-enforcer-plugin</artifactId>
183-
<version>${maven-enforcer-plugin.version}</version>
184166
<executions>
185167
<execution>
186168
<id>enforce-banned-dependencies</id>
@@ -212,7 +194,6 @@ under the License.
212194
<plugin>
213195
<groupId>org.apache.maven.plugins</groupId>
214196
<artifactId>maven-jar-plugin</artifactId>
215-
<version>${maven-jar-plugin.version}</version>
216197
<executions>
217198
<execution>
218199
<id>default-jar</id>
@@ -234,12 +215,10 @@ under the License.
234215
<plugin>
235216
<groupId>org.apache.maven.plugins</groupId>
236217
<artifactId>maven-javadoc-plugin</artifactId>
237-
<version>${maven-javadoc-plugin.version}</version>
218+
<version>${maven-javadoc-plugin.version}</version><!--$NO-MVN-MAN-VER$-->
238219
<configuration>
239220
<outputDirectory>${project.reporting.outputDirectory}</outputDirectory>
240-
<reportOutputDirectory>${project.reporting.outputDirectory}</reportOutputDirectory>
241221
<jarOutputDirectory>${project.reporting.outputDirectory}</jarOutputDirectory>
242-
<destDir>apidocs</destDir>
243222
<docfilessubdirs>true</docfilessubdirs>
244223
<show>public</show>
245224
<doclint>all,-missing</doclint>
@@ -261,13 +240,11 @@ under the License.
261240
<plugin>
262241
<groupId>org.apache.maven.plugins</groupId>
263242
<artifactId>maven-release-plugin</artifactId>
264-
<version>${maven-release-plugin.version}</version>
265243
</plugin>
266244

267245
<plugin>
268246
<groupId>org.apache.maven.plugins</groupId>
269247
<artifactId>maven-source-plugin</artifactId>
270-
<version>${maven-source-plugin.version}</version>
271248
<executions>
272249
<execution>
273250
<id>attach-sources</id>
@@ -289,7 +266,6 @@ under the License.
289266
<plugin>
290267
<groupId>org.apache.maven.plugins</groupId>
291268
<artifactId>maven-surefire-plugin</artifactId>
292-
<version>${maven-surefire-failsafe-plugins.version}</version>
293269
<configuration>
294270
<forkCount>1</forkCount>
295271
<reuseForks>true</reuseForks>
@@ -326,7 +302,7 @@ ${testng.check-cpp-historical-files}</excludedGroups> <!-- do not indent -->
326302
<plugin>
327303
<groupId>org.apache.rat</groupId>
328304
<artifactId>apache-rat-plugin</artifactId>
329-
<version>${apache-rat-plugin.version}</version>
305+
<version>${apache-rat-plugin.version}</version><!--$NO-MVN-MAN-VER$-->
330306
<executions>
331307
<execution>
332308
<phase>verify</phase>
@@ -511,7 +487,6 @@ ${testng.check-cpp-historical-files}</excludedGroups> <!-- do not indent -->
511487
<plugin>
512488
<groupId>org.apache.maven.plugins</groupId>
513489
<artifactId>maven-gpg-plugin</artifactId>
514-
<version>${maven-gpg-plugin.version}</version>
515490
<executions>
516491
<execution>
517492
<id>sign-artifacts</id>

0 commit comments

Comments
 (0)