Skip to content

Commit d5ef69c

Browse files
jonathanaustinjonathanaustin
authored
Merge pull request #12 from BorderTech/refactor-submodules
Refactor to use submodules (ie introduce taskmaster-parent).
2 parents 52ce146 + 3bc9222 commit d5ef69c

24 files changed

+106
-41
lines changed

‎pom.xml‎

Lines changed: 44 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
<modelVersion>4.0.0</modelVersion>
44

55
<groupId>com.github.bordertech.taskmaster</groupId>
6-
<name>taskmaster</name>
7-
<artifactId>taskmaster</artifactId>
6+
<name>taskmaster-parent</name>
7+
<artifactId>taskmaster-parent</artifactId>
88
<version>1.0.2-SNAPSHOT</version>
99

1010
<parent>
@@ -13,7 +13,7 @@
1313
<version>1.0.4</version>
1414
</parent>
1515

16-
<packaging>jar</packaging>
16+
<packaging>pom</packaging>
1717

1818
<properties>
1919
<bt.qa.skip>false</bt.qa.skip>
@@ -42,43 +42,46 @@
4242
<url>https://circleci.com/gh/bordertech/java-taskmaster/</url>
4343
</ciManagement>
4444

45-
<dependencies>
46-
<dependency>
47-
<groupId>com.github.bordertech.didums</groupId>
48-
<artifactId>didums-core</artifactId>
49-
<version>1.0.0</version>
50-
</dependency>
51-
52-
<!-- Injection interface. JSR 330 -->
53-
<dependency>
54-
<groupId>javax.inject</groupId>
55-
<artifactId>javax.inject</artifactId>
56-
<scope>provided</scope>
57-
<version>1</version>
58-
</dependency>
59-
60-
<!-- Logging -->
61-
<dependency>
62-
<groupId>org.slf4j</groupId>
63-
<artifactId>slf4j-api</artifactId>
64-
<version>1.7.25</version>
65-
</dependency>
66-
67-
<!-- Caching API. -->
68-
<dependency>
69-
<groupId>javax.cache</groupId>
70-
<artifactId>cache-api</artifactId>
71-
<version>1.0.0</version>
72-
</dependency>
73-
74-
<!-- Servlet Interface -->
75-
<dependency>
76-
<groupId>javax.servlet</groupId>
77-
<artifactId>servlet-api</artifactId>
78-
<scope>provided</scope>
79-
<version>2.5</version>
80-
</dependency>
81-
82-
</dependencies>
45+
<dependencyManagement>
46+
<dependencies>
47+
<dependency>
48+
<groupId>com.github.bordertech.didums</groupId>
49+
<artifactId>didums-core</artifactId>
50+
<version>1.0.0</version>
51+
</dependency>
52+
53+
<!-- Injection interface. JSR 330 -->
54+
<dependency>
55+
<groupId>javax.inject</groupId>
56+
<artifactId>javax.inject</artifactId>
57+
<version>1</version>
58+
</dependency>
59+
60+
<!-- Logging -->
61+
<dependency>
62+
<groupId>org.slf4j</groupId>
63+
<artifactId>slf4j-api</artifactId>
64+
<version>1.7.25</version>
65+
</dependency>
66+
67+
<!-- Caching API. -->
68+
<dependency>
69+
<groupId>javax.cache</groupId>
70+
<artifactId>cache-api</artifactId>
71+
<version>1.0.0</version>
72+
</dependency>
73+
74+
<!-- Servlet Interface -->
75+
<dependency>
76+
<groupId>javax.servlet</groupId>
77+
<artifactId>servlet-api</artifactId>
78+
<version>2.5</version>
79+
</dependency>
80+
</dependencies>
81+
</dependencyManagement>
82+
83+
<modules>
84+
<module>taskmaster</module>
85+
</modules>
8386

8487
</project>

‎taskmaster/pom.xml‎

Lines changed: 62 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,62 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<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">
3+
<modelVersion>4.0.0</modelVersion>
4+
5+
<groupId>com.github.bordertech.taskmaster</groupId>
6+
<name>taskmaster</name>
7+
<artifactId>taskmaster</artifactId>
8+
<version>1.0.2-SNAPSHOT</version>
9+
10+
<parent>
11+
<groupId>com.github.bordertech.taskmaster</groupId>
12+
<artifactId>taskmaster-parent</artifactId>
13+
<version>1.0.2-SNAPSHOT</version>
14+
<relativePath>../pom.xml</relativePath>
15+
</parent>
16+
17+
<packaging>jar</packaging>
18+
19+
<properties>
20+
<bt.qa.skip>false</bt.qa.skip>
21+
</properties>
22+
23+
<description>
24+
Task Master allows a Runnable task to be submitted for execution and returns a Future representing that task.
25+
</description>
26+
27+
<dependencies>
28+
<dependency>
29+
<groupId>com.github.bordertech.didums</groupId>
30+
<artifactId>didums-core</artifactId>
31+
</dependency>
32+
33+
<!-- Injection interface. JSR 330 -->
34+
<dependency>
35+
<groupId>javax.inject</groupId>
36+
<artifactId>javax.inject</artifactId>
37+
<scope>provided</scope>
38+
</dependency>
39+
40+
<!-- Logging -->
41+
<dependency>
42+
<groupId>org.slf4j</groupId>
43+
<artifactId>slf4j-api</artifactId>
44+
</dependency>
45+
46+
<!-- Caching API. -->
47+
<dependency>
48+
<groupId>javax.cache</groupId>
49+
<artifactId>cache-api</artifactId>
50+
<scope>provided</scope>
51+
</dependency>
52+
53+
<!-- Servlet Interface -->
54+
<dependency>
55+
<groupId>javax.servlet</groupId>
56+
<artifactId>servlet-api</artifactId>
57+
<scope>provided</scope>
58+
</dependency>
59+
60+
</dependencies>
61+
62+
</project>

src/main/java/com/github/bordertech/taskmaster/RejectedTaskException.java renamed to taskmaster/src/main/java/com/github/bordertech/taskmaster/RejectedTaskException.java

File renamed without changes.

src/main/java/com/github/bordertech/taskmaster/TaskFuture.java renamed to taskmaster/src/main/java/com/github/bordertech/taskmaster/TaskFuture.java

File renamed without changes.

src/main/java/com/github/bordertech/taskmaster/TaskMaster.java renamed to taskmaster/src/main/java/com/github/bordertech/taskmaster/TaskMaster.java

File renamed without changes.

src/main/java/com/github/bordertech/taskmaster/TaskMasterException.java renamed to taskmaster/src/main/java/com/github/bordertech/taskmaster/TaskMasterException.java

File renamed without changes.

src/main/java/com/github/bordertech/taskmaster/cache/CacheHelper.java renamed to taskmaster/src/main/java/com/github/bordertech/taskmaster/cache/CacheHelper.java

File renamed without changes.

src/main/java/com/github/bordertech/taskmaster/cache/CacheHelperImpl.java renamed to taskmaster/src/main/java/com/github/bordertech/taskmaster/cache/CacheHelperImpl.java

File renamed without changes.

src/main/java/com/github/bordertech/taskmaster/cache/package-info.java renamed to taskmaster/src/main/java/com/github/bordertech/taskmaster/cache/package-info.java

File renamed without changes.

src/main/java/com/github/bordertech/taskmaster/impl/TaskFutureResult.java renamed to taskmaster/src/main/java/com/github/bordertech/taskmaster/impl/TaskFutureResult.java

File renamed without changes.

0 commit comments

Comments
 (0)