Skip to content

Commit 5207e25

Browse files
osmundfosmundf
authored
Merge pull request #4 from ZoftWhere/feature/release-1.2.1
Feature Release 1.2.1
2 parents 73703e9 + 7b5c9ad commit 5207e25

3 files changed

Lines changed: 114 additions & 20 deletions

File tree

‎main-github/latest-release-notes.md‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
Release Notes v1.2.1
2+
3+
- Maven POM updated to module-info.java in source artifact.
4+
- Maven POM updated to fix/remove maven-javadoc-plugin not creating package-list.
5+
- Maven POM updated for known issue with maven-surefire-plugin; exceptions occurring when module-info.java file is in the path and/or reuseForks is false.
6+
- Updated archived artifact entries in production jar file (including fields in manifest file).
7+
- Updated read me with correct Maven execution for creating/installing artifacts to local repository.

‎pom.xml‎

Lines changed: 99 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
<groupId>app.zoftwhere.mutable</groupId>
77
<artifactId>mutable-library</artifactId>
8-
<version>1.2.0</version>
8+
<version>1.2.1</version>
99

1010
<properties>
1111
<!-- Settings: maven-resource-plugin -->
@@ -90,13 +90,26 @@
9090
<execution>
9191
<id>default-compile</id>
9292
<phase>none</phase>
93+
<configuration>
94+
<release>${maven.compiler.test-jdk}</release>
95+
</configuration>
9396
</execution>
9497
<execution>
9598
<id>main-compile</id>
9699
<phase>compile</phase>
97100
<goals>
98101
<goal>compile</goal>
99102
</goals>
103+
<configuration>
104+
<release>${maven.compiler.test-jdk}</release>
105+
</configuration>
106+
</execution>
107+
<execution>
108+
<id>main-compile-jdk8</id>
109+
<phase>none</phase>
110+
<goals>
111+
<goal>compile</goal>
112+
</goals>
100113
<configuration>
101114
<source>${maven.compiler.main-jdk}</source>
102115
<target>${maven.compiler.main-jdk}</target>
@@ -118,13 +131,11 @@
118131
</execution>
119132
</executions>
120133
<configuration>
121-
<source>${maven.compiler.test-jdk}</source>
122-
<target>${maven.compiler.test-jdk}</target>
134+
<showDeprecation>true</showDeprecation>
135+
<showWarnings>true</showWarnings>
123136
<compilerArgs>
124137
<arg>-Xlint:all,-processing,-cast,-serial,-try</arg>
125138
</compilerArgs>
126-
<showWarnings>true</showWarnings>
127-
<showDeprecation>true</showDeprecation>
128139
</configuration>
129140
</plugin>
130141

@@ -150,7 +161,7 @@
150161
</execution>
151162
<execution>
152163
<id>test-resources</id>
153-
<phase>process-resources</phase>
164+
<phase>process-test-resources</phase>
154165
<goals>
155166
<goal>testResources</goal>
156167
</goals>
@@ -166,6 +177,10 @@
166177
<artifactId>maven-surefire-plugin</artifactId>
167178
<version>${maven-surefire-plugin.version}</version>
168179
<configuration>
180+
<!-- https://issues.apache.org/jira/browse/SUREFIRE-1534 -->
181+
<forkCount>0</forkCount>
182+
<reuseForks>false</reuseForks>
183+
<useSystemClassLoader>false</useSystemClassLoader>
169184
<printSummary>false</printSummary>
170185
</configuration>
171186
</plugin>
@@ -200,7 +215,7 @@
200215
</execution>
201216
<execution>
202217
<id>test-jar</id>
203-
<phase>package</phase>
218+
<phase>none</phase>
204219
<goals>
205220
<goal>test-jar</goal>
206221
</goals>
@@ -212,13 +227,20 @@
212227
</executions>
213228
<configuration>
214229
<archive>
230+
<addMavenDescriptor>false</addMavenDescriptor>
215231
<manifest>
216232
<addClasspath>false</addClasspath>
217233
</manifest>
218234
<manifestEntries>
219235
<Main-Class/>
220236
<Class-Path/>
221237
<Dependencies/>
238+
<Implementation-Title>${project.artifactId}</Implementation-Title>
239+
<Implementation-Vendor>${project.groupId}</Implementation-Vendor>
240+
<Implementation-Version>${project.version}</Implementation-Version>
241+
<Specification-Title>${project.artifactId}</Specification-Title>
242+
<Specification-Vendor>${project.groupId}</Specification-Vendor>
243+
<Specification-Version>${project.version}</Specification-Version>
222244
</manifestEntries>
223245
</archive>
224246
</configuration>
@@ -228,20 +250,42 @@
228250
<groupId>org.apache.maven.plugins</groupId>
229251
<artifactId>maven-javadoc-plugin</artifactId>
230252
<version>${maven-javadoc-plugin.version}</version>
253+
<executions>
254+
<execution>
255+
<id>main-javadoc</id>
256+
<phase>package</phase>
257+
<goals>
258+
<goal>jar</goal>
259+
</goals>
260+
<configuration>
261+
<failOnWarnings>true</failOnWarnings>
262+
<sourceFileExcludes>
263+
<exclude>module-info.java</exclude>
264+
</sourceFileExcludes>
265+
</configuration>
266+
</execution>
267+
<execution>
268+
<id>test-javadoc</id>
269+
<phase>none</phase>
270+
<goals>
271+
<goal>test-jar</goal>
272+
</goals>
273+
<configuration>
274+
<failOnWarnings>false</failOnWarnings>
275+
</configuration>
276+
</execution>
277+
</executions>
278+
<configuration>
279+
<quiet>true</quiet>
280+
<failOnError>true</failOnError>
281+
</configuration>
231282
</plugin>
232283

