This is an automated email from the ASF dual-hosted git repository.
cgivre pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/drill.git
The following commit(s) were added to refs/heads/master by this push:
new 0d253d98f0 DRILL-8378: Resolve javadoc dependency problems affecting
new JDKs. (#2730)
0d253d98f0 is described below
commit 0d253d98f04be9a495659d86fa901ed7f3ca43cd
Author: James Turton <[email protected]>
AuthorDate: Thu Dec 29 02:46:16 2022 +0200
DRILL-8378: Resolve javadoc dependency problems affecting new JDKs. (#2730)
---
docs/dev/Release.md | 5 ++++-
pom.xml | 2 +-
tools/release-scripts/release.sh | 7 ++++---
3 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/docs/dev/Release.md b/docs/dev/Release.md
index a1e1334b54..08d1fa52da 100644
--- a/docs/dev/Release.md
+++ b/docs/dev/Release.md
@@ -88,7 +88,10 @@
1. run `mvn --encrypt-master-password` and add an encrypted master
password to `security-settings.xml` file;
2. run `mvn --encrypt-password` and add an encrypted Apache LDAP
password to `settings.xml` file.
5. Check that `NOTICE` file in sources has the current copyright year.
- 6. ~~Make sure you are using JDK 8~~. Since the completion of DRILL-8113
it is now possible to build Drill using newer JDKs while continuing to target
JDK 8. Nevertheless, always test Drill under JDK 8 after building it.
+ 6. ~~Make sure you are using JDK 8~~. It is now possible to build
(DRILL-8113) and release
+ (DRILL-8378) Drill using newer JDKs while continuing to target JDK 8.
Nevertheless, always
+ test Drill under JDK 8 after building it.
+
3. ## Manual Release process (this section is more for information how release
process is performed, release manager should use `automated release process`
described later).
1. Setup GPG Password env variable:
```
diff --git a/pom.xml b/pom.xml
index 207ef55fe9..9c94b922bb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -246,8 +246,8 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
+ <version>3.4.1</version>
<configuration>
- <sourcepath>${basedir}</sourcepath>
<sourceFileExcludes>
<!-- Don't include codegen -->
<exclude>**/src/main/codegen/**/*.java</exclude>
diff --git a/tools/release-scripts/release.sh b/tools/release-scripts/release.sh
index 06dd058e0e..6f86fcbd6e 100755
--- a/tools/release-scripts/release.sh
+++ b/tools/release-scripts/release.sh
@@ -71,7 +71,7 @@ function createDirectoryIfAbsent() {
function readInputAndSetup(){
- read -p "JAVA_HOME of the JDK 8 to use for the release : " JAVA_HOME
+ read -p "JAVA_HOME of the JDK to use for the release : " JAVA_HOME
export JAVA_HOME
read -p "Drill Working Directory : " WORK_DIR
@@ -152,8 +152,9 @@ runCmd "Clearing release history" mvn release:clean \
-DpushChanges=false \
-DskipTests
-export MAVEN_OPTS='-Xmx4g -XX:MaxPermSize=512m'
-runCmd "Preparing the release " mvn -X release:prepare \
+# Note that -XX:MaxPermSize=512m' is not supported in new JDKs
+export MAVEN_OPTS=-Xmx4g
+runCmd "Preparing the release " mvn release:prepare \
-Papache-release \
-DpushChanges=false \
-DdevelopmentVersion=${DRILL_DEV_VERSION} \
