Skip to content

Commit b436cf8

Browse files
committed
automatic module names for all modules
1 parent 7505456 commit b436cf8

File tree

7 files changed

+27
-29
lines changed

7 files changed

+27
-29
lines changed

code-assert-core/pom.xml

+1-13
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<name>${project.artifactId}</name>
1313

1414
<properties>
15-
<maven-jar.version>3.2.0</maven-jar.version>
15+
<module.name>guru.nidi.codeassert.core</module.name>
1616
</properties>
1717

1818
<build>
@@ -73,18 +73,6 @@
7373
</execution>
7474
</executions>
7575
</plugin>
76-
<plugin>
77-
<groupId>org.apache.maven.plugins</groupId>
78-
<artifactId>maven-jar-plugin</artifactId>
79-
<version>${maven-jar.version}</version>
80-
<configuration>
81-
<archive>
82-
<manifestEntries>
83-
<Automatic-Module-Name>guru.nidi.codeassert</Automatic-Module-Name>
84-
</manifestEntries>
85-
</archive>
86-
</configuration>
87-
</plugin>
8876
</plugins>
8977
</build>
9078

code-assert-gui/pom.xml

+4
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,10 @@
1010
<artifactId>code-assert-gui</artifactId>
1111
<name>${project.artifactId}</name>
1212

13+
<properties>
14+
<module.name>guru.nidi.codeassert.gui</module.name>
15+
</properties>
16+
1317
<dependencyManagement>
1418
<dependencies>
1519
<dependency>

code-assert-maven-plugin/pom.xml

+5-1
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,10 @@
1212
<name>${project.artifactId}</name>
1313
<packaging>maven-plugin</packaging>
1414

15+
<properties>
16+
<module.name>guru.nidi.codeassert.mavenplugin</module.name>
17+
</properties>
18+
1519
<build>
1620
<plugins>
1721
<plugin>
@@ -67,4 +71,4 @@
6771
</dependency>
6872
</dependencies>
6973

70-
</project>
74+
</project>

code-assert/pom.xml

+1-13
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,14 @@
1212
<name>${project.artifactId}</name>
1313

1414
<properties>
15+
<module.name>guru.nidi.codeassert</module.name>
1516
<checkstyle.version>6.19</checkstyle.version>
1617
<findbugs.version>3.1.12</findbugs.version>
1718
<findsecbugs.version>1.9.0</findsecbugs.version>
1819
<pmd.version>5.8.1</pmd.version>
1920
<kotlin.version>1.3.71</kotlin.version>
2021
<detekt.version>1.9.1</detekt.version>
2122
<ktlint.version>0.36.0</ktlint.version>
22-
<maven-jar.version>3.2.0</maven-jar.version>
2323
</properties>
2424

2525
<build>
@@ -80,18 +80,6 @@
8080
</execution>
8181
</executions>
8282
</plugin>
83-
<plugin>
84-
<groupId>org.apache.maven.plugins</groupId>
85-
<artifactId>maven-jar-plugin</artifactId>
86-
<version>${maven-jar.version}</version>
87-
<configuration>
88-
<archive>
89-
<manifestEntries>
90-
<Automatic-Module-Name>guru.nidi.codeassert</Automatic-Module-Name>
91-
</manifestEntries>
92-
</archive>
93-
</configuration>
94-
</plugin>
9583
</plugins>
9684
</build>
9785

code-assert/src/main/java/guru/nidi/codeassert/junit/CodeAssertJunit5Test.java

-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
import org.junit.jupiter.api.Disabled;
1919
import org.junit.jupiter.api.Test;
2020

21-
import static guru.nidi.codeassert.junit.CodeAssertCoreMatchers.*;
2221
import static guru.nidi.codeassert.junit.CodeAssertMatchers.*;
2322
import static guru.nidi.codeassert.junit.CodeAssertTestType.*;
2423
import static org.hamcrest.MatcherAssert.assertThat;

code-assert/src/main/java/guru/nidi/codeassert/junit/CodeAssertTest.java

-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
import org.junit.Ignore;
1919
import org.junit.Test;
2020

21-
import static guru.nidi.codeassert.junit.CodeAssertCoreMatchers.*;
2221
import static guru.nidi.codeassert.junit.CodeAssertMatchers.*;
2322
import static guru.nidi.codeassert.junit.CodeAssertTestType.*;
2423
import static org.hamcrest.MatcherAssert.assertThat;

pom.xml

+16
Original file line numberDiff line numberDiff line change
@@ -38,4 +38,20 @@
3838
<tag>HEAD</tag>
3939
</scm>
4040

41+
<build>
42+
<plugins>
43+
<plugin>
44+
<artifactId>maven-jar-plugin</artifactId>
45+
<version>3.2.0</version>
46+
<configuration>
47+
<archive>
48+
<manifestEntries>
49+
<Automatic-Module-Name>${module.name}</Automatic-Module-Name>
50+
</manifestEntries>
51+
</archive>
52+
</configuration>
53+
</plugin>
54+
</plugins>
55+
</build>
56+
4157
</project>

0 commit comments

Comments
 (0)