Skip to content

Commit e8b8e6b

Browse files
aiwenmoaiwenmo
authored
[Feature-1308][*] release-0.7.0 (#1317)
Co-authored-by: wenmo <[email protected]>
1 parent 209ab7d commit e8b8e6b

File tree

101 files changed

+2942
-300
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

101 files changed

+2942
-300
lines changed

‎.github/ISSUE_TEMPLATE/bug-report.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,7 @@ body:
9595
Which version of Dinky are you running? We only accept bugs report from the LTS projects.
9696
options:
9797
- dev
98+
- 0.7.0
9899
- 0.6.7
99100
- 0.6.6
100101
- 0.6.5

‎dlink-admin/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<parent>
2222
<groupId>com.dlink</groupId>
2323
<artifactId>dlink</artifactId>
24-
<version>0.6.8-SNAPSHOT</version>
24+
<version>0.7.0</version>
2525
</parent>
2626

2727
<artifactId>dlink-admin</artifactId>

‎dlink-alert/dlink-alert-base/pom.xml

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,16 +15,14 @@
1515
~ See the License for the specific language governing permissions and
1616
~ limitations under the License.
1717
-->
18-
19-
<project xmlns="http://maven.apache.org/POM/4.0.0"
20-
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
18+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
2119
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
20+
<modelVersion>4.0.0</modelVersion>
2221
<parent>
23-
<artifactId>dlink-alert</artifactId>
2422
<groupId>com.dlink</groupId>
25-
<version>0.6.8-SNAPSHOT</version>
23+
<artifactId>dlink-alert</artifactId>
24+
<version>0.7.0</version>
2625
</parent>
27-
<modelVersion>4.0.0</modelVersion>
2826

2927
<artifactId>dlink-alert-base</artifactId>
3028

‎dlink-alert/dlink-alert-dingtalk/pom.xml

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,16 +15,14 @@
1515
~ See the License for the specific language governing permissions and
1616
~ limitations under the License.
1717
-->
18-
19-
<project xmlns="http://maven.apache.org/POM/4.0.0"
20-
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
18+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
2119
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
20+
<modelVersion>4.0.0</modelVersion>
2221
<parent>
23-
<artifactId>dlink-alert</artifactId>
2422
<groupId>com.dlink</groupId>
25-
<version>0.6.8-SNAPSHOT</version>
23+
<artifactId>dlink-alert</artifactId>
24+
<version>0.7.0</version>
2625
</parent>
27-
<modelVersion>4.0.0</modelVersion>
2826

2927
<artifactId>dlink-alert-dingtalk</artifactId>
3028

‎dlink-alert/dlink-alert-email/pom.xml

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,20 +15,17 @@
1515
~ See the License for the specific language governing permissions and
1616
~ limitations under the License.
1717
-->
18-
19-
<project xmlns="http://maven.apache.org/POM/4.0.0"
20-
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
18+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
2119
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
20+
<modelVersion>4.0.0</modelVersion>
2221
<parent>
23-
<artifactId>dlink-alert</artifactId>
2422
<groupId>com.dlink</groupId>
25-
<version>0.6.8-SNAPSHOT</version>
23+
<artifactId>dlink-alert</artifactId>
24+
<version>0.7.0</version>
2625
</parent>
27-
<modelVersion>4.0.0</modelVersion>
2826
<artifactId>dlink-alert-email</artifactId>
2927
<packaging>jar</packaging>
3028

31-
3229
<properties>
3330
<maven.compiler.source>${target.java.version}</maven.compiler.source>
3431
<maven.compiler.target>${target.java.version}</maven.compiler.target>

‎dlink-alert/dlink-alert-feishu/pom.xml

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,16 +15,14 @@
1515
~ See the License for the specific language governing permissions and
1616
~ limitations under the License.
1717
-->
18-
19-
<project xmlns="http://maven.apache.org/POM/4.0.0"
20-
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
18+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
2119
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
20+
<modelVersion>4.0.0</modelVersion>
2221
<parent>
23-
<artifactId>dlink-alert</artifactId>
2422
<groupId>com.dlink</groupId>
25-
<version>0.6.8-SNAPSHOT</version>
23+
<artifactId>dlink-alert</artifactId>
24+
<version>0.7.0</version>
2625
</parent>
27-
<modelVersion>4.0.0</modelVersion>
2826
<artifactId>dlink-alert-feishu</artifactId>
2927
<packaging>jar</packaging>
3028

‎dlink-alert/dlink-alert-wechat/pom.xml

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,16 +15,14 @@
1515
~ See the License for the specific language governing permissions and
1616
~ limitations under the License.
1717
-->
18-
19-
<project xmlns="http://maven.apache.org/POM/4.0.0"
20-
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
18+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
2119
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
20+
<modelVersion>4.0.0</modelVersion>
2221
<parent>
23-
<artifactId>dlink-alert</artifactId>
2422
<groupId>com.dlink</groupId>
25-
<version>0.6.8-SNAPSHOT</version>
23+
<artifactId>dlink-alert</artifactId>
24+
<version>0.7.0</version>
2625
</parent>
27-
<modelVersion>4.0.0</modelVersion>
2826

2927
<artifactId>dlink-alert-wechat</artifactId>
3028

‎dlink-alert/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<parent>
2222
<groupId>com.dlink</groupId>
2323
<artifactId>dlink</artifactId>
24-
<version>0.6.8-SNAPSHOT</version>
24+
<version>0.7.0</version>
2525
</parent>
2626

2727
<artifactId>dlink-alert</artifactId>

‎dlink-app/dlink-app-1.11/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<parent>
2323
<artifactId>dlink-app</artifactId>
2424
<groupId>com.dlink</groupId>
25-
<version>0.6.8-SNAPSHOT</version>
25+
<version>0.7.0</version>
2626
</parent>
2727
<modelVersion>4.0.0</modelVersion>
2828

‎dlink-app/dlink-app-1.11/pom.xml.versionsBackup

Lines changed: 118 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,118 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
~ Licensed to the Apache Software Foundation (ASF) under one or more
4+
~ contributor license agreements. See the NOTICE file distributed with
5+
~ this work for additional information regarding copyright ownership.
6+
~ The ASF licenses this file to You under the Apache License, Version 2.0
7+
~ (the "License"); you may not use this file except in compliance with
8+
~ the License. You may obtain a copy of the License at
9+
~
10+
~ http://www.apache.org/licenses/LICENSE-2.0
11+
~
12+
~ Unless required by applicable law or agreed to in writing, software
13+
~ distributed under the License is distributed on an "AS IS" BASIS,
14+
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
15+
~ See the License for the specific language governing permissions and
16+
~ limitations under the License.
17+
-->
18+
19+
<project xmlns="http://maven.apache.org/POM/4.0.0"
20+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
21+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
22+
<parent>
23+
<artifactId>dlink-app</artifactId>
24+
<groupId>com.dlink</groupId>
25+
<version>0.6.8-SNAPSHOT</version>
26+
</parent>
27+
<modelVersion>4.0.0</modelVersion>
28+
29+
<artifactId>dlink-app-1.11</artifactId>
30+
31+
<properties>
32+
<mainClass>com.dlink.app.MainApp</mainClass>
33+
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
34+
<maven.compiler.source>${target.java.version}</maven.compiler.source>
35+
<maven.compiler.target>${target.java.version}</maven.compiler.target>
36+
</properties>
37+
38+
<dependencies>
39+
<dependency>
40+
<groupId>com.dlink</groupId>
41+
<artifactId>dlink-app-base</artifactId>
42+
</dependency>
43+
<dependency>
44+
<groupId>mysql</groupId>
45+
<artifactId>mysql-connector-java</artifactId>
46+
</dependency>
47+
<dependency>
48+
<groupId>com.dlink</groupId>
49+
<artifactId>dlink-client-1.11</artifactId>
50+
</dependency>
51+
<dependency>
52+
<groupId>com.dlink</groupId>
53+
<artifactId>dlink-flink-1.11</artifactId>
54+
<scope>provided</scope>
55+
</dependency>
56+
<dependency>
57+
<groupId>com.dlink</groupId>
58+
<artifactId>dlink-client-base</artifactId>
59+
</dependency>
60+
<dependency>
61+
<groupId>com.dlink</groupId>
62+
<artifactId>dlink-executor</artifactId>
63+
</dependency>
64+
</dependencies>
65+
66+
<build>
67+
<resources>
68+
<resource>
69+
<directory>src/main/resources</directory>
70+
<includes>
71+
<include>*.properties</include>
72+
</includes>
73+
</resource>
74+
</resources>
75+
76+
<plugins>
77+
<!-- 编译插件 -->
78+
<plugin>
79+
<groupId>org.apache.maven.plugins</groupId>
80+
<artifactId>maven-compiler-plugin</artifactId>
81+
<version>${maven-compiler-plugin.version}</version>
82+
<configuration>
83+
<source>${target.java.version}</source>
84+
<target>${target.java.version}</target>
85+
<encoding>UTF-8</encoding>
86+
</configuration>
87+
</plugin>
88+
89+
<!-- 打jar包插件(会包含所有依赖) -->
90+
<plugin>
91+
<groupId>org.apache.maven.plugins</groupId>
92+
<artifactId>maven-assembly-plugin</artifactId>
93+
<version>${maven-assembly-plugin.version}</version>
94+
<configuration>
95+
<descriptorRefs>
96+
<descriptorRef>jar-with-dependencies</descriptorRef>
97+
</descriptorRefs>
98+
<archive>
99+
<manifest>
100+
<!-- 可以设置jar包的入口类(可选) -->
101+
<mainClass>com.dlink.app.MainApp</mainClass>
102+
</manifest>
103+
</archive>
104+
</configuration>
105+
<executions>
106+
<execution>
107+
<id>make-assembly</id>
108+
<phase>package</phase>
109+
<goals>
110+
<goal>single</goal>
111+
</goals>
112+
</execution>
113+
</executions>
114+
</plugin>
115+
</plugins>
116+
</build>
117+
118+
</project>

‎dlink-app/dlink-app-1.12/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<parent>
2323
<artifactId>dlink-app</artifactId>
2424
<groupId>com.dlink</groupId>
25-
<version>0.6.8-SNAPSHOT</version>
25+
<version>0.7.0</version>
2626
</parent>
2727
<modelVersion>4.0.0</modelVersion>
2828

‎dlink-app/dlink-app-1.12/pom.xml.versionsBackup

Lines changed: 118 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,118 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
~ Licensed to the Apache Software Foundation (ASF) under one or more
4+
~ contributor license agreements. See the NOTICE file distributed with
5+
~ this work for additional information regarding copyright ownership.
6+
~ The ASF licenses this file to You under the Apache License, Version 2.0
7+
~ (the "License"); you may not use this file except in compliance with
8+
~ the License. You may obtain a copy of the License at
9+
~
10+
~ http://www.apache.org/licenses/LICENSE-2.0
11+
~
12+
~ Unless required by applicable law or agreed to in writing, software
13+
~ distributed under the License is distributed on an "AS IS" BASIS,
14+
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
15+
~ See the License for the specific language governing permissions and
16+
~ limitations under the License.
17+
-->
18+
19+
<project xmlns="http://maven.apache.org/POM/4.0.0"
20+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
21+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
22+
<parent>
23+
<artifactId>dlink-app</artifactId>
24+
<groupId>com.dlink</groupId>
25+
<version>0.6.8-SNAPSHOT</version>
26+
</parent>
27+
<modelVersion>4.0.0</modelVersion>
28+
29+
<artifactId>dlink-app-1.12</artifactId>
30+
31+
<properties>
32+
<mainClass>com.dlink.app.MainApp</mainClass>
33+
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
34+
<maven.compiler.source>${target.java.version}</maven.compiler.source>
35+
<maven.compiler.target>${target.java.version}</maven.compiler.target>
36+
</properties>
37+
38+
<dependencies>
39+
<dependency>
40+
<groupId>com.dlink</groupId>
41+
<artifactId>dlink-app-base</artifactId>
42+
</dependency>
43+
<dependency>
44+
<groupId>mysql</groupId>
45+
<artifactId>mysql-connector-java</artifactId>
46+
</dependency>
47+
<dependency>
48+
<groupId>com.dlink</groupId>
49+
<artifactId>dlink-client-1.12</artifactId>
50+
</dependency>
51+
<dependency>
52+
<groupId>com.dlink</groupId>
53+
<artifactId>dlink-flink-1.12</artifactId>
54+
<scope>provided</scope>
55+
</dependency>
56+
<dependency>
57+
<groupId>com.dlink</groupId>
58+
<artifactId>dlink-client-base</artifactId>
59+
</dependency>
60+
<dependency>
61+
<groupId>com.dlink</groupId>
62+
<artifactId>dlink-executor</artifactId>
63+
</dependency>
64+
</dependencies>
65+
66+
<build>
67+
<resources>
68+
<resource>
69+
<directory>src/main/resources</directory>
70+
<includes>
71+
<include>*.properties</include>
72+
</includes>
73+
</resource>
74+
</resources>
75+
76+
<plugins>
77+
<!-- 编译插件 -->
78+
<plugin>
79+
<groupId>org.apache.maven.plugins</groupId>
80+
<artifactId>maven-compiler-plugin</artifactId>
81+
<version>${maven-compiler-plugin.version}</version>
82+
<configuration>
83+
<source>${target.java.version}</source>
84+
<target>${target.java.version}</target>
85+
<encoding>UTF-8</encoding>
86+
</configuration>
87+
</plugin>
88+
89+
<!-- 打jar包插件(会包含所有依赖) -->
90+
<plugin>
91+
<groupId>org.apache.maven.plugins</groupId>
92+
<artifactId>maven-assembly-plugin</artifactId>
93+
<version>${maven-assembly-plugin.version}</version>
94+
<configuration>
95+
<descriptorRefs>
96+
<descriptorRef>jar-with-dependencies</descriptorRef>
97+
</descriptorRefs>
98+
<archive>
99+
<manifest>
100+
<!-- 可以设置jar包的入口类(可选) -->
101+
<mainClass>com.dlink.app.MainApp</mainClass>
102+
</manifest>
103+
</archive>
104+
</configuration>
105+
<executions>
106+
<execution>
107+
<id>make-assembly</id>
108+
<phase>package</phase>
109+
<goals>
110+
<goal>single</goal>
111+
</goals>
112+
</execution>
113+
</executions>
114+
</plugin>
115+
</plugins>
116+
</build>
117+
118+
</project>

0 commit comments

Comments
 (0)