Skip to content

Commit d5a8052

Browse files
hengboyhengboy
authored
Merge pull request #26 from hengboy/2.3.x
Move "api-boot-plugin-quartz" to "api-boot"
2 parents ece1908 + b893934 commit d5a8052

File tree

17 files changed

+89
-114
lines changed

17 files changed

+89
-114
lines changed

‎api-boot-project/api-boot-autoconfigure/pom.xml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -113,11 +113,6 @@
113113
</dependency>
114114

115115
<!--ApiBoot Quartz Plugin-->
116-
<dependency>
117-
<groupId>${project.groupId}</groupId>
118-
<artifactId>api-boot-plugin-quartz</artifactId>
119-
<optional>true</optional>
120-
</dependency>
121116
<dependency>
122117
<groupId>org.springframework.boot</groupId>
123118
<artifactId>spring-boot-starter-jdbc</artifactId>
@@ -256,6 +251,11 @@
256251
<artifactId>jpush-client</artifactId>
257252
<optional>true</optional>
258253
</dependency>
254+
<dependency>
255+
<groupId>org.quartz-scheduler</groupId>
256+
<artifactId>quartz</artifactId>
257+
<optional>true</optional>
258+
</dependency>
259259
<!--apiboot tools-->
260260
<dependency>
261261
<groupId>org.minbox.framework</groupId>

‎api-boot-project/api-boot-autoconfigure/src/main/java/org/minbox/framework/api/boot/autoconfigure/quartz/ApiBootQuartzAutoConfiguration.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package org.minbox.framework.api.boot.autoconfigure.quartz;
22

3-
import org.minbox.framework.api.boot.plugin.quartz.ApiBootQuartzService;
4-
import org.minbox.framework.api.boot.plugin.quartz.support.ApiBootQuartzServiceDefaultSupport;
3+
import org.minbox.framework.api.boot.quartz.ApiBootQuartzService;
4+
import org.minbox.framework.api.boot.quartz.support.ApiBootQuartzServiceDefaultSupport;
55
import org.quartz.Calendar;
66
import org.quartz.JobDetail;
77
import org.quartz.Scheduler;

‎api-boot-project/api-boot-dependencies/pom.xml‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -245,11 +245,6 @@
245245
<artifactId>quartz</artifactId>
246246
<version>${quartz.version}</version>
247247
</dependency>
248-
<dependency>
249-
<groupId>org.minbox.framework</groupId>
250-
<artifactId>api-boot-plugin-quartz</artifactId>
251-
<version>${project.version}</version>
252-
</dependency>
253248
<dependency>
254249
<groupId>org.minbox.framework</groupId>
255250
<artifactId>api-boot-starter-quartz</artifactId>

‎api-boot-project/api-boot-plugins/api-boot-plugin-quartz/pom.xml‎

Lines changed: 0 additions & 57 deletions
This file was deleted.

‎api-boot-project/api-boot-plugins/pom.xml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
<module>api-boot-plugin</module>
2222
<module>api-boot-plugin-security</module>
2323
<module>api-boot-plugin-oauth</module>
24-
<module>api-boot-plugin-quartz</module>
2524
<module>api-boot-plugin-resource-load</module>
2625
<module>api-boot-plugin-rate-limiter</module>
2726
<module>api-boot-plugin-sequence</module>

‎api-boot-project/api-boot-starters/api-boot-starter-quartz/pom.xml‎

