Skip to content

Commit

Permalink
Test merge conflict (#42)
Browse files Browse the repository at this point in the history
  • Loading branch information
@CalvinKirs
CalvinKirs authored Oct 24, 2024
1 parent 2d52db9 commit 70ac0ca
Showing 1 changed file with 3 additions and 146 deletions.
149 changes: 3 additions & 146 deletions fe/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -195,150 +195,7 @@ under the License.
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
<version>${jacoco.version}</version>
<executions>
<execution>
<id>default-prepare-agent</id>
<goals>
<goal>prepare-agent</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</pluginManagement>
</build>
<modules>
<module>fe-common</module>
<module>spark-dpp</module>
<module>fe-core</module>
<module>hive-udf</module>
<module>be-java-extensions</module>
</modules>
<properties>
<!--suppress UnresolvedMavenProperty -->
<doris.thirdparty>${fe.dir}/../thirdparty</doris.thirdparty>
<!--suppress UnresolvedMavenProperty -->
<doris.home>${fe.dir}/../</doris.home>
<revision>1.2-SNAPSHOT</revision>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<doris.hive.catalog.shade.version>1.0.2</doris.hive.catalog.shade.version>
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
<!--plugin parameters-->
<skip.plugin>false</skip.plugin>
<sonar.organization>apache</sonar.organization>
<sonar.host.url>https://sonarcloud.io</sonar.host.url>
<aspectj.version>1.9.7</aspectj.version>
<cglib.version>2.2</cglib.version>
<commons-cli.version>1.4</commons-cli.version>
<commons-filerupload.version>1.5</commons-filerupload.version>
<commons-codec.version>1.13</commons-codec.version>
<commons-lang.version>2.6</commons-lang.version>
<commons-lang3.version>3.9</commons-lang3.version>
<commons-pool2.version>2.2</commons-pool2.version>
<commons-pool.version>1.5.1</commons-pool.version>
<commons-text.version>1.10.0</commons-text.version>
<commons-validator.version>1.7</commons-validator.version>
<gson.version>2.8.9</gson.version>
<guava.version>32.1.2-jre</guava.version>
<jackson.version>2.15.2</jackson.version>
<java-cup.version>0.11-a-czt02-cdh</java-cup.version>
<javassist.version>3.18.2-GA</javassist.version>
<javax.servlet-api.version>3.1.0</javax.servlet-api.version>
<je.version>18.3.14-doris-SNAPSHOT</je.version>
<jflex.version>1.4.3</jflex.version>
<jmockit.version>1.49</jmockit.version>
<commons-io.version>2.7</commons-io.version>
<json-simple.version>1.1.1</json-simple.version>
<junit.version>5.8.2</junit.version>
<druid.version>1.2.5</druid.version>
<clickhouse.version>0.4.6</clickhouse.version>
<thrift.version>0.16.0</thrift.version>
<tomcat-embed-core.version>8.5.86</tomcat-embed-core.version>
<log4j2.version>2.18.0</log4j2.version>
<log4j-1.2.version>2.18.0</log4j-1.2.version>
<slf4j.version>2.0.6</slf4j.version>
<metrics-core.version>4.0.2</metrics-core.version>
<!--Netty 4.1.94 is not compatible with arrow flight.-->
<netty-all.version>4.1.96.Final</netty-all.version>
<!--The dependence of transitive dependence cannot be ruled out, only Saving the nation through twisted ways.-->
<netty-3-test.version>3.10.6.Final</netty-3-test.version>
<objenesis.version>2.1</objenesis.version>
<!-- NOTE: Using grpc-java whose version is newer than 1.34.0 will break the build on CentOS 6 due to the obsolete GLIBC -->
<grpc-java.version>1.34.0</grpc-java.version>
<grpc.version>1.58.0</grpc.version>
<check.freamework.version>3.38.0</check.freamework.version>
<protobuf.version>3.24.3</protobuf.version>
<!-- we use protoc-jar-maven-plugin to generate protobuf generated code -->
<!-- see https://repo.maven.apache.org/maven2/com/google/protobuf/protoc/ to get correct version -->
<protoc.artifact.version>3.24.3</protoc.artifact.version>
<protoc.artifact>com.google.protobuf:protoc:${protoc.artifact.version}</protoc.artifact>
<grpc.java.artifact>io.grpc:protoc-gen-grpc-java:${grpc-java.version}</grpc.java.artifact>
<protoparser.version>3.1.5</protoparser.version>
<snappy-java.version>1.1.10.1</snappy-java.version>
<automaton.version>1.11-8</automaton.version>
<generex.version>1.0.1</generex.version>
<fabric8.kubernetes.version>6.7.2</fabric8.kubernetes.version>
<logging-interceptor.version>4.7.2</logging-interceptor.version>
<okhttp.version>4.9.3</okhttp.version>
<okio.version>3.4.0</okio.version>
<snakeyaml.version>2.0</snakeyaml.version>
<validation-api.version>1.1.0.Final</validation-api.version>
<zjsonpatch.version>0.2.3</zjsonpatch.version>
<kafka-clients.version>3.4.0</kafka-clients.version>
<oshi-core.version>6.4.5</oshi-core.version>
<xnio-nio.version>3.8.9.Final</xnio-nio.version>
<javax.annotation-api.version>1.3.2</javax.annotation-api.version>
<javax.activation.version>1.2.0</javax.activation.version>
<jaxws-api.version>2.3.0</jaxws-api.version>
<RoaringBitmap.version>0.8.13</RoaringBitmap.version>
<spark.version>2.4.6</spark.version>
<hive.version>3.1.3</hive.version>
<hive.common.version>2.3.9</hive.common.version>
<nimbusds.version>9.35</nimbusds.version>
<mapreduce.client.version>2.10.1</mapreduce.client.version>
<calcite.version>1.33.0</calcite.version>
<avatica.version>1.22.0</avatica.version>
<!-- ATTN: avro version must be consistent with Iceberg version -->
<!-- Please modify iceberg.version and avro.version together,
you can find avro version info in iceberg mvn repository -->
<iceberg.version>1.1.0</iceberg.version>
<maxcompute.version>0.45.2-public</maxcompute.version>
<avro.version>1.11.2</avro.version>
<arrow.version>14.0.1</arrow.version>
<!-- hudi -->
<hudi.version>0.13.1</hudi.version>
<presto.hadoop.version>2.7.4-11</presto.hadoop.version>
<presto.hive.version>3.0.0-8</presto.hive.version>

<parquet.version>1.13.1</parquet.version>
<commons-collections.version>3.2.2</commons-collections.version>
<commons-compress.version>1.22</commons-compress.version>
<scala.version>2.12.10</scala.version>
<kryo.version>4.0.2</kryo.version>
<lombok.version>1.18.24</lombok.version>
<tree-printer.version>1.2</tree-printer.version>
<hamcrest.version>2.1</hamcrest.version>
<httpclient.version>4.5.13</httpclient.version>
<httpcore.version>4.4.15</httpcore.version>
<aws-java-sdk.version>1.12.519</aws-java-sdk.version>
<mariadb-java-client.version>3.0.4</mariadb-java-client.version>
<dlf-metastore-client-hive.version>0.2.14</dlf-metastore-client-hive.version>
<hadoop.version>3.3.6</hadoop.version>
<joda.version>2.8.1</joda.version>
<project.scm.id>github</project.scm.id>
<spring.version>2.7.13</spring.version>
<orc.version>1.8.4</orc.version>
<ojdbc8.version>12.2.0.1</ojdbc8.version>
<zookeeper.version>3.4.14</zookeeper.version>
<velocity-engine-core.version>2.3</velocity-engine-core.version>
<ranger-plugins-common.version>2.4.0</ranger-plugins-common.version>
<bcprov-jdk15on.version>1.70</bcprov-jdk15on.version>
<woodstox.version>6.5.1</woodstox.version>
<kerby.version>2.0.3</kerby.version>
<jettison.version>1.5.4</jettison.version>
<immutables.version>2.9.3</immutables.version>
<vesoft.client.version>3.0.0</vesoft.client.version>
<!--todo waiting release-->
<quartz.version>2.3.2</quartz.version>
<!-- paimon -->
Expand All @@ -363,7 +220,7 @@ under the License.
<id>central</id>
<name>central maven repo https</name>
<url>https://repo.maven.apache.org/maven2</url>
</repository>
</repository>xsa
<repository>
<id>snapshots</id>
<name>apache snapshots maven repo https</name>
Expand Down Expand Up @@ -449,14 +306,14 @@ under the License.
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcprov-jdk15on</artifactId>
<version>${bcprov-jdk15on.version}</version>
<version>${bcprov-jdk15on.vxaxaersion}</version>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-dependencies</artifactId>
<version>${spring.version}</version>
<type>pom</type>
<scope>import</scope>
<scope>import</scope>xax
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
Expand Down

0 comments on commit 70ac0ca

Please sign in to comment.