Skip to content

Commit b87d233

Browse files
keilwkeilw
committed
34: Prepare MR1
Task-Url: unitsofmeasurement/unit-tck#34 Signed-off-by: Werner Keil <werner.keil@gmx.net>
1 parent 4d15342 commit b87d233

1 file changed

Lines changed: 81 additions & 114 deletions

File tree

‎pom.xml‎

Lines changed: 81 additions & 114 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@
8383
<jacoco.plugin.version>0.8.6</jacoco.plugin.version>
8484
<junit.jupiter.version>5.7.0</junit.jupiter.version>
8585

86-
<!--Exclude the files Here -->
86+
<!--Exclude the files here -->
8787
<sonar.exclusions>src/main/java/javax/measure/BinaryPrefix.java,src/main/java/javax/measure/MetricPrefix.java</sonar.exclusions>
8888
</properties>
8989

@@ -615,9 +615,7 @@
615615
<manifestEntries>
616616
<Specification-Title>${project.name}</Specification-Title>
617617
<Specification-Version>${project.version}</Specification-Version>
618-
<Specification-Vendor>${project.organization.name}</Specification-Vendor>
619-
<Implementation-Vendor>Unit-API contributors</Implementation-Vendor>
620-
<Implementation-URL>http://unitsofmeasurement.github.io</Implementation-URL>
618+
<Specification-Vendor>${project.organization.name}</Specification-Vendor>
621619
<Automatic-Module-Name>java.measure</Automatic-Module-Name>
622620
<Multi-Release>true</Multi-Release>
623621
</manifestEntries>
@@ -809,7 +807,7 @@
809807
<site>
810808
<id>JSR-385</id>
811809
<name>JSR-385 Maven reports</name>
812-
<url>file:///var/www/www.unitsofmeasurement.github.io/jsr-385</url>
810+
<url>file:///var/www/www.unitsofmeasurement.github.io/unit-api</url>
813811
<!-- No longer active, just a placeholder! -->
814812
</site>
815813
</distributionManagement>
@@ -833,8 +831,7 @@
833831
<!-- Individual JARs -->
834832
<profile>
835833
<id>base-jar</id>
836-
<!-- This profile builds only the base (root level) elements into a separate
837-
-base.jar file -->
834+
<!-- This profile builds only the base (root level) elements into a separate JAR file -->
838835
<activation>
839836
<activeByDefault>false</activeByDefault>
840837
</activation>
@@ -855,7 +852,7 @@
855852
dir="${project.build.directory}/classes/META-INF/versions/${jdkOptionalVersion}" />
856853
<javac
857854
destdir="${project.build.directory}/classes/META-INF/versions/${jdkOptionalVersion}"
858-
srcdir="${project.basedir}/src/etc/modules/core/jdk${jdkOptionalVersion}"
855+
srcdir="${project.basedir}/src/etc/modules/base/jdk${jdkOptionalVersion}"
859856
includeAntRuntime="false">
860857
<compilerarg
861858
line="--release=${jdkOptionalVersion} --patch-module java.measure.base=${project.build.directory}/classes" />
@@ -877,8 +874,6 @@
877874
<Specification-Title>${project.name}</Specification-Title>
878875
<Specification-Version>${project.version}</Specification-Version>
879876
<Specification-Vendor>${project.organization.name}</Specification-Vendor>
880-
<Implementation-Vendor>Unit-API contributors</Implementation-Vendor>
881-
<Implementation-URL>http://unitsofmeasurement.github.io</Implementation-URL>
882877
<Automatic-Module-Name>java.measure.base</Automatic-Module-Name>
883878
<Multi-Release>true</Multi-Release>
884879
</manifestEntries>
@@ -908,13 +903,56 @@
908903

