Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Optimeze][pom] maven package Model optimeze #1205

Merged
merged 9 commits into from
Nov 4, 2022
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
pom
  • Loading branch information
zackyoungh committed Nov 4, 2022
commit 934711f6434b9b1988facb15aa64ecb092141c6c
50 changes: 40 additions & 10 deletions dlink-app/pom.xml
Original file line number Diff line number Diff line change
@@ -1,30 +1,60 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
<project xmlns="http://maven.apache.org/POM/4.0.0" 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>
<artifactId>dlink</artifactId>
<groupId>com.dlink</groupId>
<artifactId>dlink</artifactId>
<version>0.6.8-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

<artifactId>dlink-app</artifactId>

<packaging>pom</packaging>

<modules>
<module>dlink-app-1.13</module>
<module>dlink-app-base</module>
<module>dlink-app-1.14</module>
<module>dlink-app-1.12</module>
<module>dlink-app-1.11</module>
<module>dlink-app-1.15</module>
</modules>

<properties>
<maven.compiler.source>8</maven.compiler.source>
<maven.compiler.target>8</maven.compiler.target>
</properties>

</project>
<profiles>
<profile>
<id>flink-1.11</id>
<modules>
<module>dlink-app-1.11</module>
</modules>
</profile>

<profile>
<id>flink-1.12</id>
<modules>
<module>dlink-app-1.12</module>
</modules>
</profile>

<profile>
<id>flink-1.13</id>
<modules>
<module>dlink-app-1.13</module>
</modules>
</profile>

<profile>
<id>flink-1.14</id>
<modules>
<module>dlink-app-1.14</module>
</modules>
</profile>

<profile>
<id>flink-1.15</id>
<modules>
<module>dlink-app-1.15</module>
</modules>
</profile>
</profiles>
</project>
38 changes: 27 additions & 11 deletions dlink-catalog/dlink-catalog-mysql/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -15,28 +15,44 @@
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->

<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
<project xmlns="http://maven.apache.org/POM/4.0.0" 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>
<artifactId>dlink-catalog</artifactId>
<groupId>com.dlink</groupId>
<artifactId>dlink-catalog</artifactId>
<version>0.6.8-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

<artifactId>dlink-catalog-mysql</artifactId>
<packaging>pom</packaging>
<modules>
<module>dlink-catalog-mysql-1.14</module>
<module>dlink-catalog-mysql-1.13</module>
<module>dlink-catalog-mysql-1.15</module>
</modules>

<properties>
<maven.compiler.source>8</maven.compiler.source>
<maven.compiler.target>8</maven.compiler.target>
</properties>

</project>
<profiles>
<profile>
<id>flink-1.13</id>
<modules>
<module>dlink-catalog-mysql-1.13</module>
</modules>
</profile>

<profile>
<id>flink-1.14</id>
<modules>
<module>dlink-catalog-mysql-1.14</module>
</modules>
</profile>

<profile>
<id>flink-1.15</id>
<modules>
<module>dlink-catalog-mysql-1.15</module>
</modules>
</profile>
</profiles>

</project>
56 changes: 43 additions & 13 deletions dlink-client/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -15,27 +15,57 @@
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->

<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
<project xmlns="http://maven.apache.org/POM/4.0.0" 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>
<artifactId>dlink</artifactId>
<groupId>com.dlink</groupId>
<artifactId>dlink</artifactId>
<version>0.6.8-SNAPSHOT</version>
</parent>

<modelVersion>4.0.0</modelVersion>
<packaging>pom</packaging>
<artifactId>dlink-client</artifactId>
<packaging>pom</packaging>

<modules>
<module>dlink-client-1.12</module>
<module>dlink-client-1.13</module>
<module>dlink-client-1.11</module>
<module>dlink-client-1.14</module>
<module>dlink-client-hadoop</module>
<module>dlink-client-base</module>
<module>dlink-client-1.15</module>
</modules>
</project>

<profiles>
<profile>
<id>flink-1.11</id>
<modules>
<module>dlink-client-1.11</module>
</modules>
</profile>

<profile>
<id>flink-1.12</id>
<modules>
<module>dlink-client-1.12</module>
</modules>
</profile>

<profile>
<id>flink-1.13</id>
<modules>
<module>dlink-client-1.13</module>
</modules>
</profile>

<profile>
<id>flink-1.14</id>
<modules>
<module>dlink-client-1.14</module>
</modules>
</profile>