Lines changed: 25 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,32 @@
3333
<groupId>org.minbox.framework</groupId>
3434
<artifactId>api-boot-starter</artifactId>
3535
</dependency>
36-
<!--ApiBoot Quartz Plugin-->
36+
<!--Quartz-->
3737
<dependency>
38-
<groupId>org.minbox.framework</groupId>
39-
<artifactId>api-boot-plugin-quartz</artifactId>
38+
<groupId>org.quartz-scheduler</groupId>
39+
<artifactId>quartz</artifactId>
40+
<exclusions>
41+
<exclusion>
42+
<artifactId>c3p0</artifactId>
43+
<groupId>com.mchange</groupId>
44+
</exclusion>
45+
<exclusion>
46+
<artifactId>HikariCP-java6</artifactId>
47+
<groupId>com.zaxxer</groupId>
48+
</exclusion>
49+
</exclusions>
50+
</dependency>
51+
<dependency>
52+
<groupId>org.slf4j</groupId>
53+
<artifactId>slf4j-api</artifactId>
54+
</dependency>
55+
<dependency>
56+
<groupId>org.springframework</groupId>
57+
<artifactId>spring-context-support</artifactId>
58+
</dependency>
59+
<dependency>
60+
<groupId>org.springframework</groupId>
61+
<artifactId>spring-tx</artifactId>
4062
</dependency>
4163
</dependencies>
4264
</project>

‎api-boot-project/api-boot/pom.xml‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,16 @@
2828
<artifactId>spring-core</artifactId>
2929
<optional>true</optional>
3030
</dependency>
31+
<dependency>
32+
<groupId>org.springframework</groupId>
33+
<artifactId>spring-tx</artifactId>
34+
<optional>true</optional>
35+
</dependency>
36+
<dependency>
37+
<groupId>org.springframework</groupId>
38+
<artifactId>spring-context-support</artifactId>
39+
<optional>true</optional>
40+
</dependency>
3141

3242
<!--Spring Boot-->
3343
<dependency>
@@ -86,6 +96,17 @@
8696
<dependency>
8797
<groupId>cn.jpush.api</groupId>
8898
<artifactId>jpush-client</artifactId>
99+
<optional>true</optional>
100+
</dependency>
101+
<dependency>
102+
<groupId>org.slf4j</groupId>
103+
<artifactId>slf4j-api</artifactId>
104+
<optional>true</optional>
105+
</dependency>
106+
<dependency>
107+
<groupId>org.quartz-scheduler</groupId>
108+
<artifactId>quartz</artifactId>
109+
<optional>true</optional>
89110
</dependency>
90111
</dependencies>
91112

‎api-boot-project/api-boot-plugins/api-boot-plugin-quartz/src/main/java/org/minbox/framework/api/boot/plugin/quartz/ApiBootQuartzService.java‎ renamed to ‎api-boot-project/api-boot/src/main/java/org/minbox/framework/api/boot/quartz/ApiBootQuartzService.java‎

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
1-
package org.minbox.framework.api.boot.plugin.quartz;
1+
package org.minbox.framework.api.boot.quartz;
22

3-
import org.minbox.framework.api.boot.plugin.quartz.wrapper.ApiBootJobWrapper;
4-
import org.minbox.framework.api.boot.plugin.quartz.wrapper.support.ApiBootCronJobWrapper;
5-
import org.quartz.JobKey;
3+
4+
import org.minbox.framework.api.boot.quartz.wrapper.ApiBootJobWrapper;
65
import org.quartz.Scheduler;
76
import org.quartz.SchedulerException;
8-
7+
import org.minbox.framework.api.boot.quartz.wrapper.support.ApiBootCronJobWrapper;
98
import java.util.Collection;
109
import java.util.Date;
1110

