File tree Expand file tree Collapse file tree
dev-support/atlas-docker/scripts Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -104,7 +104,7 @@ HBASE_CP="${HBASE_CONF}"
104104
105105# Multiple jars in HBASE_CP_EXCLUDE_LIST can be added using "\|" separator
106106# Ex: HBASE_CP_EXCLUDE_LIST="commons-configuration-1."
107- HBASE_CP_EXCLUDE_LIST=" commons-configuration-1\|jersey-client\| javax.ws.rs-api\|jsr311-api\|jersey"
107+ HBASE_CP_EXCLUDE_LIST=" javax.ws.rs-api\|jsr311-api\|jersey\|glassfish "
108108
109109for i in " ${HBASE_HOME} /lib/" * .jar " ${HBASE_HOME} /lib/client-facing-thirdparty/" * .jar; do
110110 if [ " ` echo $i | grep -v \" $HBASE_CP_EXCLUDE_LIST \" ` " == " $i " ]; then
Original file line number Diff line number Diff line change 570570 <artifactId >atlas-client-v1</artifactId >
571571 <version >${project.version} </version >
572572 </artifactItem >
573- <!-- Unshaded v2 client: shaded jar relocates javax.ws.rs and breaks
574- JerseyClientBuilder.createClient(Configuration) at import runtime. -->
575573 <artifactItem >
576574 <groupId >${project.groupId} </groupId >
577575 <artifactId >atlas-client-v2</artifactId >
Original file line number Diff line number Diff line change @@ -99,7 +99,7 @@ HIVE_CP="${HIVE_CONF}"
9999# Multiple jars in HIVE_CP_EXCLUDE_LIST can be added using "\|" separator
100100# Ex: HIVE_CP_EXCLUDE_LIST="jersey-multipart"
101101# exclude log4j libs from hive classpath to avoid conflict
102- HIVE_CP_EXCLUDE_LIST=" javax.ws.rs-api\|log4j-slf4j-impl\|log4j-1.2-api\|log4j-api\|log4j-core\|log4j-web\|jsr311-api"
102+ HIVE_CP_EXCLUDE_LIST=" javax.ws.rs-api\|log4j-slf4j-impl\|log4j-1.2-api\|log4j-api\|log4j-core\|log4j-web\|jsr311-api\|jersey\|glassfish "
103103
104104for i in $( find " ${HIVE_HOME} /lib/" -name " *.jar" | grep -v " $HIVE_CP_EXCLUDE_LIST " ) ; do
105105 HIVE_CP=" ${HIVE_CP} :$i "
142142# Remove leading colon
143143HADOOP_CP=$( echo " $HADOOP_CLASSPATH_NEW " | sed ' s/^://' )
144144
145- CP=" ${HIVE_CP} :${HADOOP_CP} :${ATLASCPPATH} "
145+ # Atlas hook jars must precede Hive/Hadoop so Jersey 2 + jakarta.ws.rs-api win over partial Hive libs.
146+ CP=" ${ATLASCPPATH} :${HIVE_CP} :${HADOOP_CP} "
146147
147148# If running in cygwin, convert pathnames and classpath to Windows format.
148149if [ " ${CYGWIN} " == " true" ]
Original file line number Diff line number Diff line change 482482 <artifactId >commons-lang3</artifactId >
483483 <version >${commons-lang3.version} </version >
484484 </artifactItem >
485+ <artifactItem >
486+ <groupId >javax.inject</groupId >
487+ <artifactId >javax.inject</artifactId >
488+ <version >${javax-inject.version} </version >
489+ </artifactItem >
490+ <artifactItem >
491+ <groupId >javax.annotation</groupId >
492+ <artifactId >javax.annotation-api</artifactId >
493+ <version >1.3.2</version >
494+ </artifactItem >
485495 <artifactItem >
486496 <groupId >org.apache.kafka</groupId >
487497 <artifactId >kafka-clients</artifactId >
Original file line number Diff line number Diff line change 9999 done
100100fi
101101
102- mvn ${ARG_PROFILES} ${ARG_SKIPTESTS} -DskipDocs clean verify --no-transfer-progress -B -V
102+ mvn ${ARG_PROFILES} ${ARG_SKIPTESTS} -Drat.skip=true - DskipDocs clean verify --no-transfer-progress -B -V
103103
104104status=$?
105105
You can’t perform that action at this time.
0 commit comments