<profile>
<id>flink-1.15</id>
<modules>
<module>dlink-client-1.15</module>
</modules>
</profile>
</profiles>
</project>
62 changes: 46 additions & 16 deletions dlink-connectors/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -15,26 +15,56 @@
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->

<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
<project xmlns="http://maven.apache.org/POM/4.0.0" 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>
<artifactId>dlink</artifactId>
<groupId>com.dlink</groupId>
<artifactId>dlink</artifactId>
<version>0.6.8-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<packaging>pom</packaging>
<modules>
<module>dlink-connector-jdbc-1.12</module>
<module>dlink-connector-jdbc-1.13</module>
<module>dlink-connector-jdbc-1.11</module>
<module>dlink-connector-jdbc-1.14</module>
<module>dlink-connector-phoenix-1.13</module>
<module>dlink-connector-phoenix-1.14</module>
<module>dlink-connector-doris-1.13</module>
<module>dlink-connector-pulsar-1.14</module>
</modules>

<artifactId>dlink-connectors</artifactId>
<packaging>pom</packaging>

<profiles>
<profile>
<id>flink-1.11</id>
<modules>
<module>dlink-connector-jdbc-1.11</module>
</modules>
</profile>

<profile>
<id>flink-1.12</id>
<modules>
<module>dlink-connector-jdbc-1.12</module>
</modules>
</profile>

<profile>
<id>flink-1.13</id>
<modules>
<module>dlink-connector-jdbc-1.13</module>
<module>dlink-connector-phoenix-1.13</module>
<module>dlink-connector-doris-1.13</module>
</modules>
</profile>

<profile>
<id>flink-1.14</id>
<modules>
<module>dlink-connector-jdbc-1.14</module>
<module>dlink-connector-phoenix-1.14</module>
<module>dlink-connector-pulsar-1.14</module>
</modules>
</profile>

<profile>
<id>flink-1.15</id>
<modules>

</modules>
</profile>
</profiles>
</project>
3 changes: 0 additions & 3 deletions dlink-flink/dlink-flink-1.14/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,7 @@
<properties>
<java.version>1.8</java.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<flink.version>1.14.6</flink.version>
<flink.guava.version>14.0</flink.guava.version>
<flinkcdc.version>2.2.1</flinkcdc.version>
<scala.binary.version>2.12</scala.binary.version>
<commons.version>1.3.1</commons.version>
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
Expand Down
16 changes: 5 additions & 11 deletions dlink-flink/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -15,30 +15,24 @@
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->

<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
<project xmlns="http://maven.apache.org/POM/4.0.0" 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>
<artifactId>dlink</artifactId>
<groupId>com.dlink</groupId>
<artifactId>dlink</artifactId>
<version>0.6.8-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

<artifactId>dlink-flink</artifactId>
<packaging>pom</packaging>
<modules>
<module>dlink-flink-1.11</module>
<module>dlink-flink-1.12</module>
<module>dlink-flink-1.13</module>
<module>dlink-flink-1.14</module>
<module>dlink-flink-1.15</module>
<module>dlink-flink-${dlink.flink.version}</module>
</modules>

<properties>
<maven.compiler.source>8</maven.compiler.source>
<maven.compiler.target>8</maven.compiler.target>
</properties>

</project>
</project>
7 changes: 1 addition & 6 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
<maven-surefire-plugin.version>3.0.0-M5</maven-surefire-plugin.version>
<maven-checkstyle-plugin.version>3.1.2</maven-checkstyle-plugin.version>

<spring-boot-dependencies.version>2.6.3</spring-boot-dependencies.version>
<spring-boot-dependencies.version>2.6.12</spring-boot-dependencies.version>
<hutool.version>5.8.4</hutool.version>
<druid-starter>1.2.8</druid-starter>
<mybatis-plus-boot-starter.version>3.5.1</mybatis-plus-boot-starter.version>
Expand All @@ -78,11 +78,6 @@
<maven-assembly-plugin.version>3.2.0</maven-assembly-plugin.version>
<maven.resource.version>3.2.0</maven.resource.version>
<junit.version>4.12</junit.version>
<!-- `provided` for product environment ,`compile` for dev environment -->
<scope.runtime>provided</scope.runtime>
<!-- modify flink version -->
<dlink.flink.version>1.14</dlink.flink.version>
<scala.binary.version>2.11</scala.binary.version>
<protobuf-java.version>2.5.0</protobuf-java.version>
<jedis.version>2.9.0</jedis.version>
<javax.mail>1.6.2</javax.mail>
Expand Down