233284
<plugin>
234285
<groupId>org.apache.maven.plugins</groupId>
235286
<artifactId>maven-source-plugin</artifactId>
236287
<version>${maven-source-plugin.version}</version>
237288
<executions>
238-
<execution>
239-
<phase>none</phase>
240-
</execution>
241-
<execution>
242-
<id>default-source</id>
243-
<phase>none</phase>
244-
</execution>
245289
<execution>
246290
<id>main-source</id>
247291
<phase>package</phase>
@@ -254,7 +298,7 @@
254298
</execution>
255299
<execution>
256300
<id>test-source</id>
257-
<phase>package</phase>
301+
<phase>none</phase>
258302
<goals>
259303
<goal>test-jar</goal>
260304
</goals>
@@ -264,14 +308,32 @@
264308
</execution>
265309
</executions>
266310
<configuration>
267-
<forceCreation>true</forceCreation>
268311
</configuration>
269312
</plugin>
270313

271314
<plugin>
272315
<groupId>org.apache.maven.plugins</groupId>
273316
<artifactId>maven-install-plugin</artifactId>
274317
<version>${maven-install-plugin.version}</version>
318+
<executions>
319+
<execution>
320+
<id>main-install</id>
321+
<phase>none</phase>
322+
<goals>
323+
<goal>install-file</goal>
324+
</goals>
325+
<configuration>
326+
<pomFile>${project.basedir}/pom.xml</pomFile>
327+
<groupId>${project.groupId}</groupId>
328+
<artifactId>${project.artifactId}</artifactId>
329+
<version>${project.version}</version>
330+
<file>${project.build.directory}/${project.build.finalName}.jar</file>
331+
<packaging>jar</packaging>
332+
<sources>${project.build.directory}/${project.build.finalName}-sources.jar</sources>
333+
<javadoc>${project.build.directory}/${project.build.finalName}-javadoc.jar</javadoc>
334+
</configuration>
335+
</execution>
336+
</executions>
275337
</plugin>
276338

277339
<plugin>
@@ -280,13 +342,33 @@
280342
<version>${maven-deploy-plugin.version}</version>
281343
</plugin>
282344

345+
<plugin>
346+
<groupId>org.codehaus.mojo</groupId>
347+
<artifactId>build-helper-maven-plugin</artifactId>
348+
<version>3.0.0</version>
349+
<executions>
350+
<execution>
351+
<id>main-jpms</id>
352+
<phase>prepare-package</phase>
353+
<goals>
354+
<goal>add-source</goal>
355+
</goals>
356+
<configuration>
357+
<sources>
358+
<source>${project.basedir}/main-jpms</source>
359+
</sources>
360+
</configuration>
361+
</execution>
362+
</executions>
363+
</plugin>
364+
283365
<plugin>
284366
<groupId>org.moditect</groupId>
285367
<artifactId>moditect-maven-plugin</artifactId>
286368
<version>1.0.0.Beta2</version>
287369
<executions>
288370
<execution>
289-
<id>add-module-info</id>
371+
<id>main-jpms</id>
290372
<phase>package</phase>
291373
<goals>
292374
<goal>add-module-info</goal>
@@ -302,5 +384,4 @@
302384
</plugin>
303385
</plugins>
304386
</build>
305-
306387
</project>

‎readme.md‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,15 @@ The ZoftWhere Mutable Library provides mutable classes for scopes where final ar
1212

1313
## Compiling and Installing the Library
1414

15-
The source code can be compiled with Java language version 8. It has been tested with Oracle JDK8, JDK11 and JDK12.
15+
The source code can be compiled with Java language version 8. It has been tested with Oracle JDK8, JDK11 and JDK12. The test sources are compiled against JDK 11.
1616

17-
The project is Maven based, so executing the ```mvn install``` should install the library to the local repository. It has been tested with Apache Maven v3.6.1
17+
The project is Maven based, so executing the ```mvn install``` should install the library to the local repository (Requires at least JDK11). It has been tested with Apache Maven v3.6.1.
18+
19+
If the project needs to be installed against JDK8, it can be accomplished by calling the following Maven command:
20+
21+
``` shell script
22+
mvn clean compiler:compile@main-compile-jdk8 jar:jar@main-jar build-helper:add-source@main-jpms source:jar@main-sources javadoc:jar@main-javadoc moditect:add-module-info@main-jpms install:install-file@main-install
23+
```
1824

1925

2026
## Examples

0 commit comments

Comments
 (0)