Skip to content

Commit 84d12e1

Browse files
v-kkhuangv-kkhuang
committed
#AI commit# 开发阶段： hadoop版本支持hadoop-3profile
1 parent 66abb8f commit 84d12e1

3 files changed

Lines changed: 106 additions & 39 deletions

File tree

‎linkis-engineconn-plugins/flink/pom.xml‎

Lines changed: 49 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -488,27 +488,12 @@
488488
<version>${jersey.version}</version>
489489
</dependency>
490490

491+
<!-- Common Jackson JAX-RS dependency for both Hadoop versions -->
491492
<dependency>
492493
<groupId>org.codehaus.jackson</groupId>
493494
<artifactId>jackson-jaxrs</artifactId>
494495
<version>1.9.2</version>
495496
</dependency>
496-
<dependency>
497-
<groupId>com.fasterxml.jackson.core</groupId>
498-
<artifactId>jackson-core</artifactId>
499-
</dependency>
500-
<dependency>
501-
<groupId>com.fasterxml.jackson.core</groupId>
502-
<artifactId>jackson-databind</artifactId>
503-
</dependency>
504-
<dependency>
505-
<groupId>com.fasterxml.jackson.module</groupId>
506-
<artifactId>jackson-module-jaxb-annotations</artifactId>
507-
</dependency>
508-
<dependency>
509-
<groupId>com.fasterxml.jackson.jaxrs</groupId>
510-
<artifactId>jackson-jaxrs-json-provider</artifactId>
511-
</dependency>
512497

513498
</dependencies>
514499

@@ -558,4 +543,52 @@
558543
</plugin>
559544
</plugins>
560545
</build>
546+
547+
<!-- Profiles for Hadoop 2/3 Jackson compatibility -->
548+
<profiles>
549+
<!-- Hadoop 2.7 Profile: Uses legacy Jackson 1.x -->
550+
<profile>
551+
<id>hadoop-2.7</id>
552+
<activation>
553+
<activeByDefault>true</activeByDefault>
554+
</activation>
555+
<dependencies>
556+
<!-- Legacy Jackson for Hadoop 2 compatibility -->
557+
<dependency>
558+
<groupId>org.codehaus.jackson</groupId>
559+
<artifactId>jackson-core-asl</artifactId>
560+
<version>1.9.2</version>
561+
</dependency>
562+
<dependency>
563+
<groupId>org.codehaus.jackson</groupId>
564+
<artifactId>jackson-xc</artifactId>
565+
<version>1.9.2</version>
566+
</dependency>
567+
</dependencies>
568+
</profile>
569+
570+
<!-- Hadoop 3 Profile: Uses newer Jackson 2.x -->
571+
<profile>
572+
<id>hadoop-3</id>
573+
<dependencies>
574+
<!-- Newer Jackson for Hadoop 3 compatibility -->
575+
<dependency>
576+
<groupId>com.fasterxml.jackson.core</groupId>
577+
<artifactId>jackson-core</artifactId>
578+
</dependency>
579+
<dependency>
580+
<groupId>com.fasterxml.jackson.core</groupId>
581+
<artifactId>jackson-databind</artifactId>
582+
</dependency>
583+
<dependency>
584+
<groupId>com.fasterxml.jackson.module</groupId>
585+
<artifactId>jackson-module-jaxb-annotations</artifactId>
586+
</dependency>
587+
<dependency>
588+
<groupId>com.fasterxml.jackson.jaxrs</groupId>
589+
<artifactId>jackson-jaxrs-json-provider</artifactId>
590+
</dependency>
591+
</dependencies>
592+
</profile>
593+
</profiles>
561594
</project>

‎linkis-engineconn-plugins/hive/pom.xml‎

Lines changed: 55 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -355,6 +355,7 @@
355355
<version>${jersey.version}</version>
356356
</dependency>
357357

