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 f6a70ff Fix build issues.
f6a70ff is described below
commit f6a70ffb71c5b02b77127a09c2f8fc7ee2d07730
Author: JamesBognar <[email protected]>
AuthorDate: Thu Oct 1 16:39:12 2020 -0400
Fix build issues.
---
juneau-examples/juneau-examples-core/src/assembly/bin.xml | 2 ++
.../juneau-examples-rest-jetty/src/assembly/bin.xml | 2 ++
.../juneau-examples-rest-springboot/src/assembly/bin.xml | 2 ++
juneau-release-env.sh | 14 ++++++++------
launches/juneau-env.sh | 1 +
5 files changed, 15 insertions(+), 6 deletions(-)
diff --git a/juneau-examples/juneau-examples-core/src/assembly/bin.xml
b/juneau-examples/juneau-examples-core/src/assembly/bin.xml
index db8d6bb..7e0c2d2 100644
--- a/juneau-examples/juneau-examples-core/src/assembly/bin.xml
+++ b/juneau-examples/juneau-examples-core/src/assembly/bin.xml
@@ -30,12 +30,14 @@
<includeBaseDirectory>true</includeBaseDirectory>
<fileSets>
<fileSet>
+ <useDefaultExcludes>false</useDefaultExcludes>
<directory>${basedir}</directory>
<includes>
<include>src/main/**</include>
<include>src/test/**</include>
<include>.settings/**</include>
<include>.project</include>
+ <include>.classpath</include>
</includes>
</fileSet>
<fileSet>
diff --git a/juneau-examples/juneau-examples-rest-jetty/src/assembly/bin.xml
b/juneau-examples/juneau-examples-rest-jetty/src/assembly/bin.xml
index 1d1c88f..7a747c1 100644
--- a/juneau-examples/juneau-examples-rest-jetty/src/assembly/bin.xml
+++ b/juneau-examples/juneau-examples-rest-jetty/src/assembly/bin.xml
@@ -37,6 +37,7 @@
</includes>
</fileSet>
<fileSet>
+ <useDefaultExcludes>false</useDefaultExcludes>
<directory>${basedir}</directory>
<outputDirectory>/</outputDirectory>
<includes>
@@ -44,6 +45,7 @@
<include>files/**</include>
<include>.settings/**</include>
<include>.project</include>
+ <include>.classpath</include>
<include>*.launch</include>
<include>*.cfg</include>
</includes>
diff --git
a/juneau-examples/juneau-examples-rest-springboot/src/assembly/bin.xml
b/juneau-examples/juneau-examples-rest-springboot/src/assembly/bin.xml
index 1d1c88f..7a747c1 100644
--- a/juneau-examples/juneau-examples-rest-springboot/src/assembly/bin.xml
+++ b/juneau-examples/juneau-examples-rest-springboot/src/assembly/bin.xml
@@ -37,6 +37,7 @@
</includes>
</fileSet>
<fileSet>
+ <useDefaultExcludes>false</useDefaultExcludes>
<directory>${basedir}</directory>
<outputDirectory>/</outputDirectory>
<includes>
@@ -44,6 +45,7 @@
<include>files/**</include>
<include>.settings/**</include>
<include>.project</include>
+ <include>.classpath</include>
<include>*.launch</include>
<include>*.cfg</include>
</includes>
diff --git a/juneau-release-env.sh b/juneau-release-env.sh
index 9f7db06..34f4554 100644
--- a/juneau-release-env.sh
+++ b/juneau-release-env.sh
@@ -13,14 +13,16 @@
#
***************************************************************************************************************************
# DO NOT CHECK IN CHANGES TO THIS FILE!
+export
JAVA_HOME=/Library/Java/JavaVirtualMachines/jdk1.8.0_162.jdk/Contents/Home
+export PATH=$JAVA_HOME/bin:$PATH
-export X_VERSION=7.0.0
-export X_NEXT_VERSION=7.0.1-SNAPSHOT
-export X_RELEASE=juneau-7.0.0-RC1
+export X_VERSION=8.2.0
+export X_NEXT_VERSION=8.2.1-SNAPSHOT
+export X_RELEASE=juneau-8.2.0-RC1
export X_STAGING=~/tmp/dist-release-juneau
-export X_USERNAME=your apache username
-export [email protected]
-export X_CLEANM2=Y
+export X_USERNAME=foo
+export [email protected]
+export X_CLEANM2=N
echo ' '
echo --- Settings
------------------------------------------------------------------
diff --git a/launches/juneau-env.sh b/launches/juneau-env.sh
index c71ad1e..91734a5 100755
--- a/launches/juneau-env.sh
+++ b/launches/juneau-env.sh
@@ -15,4 +15,5 @@
set -e
export JUNEAU_VERSION=8.2.0
export
JAVA_HOME=/Library/Java/JavaVirtualMachines/jdk1.8.0_162.jdk/Contents/Home
+export PATH=$JAVA_HOME/bin:$PATH
[ -z "$X_VERSION" ] && export X_VERSION="${JUNEAU_VERSION}-SNAPSHOT"