909904
<profile>
910905
<id>format-jar</id>
911-
<!-- This profile builds (optional) format elements into separate JAR
912-
files -->
906+
<!-- This profile builds (optional) format elements into separate JAR files -->
913907
<build>
914908
<plugins>
909+
<!--
910+
<plugin>
911+
<groupId>org.apache.maven.plugins</groupId>
912+
<artifactId>maven-antrun-plugin</artifactId>
913+
<executions>
914+
<execution>
915+
<phase>prepare-package</phase>
916+
<goals>
917+
<goal>run</goal>
918+
</goals>
919+
<configuration>
920+
<target>
921+
<mkdir
922+
dir="${project.build.directory}/classes/META-INF/versions/${jdkOptionalVersion}" />
923+
<javac
924+
destdir="${project.build.directory}/classes/META-INF/versions/${jdkOptionalVersion}"
925+
srcdir="${project.basedir}/src/etc/modules/format/jdk${jdkOptionalVersion}"
926+
includeAntRuntime="false">
927+
<compilerarg
928+
line="-release=${jdkOptionalVersion} -patch-module java.measure.format=${project.build.directory}/classes" />
929+
FIXME double hyphen for -patch-module and -release
930+
</javac>
931+
</target>
932+
</configuration>
933+
</execution>
934+
</executions>
935+
</plugin>
936+
-->
937+
915938
<plugin>
916939
<artifactId>maven-jar-plugin</artifactId>
917940
<version>${maven.jar.version}</version>
941+
<configuration>
942+
<archive>
943+
<manifest>
944+
<addDefaultImplementationEntries>true</addDefaultImplementationEntries>
945+
</manifest>
946+
<manifestEntries>
947+
<Specification-Title>${project.name}</Specification-Title>
948+
<Specification-Version>${project.version}</Specification-Version>
949+
<Specification-Vendor>${project.organization.name}</Specification-Vendor>
950+
<Automatic-Module-Name>java.measure.format</Automatic-Module-Name>
951+
<Multi-Release>false</Multi-Release>
952+
</manifestEntries>
953+
<addMavenDescriptor>false</addMavenDescriptor>
954+
</archive>
955+
</configuration>
918956
<executions>
919957
<execution>
920958
<id>format-jar</id>
@@ -942,6 +980,21 @@
942980
<plugin>
943981
<artifactId>maven-jar-plugin</artifactId>
944982
<version>${maven.jar.version}</version>
983+
<configuration>
984+
<archive>
985+
<manifest>
986+
<addDefaultImplementationEntries>true</addDefaultImplementationEntries>
987+
</manifest>
988+
<manifestEntries>
989+
<Specification-Title>${project.name}</Specification-Title>
990+
<Specification-Version>${project.version}</Specification-Version>
991+
<Specification-Vendor>${project.organization.name}</Specification-Vendor>
992+
<Automatic-Module-Name>java.measure.quantity</Automatic-Module-Name>
993+
<Multi-Release>false</Multi-Release>
994+
</manifestEntries>
995+
<addMavenDescriptor>false</addMavenDescriptor>
996+
</archive>
997+
</configuration>
945998
<executions>
946999
<execution>
9471000
<id>quanity-jar</id>
@@ -969,6 +1022,21 @@
9691022
<plugin>
9701023
<artifactId>maven-jar-plugin</artifactId>
9711024
<version>${maven.jar.version}</version>
1025+
<configuration>
1026+
<archive>
1027+
<manifest>
1028+
<addDefaultImplementationEntries>true</addDefaultImplementationEntries>
1029+
</manifest>
1030+
<manifestEntries>
1031+
<Specification-Title>${project.name}</Specification-Title>
1032+
<Specification-Version>${project.version}</Specification-Version>
1033+
<Specification-Vendor>${project.organization.name}</Specification-Vendor>
1034+
<Automatic-Module-Name>java.measure.spi</Automatic-Module-Name>
1035+
<Multi-Release>false</Multi-Release>
1036+
</manifestEntries>
1037+
<addMavenDescriptor>false</addMavenDescriptor>
1038+
</archive>
1039+
</configuration>
9721040
<executions>
9731041
<execution>
9741042
<id>spi-jar</id>
@@ -988,70 +1056,7 @@
9881056
</build>
9891057
</profile>
9901058

