Skip to content

Commit

Permalink
[refactor] Standardize the writing of pom files, prepare for deployme…
Browse files Browse the repository at this point in the history 
…nt to maven (apache#7477)
  • Loading branch information
@yangzhg
yangzhg authored Dec 30, 2021
1 parent e933607 commit 2872dbf
Show file tree
Hide file tree
Showing 24 changed files with 354 additions and 171 deletions.
11 changes: 5 additions & 6 deletions .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,18 +18,17 @@ thirdparty/installed
.DS_Store
*.iml
core.*
extension/spark-doris-connector/.classpath
extension/spark-doris-connector/target
extension/flink-doris-connector/.classpath
extension/flink-doris-connector/target
extension/**/.classpath
extension/**/target

fe/log
custom_env.sh
ut_dir
log/
fe_plugins/*/target
fe_plugins/**/target
fe_plugins/output
fe/mocked
fe/*/target
fe/**/target
dependency-reduced-pom.xml
fe_plugins/**/.classpath
fe_plugins/**/.factorypath
Expand Down
6 changes: 0 additions & 6 deletions build.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,12 +42,6 @@ export DORIS_HOME=${ROOT}

. ${DORIS_HOME}/env.sh

# build thirdparty libraries if necessary
if [[ ! -f ${DORIS_THIRDPARTY}/installed/lib/libs2.a ]]; then
echo "Thirdparty libraries need to be build ..."
${DORIS_THIRDPARTY}/build-thirdparty.sh
fi

# Check args
usage() {
echo "
Expand Down
49 changes: 45 additions & 4 deletions extension/flink-doris-connector/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,49 @@ under the License.
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache</groupId>
<artifactId>apache</artifactId>
<version>18</version>
</parent>
<groupId>org.apache.doris</groupId>
<artifactId>doris-flink-connector</artifactId>
<version>flink-${flink.version}-${scala.version}-SNAPSHOT</version>
<name>Doris Flink Connector</name>
<url>https://doris.apache.org/</url>
<licenses>
<license>
<name>Apache 2.0 License</name>
<url>https://www.apache.org/licenses/LICENSE-2.0.html</url>
<distribution>repo</distribution>
</license>
</licenses>
<scm>
<connection>scm:git:git@github.com:apache/incubator-doris.git</connection>
<developerConnection>scm:git:git@github.com:apache/incubator-doris.git</developerConnection>
<url>scm:git:git@github.com:apache/incubator-doris.git</url>
<tag>HEAD</tag>
</scm>
<issueManagement>
<system>GitHub</system>
<url>https://github.com/apache/incubator-doris/issues</url>
</issueManagement>

<groupId>org.apache</groupId>
<artifactId>doris-flink</artifactId>
<version>1.0.0-flink-${flink.version}_${scala.version}</version>
<mailingLists>
<mailingList>
<name>Dev Mailing List</name>
<post>dev@doris.apache.org</post>
<subscribe>dev-subscribe@doris.apache.org</subscribe>
<unsubscribe>dev-unsubscribe@doris.apache.org</unsubscribe>
</mailingList>

<mailingList>
<name>Commits Mailing List</name>
<post>commits@doris.apache.org</post>
<subscribe>commits-subscribe@doris.apache.org</subscribe>
<unsubscribe>commits-unsubscribe@doris.apache.org</unsubscribe>
</mailingList>
</mailingLists>
<properties>
<scala.version>2.12</scala.version>
<flink.version>1.11.2</flink.version>
Expand Down Expand Up @@ -306,13 +344,15 @@ under the License.
</execution>
</executions>
</plugin>
<!--
<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
<version>0.7.8</version>
<configuration>
<excludes>
<exclude>**/thrift/**</exclude></excludes>
<exclude>**/thrift/**</exclude>
</excludes>
</configuration>
<executions>
<execution>
Expand All @@ -336,6 +376,7 @@ under the License.
</execution>
</executions>
</plugin>
-->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
Expand Down
76 changes: 42 additions & 34 deletions extension/spark-doris-connector/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,49 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache</groupId>
<artifactId>apache</artifactId>
<version>18</version>
</parent>
<groupId>org.apache.doris</groupId>
<artifactId>doris-spark-connector</artifactId>
<version>${spark.version}-${scala.version}-SNAPSHOT</version>
<name>Doris Spark Connector</name>
<url>https://doris.apache.org/</url>
<licenses>
<license>
<name>Apache 2.0 License</name>
<url>https://www.apache.org/licenses/LICENSE-2.0.html</url>
<distribution>repo</distribution>
</license>
</licenses>
<scm>
<connection>scm:git:git@github.com:apache/incubator-doris.git</connection>
<developerConnection>scm:git:git@github.com:apache/incubator-doris.git</developerConnection>
<url>scm:git:git@github.com:apache/incubator-doris.git</url>
<tag>HEAD</tag>
</scm>
<issueManagement>
<system>GitHub</system>
<url>https://github.com/apache/incubator-doris/issues</url>
</issueManagement>

<groupId>org.apache</groupId>
<artifactId>doris-spark</artifactId>
<version>1.0.0-spark-${spark.version}_${scala.version}</version>
<mailingLists>
<mailingList>
<name>Dev Mailing List</name>
<post>dev@doris.apache.org</post>
<subscribe>dev-subscribe@doris.apache.org</subscribe>
<unsubscribe>dev-unsubscribe@doris.apache.org</unsubscribe>
</mailingList>

<mailingList>
<name>Commits Mailing List</name>
<post>commits@doris.apache.org</post>
<subscribe>commits-subscribe@doris.apache.org</subscribe>
<unsubscribe>commits-unsubscribe@doris.apache.org</unsubscribe>
</mailingList>
</mailingLists>

<properties>
<scala.version>2.11</scala.version>
Expand Down Expand Up @@ -285,37 +324,6 @@
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
<version>0.7.8</version>
<configuration>
<excludes>
<exclude>**/thrift/**</exclude>
</excludes>
</configuration>
<executions>
<execution>
<id>prepare-agent</id>
<goals>
<goal>prepare-agent</goal>
</goals>
</execution>
<execution>
<id>check</id>
<goals>
<goal>check</goal>
</goals>
</execution>
<execution>
<id>report</id>
<phase>test</phase>
<goals>
<goal>report</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
Expand Down
76 changes: 42 additions & 34 deletions extension/spark-doris-connector/pom_3.0.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,49 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>

<parent>
<groupId>org.apache</groupId>
<artifactId>apache</artifactId>
<version>18</version>
</parent>
<groupId>org.apache</groupId>
<artifactId>doris-spark</artifactId>
<version>1.0.0-spark-${spark.version}_${scala.version}</version>
<artifactId>doris-spark-connector</artifactId>
<version>${spark.version}-${scala.version}-SNAPSHOT</version>
<name>Doris Spark Connector</name>
<url>https://doris.apache.org/</url>
<licenses>
<license>
<name>Apache 2.0 License</name>
<url>https://www.apache.org/licenses/LICENSE-2.0.html</url>
<distribution>repo</distribution>
</license>
</licenses>
<scm>
<connection>scm:git:git@github.com:apache/incubator-doris.git</connection>
<developerConnection>scm:git:git@github.com:apache/incubator-doris.git</developerConnection>
<url>scm:git:git@github.com:apache/incubator-doris.git</url>
<tag>HEAD</tag>
</scm>
<issueManagement>
<system>GitHub</system>
<url>https://github.com/apache/incubator-doris/issues</url>
</issueManagement>

<mailingLists>
<mailingList>
<name>Dev Mailing List</name>
<post>dev@doris.apache.org</post>
<subscribe>dev-subscribe@doris.apache.org</subscribe>
<unsubscribe>dev-unsubscribe@doris.apache.org</unsubscribe>
</mailingList>

<mailingList>
<name>Commits Mailing List</name>
<post>commits@doris.apache.org</post>
<subscribe>commits-subscribe@doris.apache.org</subscribe>
<unsubscribe>commits-unsubscribe@doris.apache.org</unsubscribe>
</mailingList>
</mailingLists>

<properties>
<scala.version>2.12</scala.version>
Expand Down Expand Up @@ -284,37 +323,6 @@
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
<version>0.7.8</version>
<configuration>
<excludes>
<exclude>**/thrift/**</exclude>
</excludes>
</configuration>
<executions>
<execution>
<id>prepare-agent</id>
<goals>
<goal>prepare-agent</goal>
</goals>
</execution>
<execution>
<id>check</id>
<goals>
<goal>check</goal>
</goals>
</execution>
<execution>
<id>report</id>
<phase>test</phase>
<goals>
<goal>report</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
Expand Down
15 changes: 10 additions & 5 deletions fe/fe-common/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,14 +24,14 @@ under the License.
<modelVersion>4.0.0</modelVersion>

<parent>
<groupId>org.apache</groupId>
<artifactId>doris-fe</artifactId>
<version>3.4.0</version>
<groupId>org.apache.doris</groupId>
<version>${revision}</version>
<artifactId>fe</artifactId>
<relativePath>../pom.xml</relativePath>
</parent>

<artifactId>doris-fe-common</artifactId>
<version>1.0.0</version>
<artifactId>fe-common</artifactId>
<version>${revision}</version>
<packaging>jar</packaging>

<properties>
Expand Down Expand Up @@ -94,6 +94,11 @@ under the License.
<groupId>org.roaringbitmap</groupId>
<artifactId>RoaringBitmap</artifactId>
</dependency>
<dependency>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest</artifactId>
<scope>test</scope>
</dependency>
</dependencies>

<build>
Expand Down
Loading

0 comments on commit 2872dbf

Please sign in to comment.