Skip to content

Commit e8b811c

Browse files
jonathanaustinjonathanaustin
authored
Merge pull request #13 from BorderTech/refactor-submodules
CacheHelper and ServiceHelper Submodules
2 parents d5ef69c + a1a13fa commit e8b811c

File tree

30 files changed

+104
-36
lines changed

30 files changed

+104
-36
lines changed

‎.circleci/config.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ jobs:
88
docker:
99
# specify the version you desire here
1010
- image: circleci/openjdk:8-jdk
11-
11+
1212
# Specify service dependencies here if necessary
1313
# CircleCI maintains a library of pre-built images
1414
# documented at https://circleci.com/docs/2.0/circleci-images/
@@ -19,7 +19,7 @@ jobs:
1919
environment:
2020
# Customize the JVM maximum heap limit
2121
MAVEN_OPTS: -Xmx3200m
22-
22+
2323
steps:
2424
- checkout
2525

@@ -30,13 +30,13 @@ jobs:
3030
# fallback to using the latest cache if no exact match is found
3131
- v1-dependencies-
3232

33-
- run: mvn dependency:go-offline
33+
- run: mvn clean install -DskipTests
3434

3535
- save_cache:
3636
paths:
3737
- ~/.m2
3838
key: v1-dependencies-{{ checksum "pom.xml" }}
39-
39+
4040
# run tests!
4141
- run: mvn integration-test
4242

‎pom.xml‎

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -44,19 +44,14 @@
4444

4545
<dependencyManagement>
4646
<dependencies>
47+
48+
<!-- Didums Injection -->
4749
<dependency>
4850
<groupId>com.github.bordertech.didums</groupId>
4951
<artifactId>didums-core</artifactId>
5052
<version>1.0.0</version>
5153
</dependency>
5254

53-
<!-- Injection interface. JSR 330 -->
54-
<dependency>
55-
<groupId>javax.inject</groupId>
56-
<artifactId>javax.inject</artifactId>
57-
<version>1</version>
58-
</dependency>
59-
6055
<!-- Logging -->
6156
<dependency>
6257
<groupId>org.slf4j</groupId>
@@ -77,11 +72,14 @@
7772
<artifactId>servlet-api</artifactId>
7873
<version>2.5</version>
7974
</dependency>
75+
8076
</dependencies>
8177
</dependencyManagement>
8278

8379
<modules>
84-
<module>taskmaster</module>
80+
<module>taskmaster-cache-helper</module>
81+
<module>taskmaster-core</module>
82+
<module>taskmaster-service-helper</module>
8583
</modules>
8684

8785
</project>

‎taskmaster-cache-helper/pom.xml‎

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
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-cache-helper</name>
7+
<artifactId>taskmaster-cache-helper</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 provides a Cache Helper API.
25+
</description>
26+
27+
<dependencies>
28+
29+
<!-- Logging -->
30+
<dependency>
31+
<groupId>org.slf4j</groupId>
32+
<artifactId>slf4j-api</artifactId>
33+
</dependency>
34+
35+
<!-- Caching API. -->
36+
<dependency>
37+
<groupId>javax.cache</groupId>
38+
<artifactId>cache-api</artifactId>
39+
</dependency>
40+
41+
</dependencies>
42+
</project>

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

File renamed without changes.

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

File renamed without changes.

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

File renamed without changes.

‎taskmaster-cache-helper/src/main/resources/bordertech-defaults.properties‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
## Default Cache Helper
2+
bordertech.factory.impl.com.github.bordertech.taskmaster.cache.CacheHelper=com.github.bordertech.taskmaster.cache.CacheHelperImpl

taskmaster/pom.xml renamed to taskmaster-core/pom.xml

Lines changed: 9 additions & 20 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-core</name>
7+
<artifactId>taskmaster-core</artifactId>
88
<version>1.0.2-SNAPSHOT</version>
99

1010
<parent>
@@ -25,29 +25,18 @@
2525
</description>
2626

2727
<dependencies>
28-
<dependency>
29-
<groupId>com.github.bordertech.didums</groupId>
30-
<artifactId>didums-core</artifactId>
31-
</dependency>
3228

33-
<!-- Injection interface. JSR 330 -->
29+
<!-- TaskMaster Cache Helper -->
3430
<dependency>
35-
<groupId>javax.inject</groupId>
36-
<artifactId>javax.inject</artifactId>
37-
<scope>provided</scope>
31+
<groupId>com.github.bordertech.taskmaster</groupId>
32+
<artifactId>taskmaster-cache-helper</artifactId>
33+
<version>${project.version}</version>
3834
</dependency>
3935

40-
<!-- Logging -->
36+
<!-- Didums Injection -->
4137
<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>
38+
<groupId>com.github.bordertech.didums</groupId>
39+
<artifactId>didums-core</artifactId>
5140
</dependency>
5241

5342
<!-- Servlet Interface -->

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

File renamed without changes.

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

File renamed without changes.

0 commit comments

Comments
 (0)