Skip to content

Commit 9036a26

Browse files
Fix related to import-scripts error after jersey changes
1 parent 329f3e8 commit 9036a26

5 files changed

Lines changed: 15 additions & 6 deletions

File tree

addons/hbase-bridge/src/bin/import-hbase.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff 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

109109
for 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

addons/hive-bridge/pom.xml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -570,8 +570,6 @@
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>

addons/hive-bridge/src/bin/import-hive.sh

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff 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

104104
for i in $(find "${HIVE_HOME}/lib/" -name "*.jar" | grep -v "$HIVE_CP_EXCLUDE_LIST"); do
105105
HIVE_CP="${HIVE_CP}:$i"
@@ -142,7 +142,8 @@ done
142142
# Remove leading colon
143143
HADOOP_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.
148149
if [ "${CYGWIN}" == "true" ]

addons/kafka-bridge/pom.xml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -482,6 +482,16 @@
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>

dev-support/atlas-docker/scripts/atlas-build.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ else
9999
done
100100
fi
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

104104
status=$?
105105

0 commit comments

Comments
 (0)