This is an automated email from the ASF dual-hosted git repository. xiangfu pushed a commit to branch fixing_packaging_issue in repository https://gitbox.apache.org/repos/asf/incubator-pinot.git
commit ea36238e636b1e0bfa788e0bc23b5f7731a04efd Author: Xiang Fu <[email protected]> AuthorDate: Mon Jan 20 15:27:32 2020 -0800 Fixing java 11 runtime issue --- pinot-distribution/pom.xml | 20 +++++++++++++ .../src/main/resources/appAssemblerScriptTemplate | 33 +++++++++++++++++++++- pom.xml | 20 +++++++++++++ 3 files changed, 72 insertions(+), 1 deletion(-) diff --git a/pinot-distribution/pom.xml b/pinot-distribution/pom.xml index c80fb20..38f776a 100644 --- a/pinot-distribution/pom.xml +++ b/pinot-distribution/pom.xml @@ -93,6 +93,26 @@ </exclusion> </exclusions> </dependency> + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>javax.servlet-api</artifactId> + </dependency> + <dependency> + <groupId>javax.activation</groupId> + <artifactId>activation</artifactId> + </dependency> + <dependency> + <groupId>javax.xml.bind</groupId> + <artifactId>jaxb-api</artifactId> + </dependency> + <dependency> + <groupId>com.sun.xml.bind</groupId> + <artifactId>jaxb-core</artifactId> + </dependency> + <dependency> + <groupId>com.sun.xml.bind</groupId> + <artifactId>jaxb-impl</artifactId> + </dependency> </dependencies> <build> <plugins> diff --git a/pinot-tools/src/main/resources/appAssemblerScriptTemplate b/pinot-tools/src/main/resources/appAssemblerScriptTemplate index 6ed5edd..d411799 100644 --- a/pinot-tools/src/main/resources/appAssemblerScriptTemplate +++ b/pinot-tools/src/main/resources/appAssemblerScriptTemplate @@ -107,6 +107,37 @@ if [ -n "$CLASSPATH_PREFIX" ] ; then CLASSPATH=$CLASSPATH_PREFIX:$CLASSPATH fi +if [ -z "$PLUGINS_DIR" ] ; then + PLUGINS_DIR="$BASEDIR"/plugins +fi + +if [[ -d "$PLUGINS_DIR" ]] ; then + if [ -n "$PLUGINS_INCLUDE" ] ; then + IFS=';' read -ra PLUGINS_ARR <<< "$PLUGINS_INCLUDE" + for PLUGIN_JAR in "${PLUGINS_ARR[@]}"; do + PLUGIN_JAR_PATH=$(find "$PLUGINS_DIR" -name "$PLUGIN_JAR.jar") + if [ -n "$PLUGINS_CLASSPATH" ] ; then + PLUGINS_CLASSPATH=$PLUGINS_CLASSPATH:$PLUGIN_JAR_PATH + else + PLUGINS_CLASSPATH=$PLUGIN_JAR_PATH + fi + done + else + PLUGIN_JARS=$(find "$PLUGINS_DIR" -name \*.jar) + for PLUGIN_JAR in $PLUGIN_JARS ; do + if [ -n "$PLUGINS_CLASSPATH" ] ; then + PLUGINS_CLASSPATH=$PLUGINS_CLASSPATH:$PLUGIN_JAR + else + PLUGINS_CLASSPATH=$PLUGIN_JAR + fi + done + fi +fi + +if [ -n "$PLUGINS_CLASSPATH" ] ; then + CLASSPATH=$CLASSPATH:$PLUGINS_CLASSPATH +fi + # For Cygwin, switch paths to Windows format before running java if $cygwin; then [ -n "$CLASSPATH" ] && CLASSPATH=`cygpath --path --windows "$CLASSPATH"` @@ -117,7 +148,7 @@ if $cygwin; then fi if [ -z "$JAVA_OPTS" ] ; then - ALL_JAVA_OPTS="@EXTRA_JVM_ARGUMENTS@" + ALL_JAVA_OPTS="--add-exports java.base/jdk.internal.ref=ALL-UNNAMED @EXTRA_JVM_ARGUMENTS@" else ALL_JAVA_OPTS=$JAVA_OPTS fi diff --git a/pom.xml b/pom.xml index e9576c9..be86c00 100644 --- a/pom.xml +++ b/pom.xml @@ -453,6 +453,26 @@ <version>2.0.1.Final</version> </dependency> <dependency> + <groupId>javax.activation</groupId> + <artifactId>activation</artifactId> + <version>1.1.1</version> + </dependency> + <dependency> + <groupId>javax.xml.bind</groupId> + <artifactId>jaxb-api</artifactId> + <version>2.3.0</version> + </dependency> + <dependency> + <groupId>com.sun.xml.bind</groupId> + <artifactId>jaxb-core</artifactId> + <version>2.3.0</version> + </dependency> + <dependency> + <groupId>com.sun.xml.bind</groupId> + <artifactId>jaxb-impl</artifactId> + <version>2.3.0</version> + </dependency> + <dependency> <groupId>org.apache.helix</groupId> <artifactId>helix-core</artifactId> <version>${helix.version}</version> --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