@@ -30,9 +29,9 @@ public interface ApiBootQuartzService {
3029
*
3130
* @param jobWrapper {@link ApiBootJobWrapper}
3231
* @return {@link ApiBootJobWrapper#getJobKey()}
33-
* @see org.minbox.framework.api.boot.plugin.quartz.wrapper.support.ApiBootOnceJobWrapper
34-
* @see org.minbox.framework.api.boot.plugin.quartz.wrapper.support.ApiBootLoopJobWrapper
35-
* @see org.minbox.framework.api.boot.plugin.quartz.wrapper.support.ApiBootCronJobWrapper
32+
* @see org.minbox.framework.api.boot.quartz.wrapper.support.ApiBootOnceJobWrapper
33+
* @see org.minbox.framework.api.boot.quartz.wrapper.support.ApiBootLoopJobWrapper
34+
* @see org.minbox.framework.api.boot.quartz.wrapper.support.ApiBootCronJobWrapper
3635
*/
3736
String newJob(ApiBootJobWrapper jobWrapper);
3837

@@ -114,8 +113,8 @@ public interface ApiBootQuartzService {
114113
/**
115114
* Update job start time
116115
* <p>
117-
* This method works for {@link org.minbox.framework.api.boot.plugin.quartz.wrapper.support.ApiBootOnceJobWrapper}
118-
* or {@link org.minbox.framework.api.boot.plugin.quartz.wrapper.support.ApiBootLoopJobWrapper}
116+
* This method works for {@link org.minbox.framework.api.boot.quartz.wrapper.support.ApiBootOnceJobWrapper}
117+
* or {@link org.minbox.framework.api.boot.quartz.wrapper.support.ApiBootLoopJobWrapper}
119118
* </p>
120119
*
121120
* @param jobKey {@link ApiBootJobWrapper#getJobKey()}

‎api-boot-project/api-boot-plugins/api-boot-plugin-quartz/src/main/java/org/minbox/framework/api/boot/plugin/quartz/support/ApiBootQuartzServiceDefaultSupport.java‎ renamed to ‎api-boot-project/api-boot/src/main/java/org/minbox/framework/api/boot/quartz/support/ApiBootQuartzServiceDefaultSupport.java‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
package org.minbox.framework.api.boot.plugin.quartz.support;
1+
package org.minbox.framework.api.boot.quartz.support;
22

3-
import org.minbox.framework.api.boot.plugin.quartz.ApiBootQuartzService;
4-
import org.minbox.framework.api.boot.plugin.quartz.wrapper.ApiBootJobWrapper;
5-
import org.minbox.framework.api.boot.plugin.quartz.wrapper.support.ApiBootCronJobWrapper;
6-
import org.minbox.framework.api.boot.plugin.quartz.wrapper.support.ApiBootLoopJobWrapper;
7-
import org.minbox.framework.api.boot.plugin.quartz.wrapper.support.ApiBootOnceJobWrapper;
3+
import org.minbox.framework.api.boot.quartz.ApiBootQuartzService;
4+
import org.minbox.framework.api.boot.quartz.wrapper.ApiBootJobWrapper;
5+
import org.minbox.framework.api.boot.quartz.wrapper.support.ApiBootCronJobWrapper;
6+
import org.minbox.framework.api.boot.quartz.wrapper.support.ApiBootLoopJobWrapper;
7+
import org.minbox.framework.api.boot.quartz.wrapper.support.ApiBootOnceJobWrapper;
88
import org.quartz.*;
99
import org.slf4j.Logger;
1010
import org.slf4j.LoggerFactory;
@@ -248,8 +248,8 @@ public void updateJobCron(String jobKey, String cron) {
248248
/**
249249
* Update job start time
250250
* <p>
251-
* This method works for {@link org.minbox.framework.api.boot.plugin.quartz.wrapper.support.ApiBootOnceJobWrapper}
252-
* or {@link org.minbox.framework.api.boot.plugin.quartz.wrapper.support.ApiBootLoopJobWrapper}
251+
* This method works for {@link ApiBootOnceJobWrapper}
252+
* or {@link ApiBootLoopJobWrapper}
253253
* </p>
254254
*
255255
* @param jobKey {@link ApiBootJobWrapper#getJobKey()}

‎api-boot-project/api-boot-plugins/api-boot-plugin-quartz/src/main/java/org/minbox/framework/api/boot/plugin/quartz/wrapper/ApiBootJobParamWrapper.java‎ renamed to ‎api-boot-project/api-boot/src/main/java/org/minbox/framework/api/boot/quartz/wrapper/ApiBootJobParamWrapper.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.minbox.framework.api.boot.plugin.quartz.wrapper;
1+
package org.minbox.framework.api.boot.quartz.wrapper;
22

33
import lombok.Data;
44

0 commit comments

Comments
 (0)