Skip to content

Commit 8f5d321

Browse files
benoitxbenoitx
committed
Add JDK 9 Module
Fixes Issue #19
1 parent 4491dd7 commit 8f5d321

File tree

7 files changed

+336
-293
lines changed

7 files changed

+336
-293
lines changed

‎datecalc-common/pom.xml

Lines changed: 33 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,40 @@
11
<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/maven-v4_0_0.xsd">
2-
<modelVersion>4.0.0</modelVersion>
2+
<modelVersion>4.0.0</modelVersion>
33

4-
<parent>
5-
<groupId>net.objectlab.kit</groupId>
6-
<artifactId>kit-parent</artifactId>
7-
<version>1.4.1-SNAPSHOT</version>
8-
</parent>
4+
<parent>
5+
<groupId>net.objectlab.kit</groupId>
6+
<artifactId>kit-parent</artifactId>
7+
<version>1.4.1-SNAPSHOT</version>
8+
</parent>
99

10-
<artifactId>datecalc-common</artifactId>
11-
<packaging>jar</packaging>
10+
<artifactId>datecalc-common</artifactId>
11+
<packaging>jar</packaging>
1212

13-
<name>Date Calculator Common</name>
14-
<description>Common Date Calculator Code</description>
13+
<name>Date Calculator Common</name>
14+
<description>Common Date Calculator Code</description>
1515

16-
<build>
17-
<plugins>
18-
<plugin>
19-
<groupId>org.apache.maven.plugins</groupId>
20-
<artifactId>maven-jar-plugin</artifactId>
21-
<version>2.3.2</version>
22-
<executions>
23-
<execution>
24-
<goals>
25-
<goal>test-jar</goal>
26-
</goals>
27-
</execution>
28-
</executions>
29-
</plugin>
30-
</plugins>
31-
</build>
16+
<build>
17+
<plugins>
18+
<plugin>
19+
<groupId>org.apache.maven.plugins</groupId>
20+
<artifactId>maven-jar-plugin</artifactId>
21+
<version>2.3.2</version>
22+
<configuration>
23+
<archive>
24+
<manifestEntries>
25+
<Automatic-Module-Name>net.objectlab.kit.datecalc.common</Automatic-Module-Name>
26+
</manifestEntries>
27+
</archive>
28+
</configuration>
29+
<executions>
30+
<execution>
31+
<goals>
32+
<goal>test-jar</goal>
33+
</goals>
34+
</execution>
35+
</executions>
36+
</plugin>
37+
</plugins>
38+
</build>
3239

3340
</project>

‎datecalc-jdk/pom.xml

Lines changed: 92 additions & 81 deletions
Original file line numberDiff line numberDiff line change
@@ -1,93 +1,104 @@
11
<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/maven-v4_0_0.xsd">
2-
<modelVersion>4.0.0</modelVersion>
2+
<modelVersion>4.0.0</modelVersion>
33

4-
<parent>
5-
<groupId>net.objectlab.kit</groupId>
6-
<artifactId>kit-parent</artifactId>
7-
<version>1.4.1-SNAPSHOT</version>
8-
</parent>
4+
<parent>
5+
<groupId>net.objectlab.kit</groupId>
6+
<artifactId>kit-parent</artifactId>
7+
<version>1.4.1-SNAPSHOT</version>
8+
</parent>
99

10-
<artifactId>datecalc-jdk</artifactId>
11-
<packaging>jar</packaging>
10+
<artifactId>datecalc-jdk</artifactId>
11+
<packaging>jar</packaging>
1212

13-
<name>Date Calc JDK</name>
14-
<description>Date Calculator methods for JDK</description>
13+
<name>Date Calc JDK</name>
14+
<description>Date Calculator methods for JDK</description>
1515

16-
<dependencies>
17-
<dependency>
18-
<groupId>net.objectlab.kit</groupId>
19-
<artifactId>datecalc-common</artifactId>
20-
</dependency>
21-
<dependency>
22-
<groupId>net.objectlab.kit</groupId>
23-
<artifactId>datecalc-common</artifactId>
24-
<scope>test</scope>
25-
<classifier>tests</classifier>
26-
</dependency>
27-
</dependencies>
16+
<dependencies>
17+
<dependency>
18+
<groupId>net.objectlab.kit</groupId>
19+
<artifactId>datecalc-common</artifactId>
20+
</dependency>
21+
<dependency>
22+
<groupId>net.objectlab.kit</groupId>
23+
<artifactId>datecalc-common</artifactId>
24+
<scope>test</scope>
25+
<classifier>tests</classifier>
26+
</dependency>
27+
</dependencies>
2828

