This is an automated email from the ASF dual-hosted git repository.
jamesbognar pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/juneau.git
The following commit(s) were added to refs/heads/master by this push:
new beef566f8 Merge branch 'master' of
https://gitbox.apache.org/repos/asf/juneau.git
new 71c61601c Merge branch 'master' of
https://gitbox.apache.org/repos/asf/juneau.git
beef566f8 is described below
commit beef566f8f3c438294874ff108e058b702c802e8
Author: JamesBognar <[email protected]>
AuthorDate: Fri Jun 24 03:41:11 2022 -0400
Merge branch 'master' of https://gitbox.apache.org/repos/asf/juneau.git
---
juneau-build-javadoc.sh | 13 +++++++++++++
juneau-doc/juneau-doc.jar | Bin 0 -> 40047 bytes
juneau-env.sh | 3 ++-
juneau-release-env.sh | 10 +++++-----
pom.xml | 4 +++-
5 files changed, 23 insertions(+), 7 deletions(-)
diff --git a/juneau-build-javadoc.sh b/juneau-build-javadoc.sh
index 9c96b0d5a..8fb3a0e13 100755
--- a/juneau-build-javadoc.sh
+++ b/juneau-build-javadoc.sh
@@ -13,8 +13,21 @@
. juneau-env.sh
+function fail_with_message {
+ X_DATE=$(date +'%H:%M:%S')
+ echo ' '
+ echo
"-------------------------------------------------------------------------------"
+ echo "[$X_DATE] $1"
+ echo
'-------------------------------------------------------------------------------'
+ fail;
+}
+
cd juneau-doc
+
mvn install
+test -f target/juneau-doc-${JUNEAU_VERSION}-SNAPSHOT.jar || fail_with_message
"target/juneau-doc-${JUNEAU_VERSION}-SNAPSHOT.jar not found."
+test -f ../juneau-all/target/juneau-all-${JUNEAU_VERSION}-SNAPSHOT.jar ||
fail_with_message
"../juneau-all/target/juneau-all-${JUNEAU_VERSION}-SNAPSHOT.jar.not found"
+
export
cp=target/juneau-doc-${JUNEAU_VERSION}-SNAPSHOT.jar:../juneau-all/target/juneau-all-${JUNEAU_VERSION}-SNAPSHOT.jar
java -DjuneauVersion=$JUNEAU_VERSION -cp $cp
org.apache.juneau.doc.internal.DocGenerator
cd ..
diff --git a/juneau-doc/juneau-doc.jar b/juneau-doc/juneau-doc.jar
new file mode 100644
index 000000000..7a1e2eb07
Binary files /dev/null and b/juneau-doc/juneau-doc.jar differ
diff --git a/juneau-env.sh b/juneau-env.sh
index a679bb7a6..67394da60 100755
--- a/juneau-env.sh
+++ b/juneau-env.sh
@@ -13,9 +13,10 @@
. ~/.profile
set -e
-export JUNEAU_VERSION=9.0.B1
+export JUNEAU_VERSION=9.0-B1
export
JAVA_HOME=/Library/Java/JavaVirtualMachines/jdk1.8.0_162.jdk/Contents/Home
export PATH=$JAVA_HOME/bin:$PATH
export PATH=/opt/homebrew/bin:$PATH
export GPG_TTY=$(tty)
[ -z "$X_VERSION" ] && export X_VERSION="${JUNEAU_VERSION}-SNAPSHOT"
+echo JUNEAU_VERSION=$JUNEAU_VERSION
diff --git a/juneau-release-env.sh b/juneau-release-env.sh
old mode 100644
new mode 100755
index 6e072eeee..69fadcb63
--- a/juneau-release-env.sh
+++ b/juneau-release-env.sh
@@ -16,12 +16,12 @@
export
JAVA_HOME=/Library/Java/JavaVirtualMachines/jdk1.8.0_162.jdk/Contents/Home
export PATH=$JAVA_HOME/bin:$PATH
-export X_VERSION=9.0.0
-export X_NEXT_VERSION=9.0.1-SNAPSHOT
-export X_RELEASE=juneau-9.0.0-RC1
+export X_VERSION=9.0-B1
+export X_NEXT_VERSION=9.0.0-SNAPSHOT
+export X_RELEASE=juneau-9.0-B1-RC1
export X_STAGING=~/tmp/dist-release-juneau
-export X_USERNAME=foo
-export [email protected]
+export X_USERNAME=jamesbognar
+export [email protected]
export X_CLEANM2=N
echo ' '
diff --git a/pom.xml b/pom.xml
index bfa8e57f7..cc2cbdf2d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -198,7 +198,9 @@
<!-- Files needed by Heroku
as-is -->
<exclude>**/app.json</exclude>
- <exclude>**/Procfile</exclude>
+ <exclude>**/Procfile</exclude>
+
+ <exclude>**/.asf.yaml</exclude>
</excludes>
<consoleOutput>true</consoleOutput>
<!-- Note: useEclipseDefaultExcludes
does not work for subprojects. See RAT-107 -->
