Skip to content

Commit 798c59d

Browse files
committed
Define automatic module names
1 parent a6dc7cb commit 798c59d

File tree

7 files changed

+158
-75
lines changed

7 files changed

+158
-75
lines changed

mug-bigquery/pom.xml

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,19 @@
4848
</plugin>
4949
</plugins>
5050
</pluginManagement>
51+
<plugins>
52+
<plugin>
53+
<groupId>org.apache.maven.plugins</groupId>
54+
<artifactId>maven-jar-plugin</artifactId>
55+
<configuration>
56+
<archive>
57+
<manifestEntries>
58+
<Automatic-Module-Name>com.google.mu.bigquery</Automatic-Module-Name>
59+
</manifestEntries>
60+
</archive>
61+
</configuration>
62+
</plugin>
63+
</plugins>
5164
</build>
5265
<dependencies>
5366
<dependency>

mug-guava/pom.xml

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,19 @@
5353
</plugin>
5454
</plugins>
5555
</pluginManagement>
56+
<plugins>
57+
<plugin>
58+
<groupId>org.apache.maven.plugins</groupId>
59+
<artifactId>maven-jar-plugin</artifactId>
60+
<configuration>
61+
<archive>
62+
<manifestEntries>
63+
<Automatic-Module-Name>com.google.mu.guava</Automatic-Module-Name>
64+
</manifestEntries>
65+
</archive>
66+
</configuration>
67+
</plugin>
68+
</plugins>
5669
</build>
5770
<dependencies>
5871
<dependency>

mug-protobuf/pom.xml

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,19 @@
2525
</plugin>
2626
</plugins>
2727
</pluginManagement>
28+
<plugins>
29+
<plugin>
30+
<groupId>org.apache.maven.plugins</groupId>
31+
<artifactId>maven-jar-plugin</artifactId>
32+
<configuration>
33+
<archive>
34+
<manifestEntries>
35+
<Automatic-Module-Name>com.google.mu.protobuf</Automatic-Module-Name>
36+
</manifestEntries>
37+
</archive>
38+
</configuration>
39+
</plugin>
40+
</plugins>
2841
</build>
2942
<dependencies>
3043
<dependency>

mug-safesql/pom.xml

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,19 @@
5252
</plugin>
5353
</plugins>
5454
</pluginManagement>
55+
<plugins>
56+
<plugin>
57+
<groupId>org.apache.maven.plugins</groupId>
58+
<artifactId>maven-jar-plugin</artifactId>
59+
<configuration>
60+
<archive>
61+
<manifestEntries>
62+
<Automatic-Module-Name>com.google.mu.safesql</Automatic-Module-Name>
63+
</manifestEntries>
64+
</archive>
65+
</configuration>
66+
</plugin>
67+
</plugins>
5568
</build>
5669
<dependencies>
5770
<dependency>

mug-spanner/pom.xml

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,19 @@
5050
</plugin>
5151
</plugins>
5252
</pluginManagement>
53+
<plugins>
54+
<plugin>
55+
<groupId>org.apache.maven.plugins</groupId>
56+
<artifactId>maven-jar-plugin</artifactId>
57+
<configuration>
58+
<archive>
59+
<manifestEntries>
60+
<Automatic-Module-Name>com.google.mu.spanner</Automatic-Module-Name>
61+
</manifestEntries>
62+
</archive>
63+
</configuration>
64+
</plugin>
65+
</plugins>
5366
</build>
5467
<dependencies>
5568
<dependency>

mug/pom.xml

Lines changed: 76 additions & 63 deletions
Original file line numberDiff line numberDiff line change
@@ -1,75 +1,88 @@
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>
3-
<parent>
4-
<groupId>com.google.mug</groupId>
5-
<artifactId>mug-root</artifactId>
6-
<version>9.1-SNAPSHOT</version>
7-
<relativePath>../pom.xml</relativePath>
8-
</parent>
9-
<artifactId>mug</artifactId>
10-
<packaging>jar</packaging>
2+
<modelVersion>4.0.0</modelVersion>
3+
<parent>
4+
<groupId>com.google.mug</groupId>
5+
<artifactId>mug-root</artifactId>
6+
<version>9.1-SNAPSHOT</version>
7+
<relativePath>../pom.xml</relativePath>
8+
</parent>
9+
<artifactId>mug</artifactId>
10+
<packaging>jar</packaging>
1111