991-
<!-- Profile JARs -->
992-
<profile>
993-
<id>format-profile</id>
994-
<!-- This profile builds the Format Profile (base+format) into a separate
995-
jar file -->
996-
<activation>
997-
<activeByDefault>false</activeByDefault>
998-
</activation>
999-
<build>
1000-
<plugins>
1001-
<plugin>
1002-
<artifactId>maven-jar-plugin</artifactId>
1003-
<version>${maven.jar.version}</version>
1004-
<executions>
1005-
<execution>
1006-
<id>format-profile-jar</id>
1007-
<goals>
1008-
<goal>jar</goal>
1009-
</goals>
1010-
<configuration>
1011-
<classifier>format-profile</classifier>
1012-
<excludes>
1013-
<exclude>javax/measure/quantity/**</exclude>
1014-
<exclude>javax/measure/spi/**</exclude>
1015-
</excludes>
1016-
</configuration>
1017-
</execution>
1018-
</executions>
1019-
</plugin>
1020-
</plugins>
1021-
</build>
1022-
</profile>
1023-
1024-
<profile>
1025-
<id>spi-profile</id>
1026-
<!-- This profile builds the SPI Profile (base+format+spi) into a separate
1027-
jar file -->
1028-
<activation>
1029-
<activeByDefault>false</activeByDefault>
1030-
</activation>
1031-
<build>
1032-
<plugins>
1033-
<plugin>
1034-
<artifactId>maven-jar-plugin</artifactId>
1035-
<version>${maven.jar.version}</version>
1036-
<executions>
1037-
<execution>
1038-
<id>base-jar</id>
1039-
<goals>
1040-
<goal>jar</goal>
1041-
</goals>
1042-
<configuration>
1043-
<classifier>spi-profile</classifier>
1044-
<excludes>
1045-
<exclude>javax/measure/quantity/**</exclude>
1046-
</excludes>
1047-
</configuration>
1048-
</execution>
1049-
</executions>
1050-
</plugin>
1051-
</plugins>
1052-
</build>
1053-
</profile>
1054-
1059+
<!-- Documentation -->
10551060
<profile>
10561061
<id>documentation</id>
10571062
<build>
@@ -1080,44 +1085,6 @@
10801085
</build>
10811086
</profile>
10821087

1083-
<profile>
1084-
<id>brokenGitHubSite</id>
1085-
<build>
1086-
<plugins>
1087-
<!-- ======================================================= -->
1088-
<!-- GitHub Plugin -->
1089-
<!-- ======================================================= -->
1090-
<!-- This plugin seems permanently broken, will remove it to profile -->
1091-
<!-- TODO remove this profile soon -->
1092-
<plugin>
1093-
<groupId>com.github.github</groupId>
1094-
<artifactId>site-maven-plugin</artifactId>
1095-
<version>${github.maven.version}</version>
1096-
<configuration>
1097-
<!-- must match the server's id -->
1098-
<server>github</server>
1099-
<message>Building site for ${project.version}</message>
1100-
</configuration>
1101-
<executions>
1102-
<execution>
1103-
<goals>
1104-
<goal>site</goal>
1105-
</goals>
1106-
<phase>site-deploy</phase>
1107-
<configuration>
1108-
<path>site</path>
1109-
<merge>true</merge>
1110-
<!-- <outputDirectory>${project.build.directory}/mvn-repo</outputDirectory> -->
1111-
<repositoryName>unit-api</repositoryName>
1112-
<repositoryOwner>unitsofmeasurement</repositoryOwner>
1113-
</configuration>
1114-
</execution>
1115-
</executions>
1116-
</plugin>
1117-
</plugins>
1118-
</build>
1119-
</profile>
1120-
11211088
<profile>
11221089
<id>localCopySite</id>
11231090
<!-- ======================================================= -->

0 commit comments

Comments
 (0)