29-
<build>
30-
<plugins>
31-
<!-- UNIT tests -->
32-
<plugin>
33-
<groupId>org.apache.maven.plugins</groupId>
34-
<artifactId>maven-surefire-plugin</artifactId>
35-
<version>2.19.1</version>
36-
<configuration>
37-
<skip>true</skip>
38-
</configuration>
39-
<executions>
40-
<execution>
41-
<id>surefire-test</id>
42-
<phase>test</phase>
43-
<goals>
44-
<goal>test</goal>
45-
</goals>
46-
<configuration>
47-
<skip>false</skip>
48-
<excludes>
49-
<exclude>**/perf/**</exclude>
50-
</excludes>
51-
</configuration>
52-
</execution>
53-
</executions>
54-
</plugin>
55-
</plugins>
56-
</build>
57-
58-
<profiles>
59-
<profile>
60-
<id>perf-testing</id>
61-
<build>
29+
<build>
6230
<plugins>
63-
<plugin>
64-
<groupId>org.apache.maven.plugins</groupId>
65-
<artifactId>maven-surefire-plugin</artifactId>
66-
<version>2.19.1</version>
67-
<configuration>
68-
<skip>true</skip>
69-
</configuration>
70-
<executions>
71-
<execution>
72-
<id>surefire-perf</id>
73-
<!-- use it mvn test -P perf-testing -->
74-
<phase>test</phase>
75-
<goals>
76-
<goal>test</goal>
77-
</goals>
31+
<!-- UNIT tests -->
32+
<plugin>
33+
<groupId>org.apache.maven.plugins</groupId>
34+
<artifactId>maven-surefire-plugin</artifactId>
35+
<version>2.19.1</version>
36+
<configuration>
37+
<skip>true</skip>
38+
</configuration>
39+
<executions>
40+
<execution>
41+
<id>surefire-test</id>
42+
<phase>test</phase>
43+
<goals>
44+
<goal>test</goal>
45+
</goals>
46+
<configuration>
47+
<skip>false</skip>
48+
<excludes>
49+
<exclude>**/perf/**</exclude>
50+
</excludes>
51+
</configuration>
52+
</execution>
53+
</executions>
54+
</plugin>
55+
<plugin>
56+
<groupId>org.apache.maven.plugins</groupId>
57+
<artifactId>maven-jar-plugin</artifactId>
7858
<configuration>
79-
<argLine>-Xms256m -Xmx1024m</argLine>
80-
<skip>false</skip>
81-
<includes>
82-
<include>**/perf/*Test.java</include>
83-
</includes>
59+
<archive>
60+
<manifestEntries>
61+
<Automatic-Module-Name>net.objectlab.kit.datecalc.jdk</Automatic-Module-Name>
62+
</manifestEntries>
63+
</archive>
8464
</configuration>
85-
</execution>
86-
</executions>
87-
</plugin>
65+
</plugin>
8866
</plugins>
89-
</build>
90-
</profile>
91-
</profiles>
67+
</build>
68+
69+
<profiles>
70+
<profile>
71+
<id>perf-testing</id>
72+
<build>
73+
<plugins>
74+
<plugin>
75+
<groupId>org.apache.maven.plugins</groupId>
76+
<artifactId>maven-surefire-plugin</artifactId>
77+
<version>2.19.1</version>
78+
<configuration>
79+
<skip>true</skip>
80+
</configuration>
81+
<executions>
82+
<execution>
83+
<id>surefire-perf</id>
84+
<!-- use it mvn test -P perf-testing -->
85+
<phase>test</phase>
86+
<goals>
87+
<goal>test</goal>
88+
</goals>
89+
<configuration>
90+
<argLine>-Xms256m -Xmx1024m</argLine>
91+
<skip>false</skip>
92+
<includes>
93+
<include>**/perf/*Test.java</include>
94+
</includes>
95+
</configuration>
96+
</execution>
97+
</executions>
98+
</plugin>
99+
</plugins>
100+
</build>
101+
</profile>
102+
</profiles>
92103

93104
</project>

0 commit comments

Comments
 (0)