12-
<name>core</name>
13-
<build>
14-
<pluginManagement>
15-
<plugins>
16-
<plugin>
17-
<groupId>org.sonatype.central</groupId>
18-
<artifactId>central-publishing-maven-plugin</artifactId>
19-
<version>0.8.0</version> <!-- or latest -->
20-
<extensions>true</extensions>
21-
<configuration>
22-
<publishingServerId>central</publishingServerId>
23-
<!-- optional but recommended in CI -->
24-
<autoPublish>true</autoPublish>
25-
<waitUntil>published</waitUntil>
26-
</configuration>
27-
</plugin>
28-
</plugins>
29-
</pluginManagement>
30-
</build>
12+
<name>core</name>
13+
<build>
14+
<pluginManagement>
15+
<plugins>
16+
<plugin>
17+
<groupId>org.sonatype.central</groupId>
18+
<artifactId>central-publishing-maven-plugin</artifactId>
19+
<version>0.8.0</version> <!-- or latest -->
20+
<extensions>true</extensions>
21+
<configuration>
22+
<publishingServerId>central</publishingServerId>
23+
<!-- optional but recommended in CI -->
24+
<autoPublish>true</autoPublish>
25+
<waitUntil>published</waitUntil>
26+
</configuration>
27+
</plugin>
28+
</plugins>
29+
</pluginManagement>
3130

32-
<dependencies>
33-
<dependency>
34-
<groupId>junit</groupId>
35-
<artifactId>junit</artifactId>
36-
</dependency>
31+
<plugins>
32+
<plugin>
33+
<groupId>org.apache.maven.plugins</groupId>
34+
<artifactId>maven-jar-plugin</artifactId>
35+
<configuration>
36+
<archive>
37+
<manifestEntries>
38+
<Automatic-Module-Name>com.google.mu</Automatic-Module-Name>
39+
</manifestEntries>
40+
</archive>
41+
</configuration>
42+
</plugin>
43+
</plugins>
44+
</build>
3745

38-
<dependency>
39-
<groupId>org.junit.jupiter</groupId>
40-
<artifactId>junit-jupiter-api</artifactId>
41-
</dependency>
46+
<dependencies>
47+
<dependency>
48+
<groupId>junit</groupId>
49+
<artifactId>junit</artifactId>
50+
</dependency>
4251

43-
<dependency>
44-
<groupId>com.google.truth</groupId>
45-
<artifactId>truth</artifactId>
46-
</dependency>
52+
<dependency>
53+
<groupId>org.junit.jupiter</groupId>
54+
<artifactId>junit-jupiter-api</artifactId>
55+
</dependency>
4756

48-
<dependency>
49-
<groupId>com.google.truth.extensions</groupId>
50-
<artifactId>truth-java8-extension</artifactId>
51-
</dependency>
57+
<dependency>
58+
<groupId>com.google.truth</groupId>
59+
<artifactId>truth</artifactId>
60+
</dependency>
5261

53-
<dependency>
54-
<groupId>com.google.testparameterinjector</groupId>
55-
<artifactId>test-parameter-injector</artifactId>
56-
</dependency>
62+
<dependency>
63+
<groupId>com.google.truth.extensions</groupId>
64+
<artifactId>truth-java8-extension</artifactId>
65+
</dependency>
5766

58-
<dependency>
59-
<groupId>com.google.guava</groupId>
60-
<artifactId>guava-testlib</artifactId>
61-
</dependency>
67+
<dependency>
68+
<groupId>com.google.testparameterinjector</groupId>
69+
<artifactId>test-parameter-injector</artifactId>
70+
</dependency>
6271

63-
<dependency>
64-
<groupId>com.google.guava</groupId>
65-
<artifactId>guava</artifactId>
66-
</dependency>
72+
<dependency>
73+
<groupId>com.google.guava</groupId>
74+
<artifactId>guava-testlib</artifactId>
75+
</dependency>
6776

68-
<dependency>
69-
<groupId>org.mockito</groupId>
70-
<artifactId>mockito-core</artifactId>
71-
<scope>test</scope>
72-
</dependency>
73-
</dependencies>
77+
<dependency>
78+
<groupId>com.google.guava</groupId>
79+
<artifactId>guava</artifactId>
80+
</dependency>
7481

82+
<dependency>
83+
<groupId>org.mockito</groupId>
84+
<artifactId>mockito-core</artifactId>
85+
<scope>test</scope>
86+
</dependency>
87+
</dependencies>
7588
</project>

pom.xml

Lines changed: 17 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -229,18 +229,23 @@
229229
<plugin>
230230
<artifactId>maven-jar-plugin</artifactId>
231231
<version>3.1.0</version>
232-
<executions>
233-
<execution>
234-
<id>javadoc-jar</id>
235-
<phase>package</phase>
236-
<goals>
237-
<goal>jar</goal>
238-
</goals>
239-
<configuration>
240-
<classifier>javadoc</classifier>
241-
</configuration>
242-
</execution>
243-
</executions>
232+
<executions>
233+
<execution>
234+
<id>javadoc-jar</id>
235+
<phase>package</phase>
236+
<goals><goal>jar</goal></goals>
237+
<configuration>
238+
<classifier>javadoc</classifier>
239+
<archive>
240+
<manifestEntries>
241+
<Automatic-Module-Name>
242+
${project.groupId}.${project.artifactId}
243+
</Automatic-Module-Name>
244+
</manifestEntries>
245+
</archive>
246+
</configuration>
247+
</execution>
248+
</executions>
244249
</plugin>
245250
<plugin>
246251
<artifactId>maven-deploy-plugin</artifactId>

0 commit comments

Comments
 (0)