358+
<!-- Common Jackson JAX-RS dependency for both Hadoop versions -->
358359
<dependency>
359360
<groupId>org.codehaus.jackson</groupId>
360361
<artifactId>jackson-jaxrs</artifactId>
@@ -366,27 +367,6 @@
366367
</exclusion>
367368
</exclusions>
368369
</dependency>
369-
370-
<dependency>
371-
<groupId>com.fasterxml.jackson.core</groupId>
372-
<artifactId>jackson-core</artifactId>
373-
</dependency>
374-
<dependency>
375-
<groupId>com.fasterxml.jackson.core</groupId>
376-
<artifactId>jackson-databind</artifactId>
377-
</dependency>
378-
<dependency>
379-
<groupId>com.fasterxml.jackson.module</groupId>
380-
<artifactId>jackson-module-jaxb-annotations</artifactId>
381-
</dependency>
382-
<dependency>
383-
<groupId>com.fasterxml.jackson.jaxrs</groupId>
384-
<artifactId>jackson-jaxrs-json-provider</artifactId>
385-
</dependency>
386-
<dependency>
387-
<groupId>com.fasterxml.jackson.core</groupId>
388-
<artifactId>jackson-databind</artifactId>
389-
</dependency>
390370
</dependencies>
391371

392372
<build>
@@ -426,4 +406,58 @@
426406
</plugin>
427407
</plugins>
428408
</build>
409+
410+
<!-- Profiles for Hadoop 2/3 Jackson compatibility -->
411+
<profiles>
412+
<!-- Hadoop 2.7 Profile: Uses legacy Jackson 1.x -->
413+
<profile>
414+
<id>hadoop-2.7</id>
415+
<activation>
416+
<activeByDefault>true</activeByDefault>
417+
</activation>
418+
<dependencies>
419+
<!-- Legacy Jackson for Hadoop 2 compatibility -->
420+
<dependency>
421+
<groupId>org.codehaus.jackson</groupId>
422+
<artifactId>jackson-core-asl</artifactId>
423+
<version>1.9.2</version>
424+
</dependency>
425+
<dependency>
426+
<groupId>org.codehaus.jackson</groupId>
427+
<artifactId>jackson-xc</artifactId>
428+
<version>1.9.2</version>
429+
<exclusions>
430+
<exclusion>
431+
<groupId>org.codehaus.jackson</groupId>
432+
<artifactId>jackson-mapper-asl</artifactId>
433+
</exclusion>
434+
</exclusions>
435+
</dependency>
436+
</dependencies>
437+
</profile>
438+
439+
<!-- Hadoop 3 Profile: Uses newer Jackson 2.x -->
440+
<profile>
441+
<id>hadoop-3</id>
442+
<dependencies>
443+
<!-- Newer Jackson for Hadoop 3 compatibility -->
444+
<dependency>
445+
<groupId>com.fasterxml.jackson.core</groupId>
446+
<artifactId>jackson-core</artifactId>
447+
</dependency>
448+
<dependency>
449+
<groupId>com.fasterxml.jackson.core</groupId>
450+
<artifactId>jackson-databind</artifactId>
451+
</dependency>
452+
<dependency>
453+
<groupId>com.fasterxml.jackson.module</groupId>
454+
<artifactId>jackson-module-jaxb-annotations</artifactId>
455+
</dependency>
456+
<dependency>
457+
<groupId>com.fasterxml.jackson.jaxrs</groupId>
458+
<artifactId>jackson-jaxrs-json-provider</artifactId>
459+
</dependency>
460+
</dependencies>
461+
</profile>
462+
</profiles>
429463
</project>

‎pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1473,9 +1473,9 @@
14731473
</build>
14741474

14751475
<profiles>
1476-
<!-- Hadoop 3.3 Profile: mvn clean package -Phadoop-3.3 -->
1476+
<!-- Hadoop 3 Profile: mvn clean package -Phadoop-3 -->
14771477
<profile>
1478-
<id>hadoop-3.3</id>
1478+
<id>hadoop-3</id>
14791479
<properties>
14801480
<hadoop.version>3.3.5</hadoop.version>
14811481
<hadoop-hdfs-client-shade.version>3.3.5</hadoop-hdfs-client-shade.version>

0 commit comments

Comments
 (0)