Skip to content

Commit c568050

Browse files
keilwkeilw
committed
UNITSOFMEASUREMENT-194: Prepare Final
Task-Url: https://java.net/jira/browse/UNITSOFMEASUREMENT-194
1 parent 6a83387 commit c568050

File tree

2 files changed

+123
-105
lines changed

2 files changed

+123
-105
lines changed

‎pom.xml‎

Lines changed: 120 additions & 104 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<modelVersion>4.0.0</modelVersion>
44
<groupId>javax.measure</groupId>
55
<artifactId>unit-api</artifactId>
6-
<version>1.0-SNAPSHOT</version>
6+
<version>1.0</version>
77
<name>Units of Measurement API</name>
88
<packaging>bundle</packaging>
99
<url>http://unitsofmeasurement.github.io/</url>
@@ -197,15 +197,15 @@
197197
</developer>
198198
</developers>
199199
<contributors>
200-
<contributor>
201-
<name>Nathan Scott</name>
202-
<email>nathans@redhat.com</email>
203-
<organization>Red Hat</organization>
204-
<timezone>-5</timezone>
205-
<roles>
206-
<role>Contributor</role>
207-
</roles>
208-
</contributor>
200+
<contributor>
201+
<name>Nathan Scott</name>
202+
<email>nathans@redhat.com</email>
203+
<organization>Red Hat</organization>
204+
<timezone>-5</timezone>
205+
<roles>
206+
<role>Contributor</role>
207+
</roles>
208+
</contributor>
209209
<contributor>
210210
<name>Daniel Leuck</name>
211211
<email>dan@ikayzo.com</email>
@@ -265,7 +265,8 @@
265265
<version>0.5.2</version>
266266
</plugin>
267267

268-
<!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself. -->
268+
<!--This plugin's configuration is used to store Eclipse m2e settings
269+
only. It has no influence on the Maven build itself. -->
269270
<plugin>
270271
<groupId>org.eclipse.m2e</groupId>
271272
<artifactId>lifecycle-mapping</artifactId>
@@ -444,7 +445,19 @@
444445
</archive>
445446
</configuration>
446447
</plugin>
447-
448+
<plugin>
449+
<groupId>org.apache.maven.plugins</groupId>
450+
<artifactId>maven-jar-plugin</artifactId>
451+
<version>${maven.jar.version}</version>
452+
<executions>
453+
<execution>
454+
<goals>
455+
<goal>test-jar</goal>
456+
</goals>
457+
</execution>
458+
</executions>
459+
</plugin>
460+
448461
<!-- Packaging (OSGi bundle) -->
449462
<plugin>
450463
<groupId>org.apache.felix</groupId>
@@ -654,7 +667,7 @@
654667
</properties>
655668
</profile>
656669

657-
<!-- Individual JARs -->
670+
<!-- Individual JARs -->
658671
<profile>
659672
<id>core-jar</id>
660673
<!-- This profile builds only the core (root level) elements into a separate
@@ -687,10 +700,11 @@
687700
</plugins>
688701
</build>
689702
</profile>
690-
703+
691704
<profile>
692705
<id>format-jar</id>
693-
<!-- This profile builds (optional) format elements into separate JAR files -->
706+
<!-- This profile builds (optional) format elements into separate JAR
707+
files -->
694708
<build>
695709
<plugins>
696710
<plugin>
@@ -741,95 +755,97 @@
741755
</plugins>
742756
</build>
743757
</profile>
744-
745-
<profile>
746-
<id>spi-jar</id>
747-
<!-- This profile builds (optional) SPI into separate JAR files -->
748-
<build>
749-
<plugins>
750-
<plugin>
751-
<artifactId>maven-jar-plugin</artifactId>
752-
<version>${maven.jar.version}</version>
753-
<executions>
754-
<execution>
755-
<id>spi-jar</id>
756-
<goals>
757-
<goal>jar</goal>
758-
</goals>
759-
<configuration>
760-
<classifier>spi</classifier>
761-
<includes>
762-
<include>javax/measure/spi/**</include>
763-
</includes>
764-
</configuration>
765-
</execution>
766-
</executions>
767-
</plugin>
768-
</plugins>
769-
</build>
770-
</profile>
771-
772-
<!-- Profile JARs -->
773-
<profile>
774-
<id>format-profile</id>
775-
<!-- This profile builds the Format Profile (core+format) into a separate jar file -->
776-
<activation>
777-
<activeByDefault>false</activeByDefault>
778-
</activation>
779-
<build>
780-
<plugins>
781-
<plugin>
782-
<artifactId>maven-jar-plugin</artifactId>
783-
<version>${maven.jar.version}</version>
784-
<executions>
785-
<execution>
786-
<id>format-profile-jar</id>
787-
<goals>
788-
<goal>jar</goal>
789-
</goals>
790-
<configuration>
791-
<classifier>format-profile</classifier>
792-
<excludes>
793-
<exclude>javax/measure/quantity/**</exclude>
794-
<exclude>javax/measure/spi/**</exclude>
795-
</excludes>
796-
</configuration>
797-
</execution>
798-
</executions>
799-
</plugin>
800-
</plugins>
801-
</build>
802-
</profile>
803-
804-
<profile>
805-
<id>spi-profile</id>
806-
<!-- This profile builds the SPI Profile (core+format+spi) into a separate jar file -->
807-
<activation>
808-
<activeByDefault>false</activeByDefault>
809-
</activation>
810-
<build>
811-
<plugins>
812-
<plugin>
813-
<artifactId>maven-jar-plugin</artifactId>
814-
<version>${maven.jar.version}</version>
815-
<executions>
816-
<execution>
817-
<id>core-jar</id>
818-
<goals>
819-
<goal>jar</goal>
820-
</goals>
821-
<configuration>
822-
<classifier>spi-profile</classifier>
823-
<excludes>
824-
<exclude>javax/measure/quantity/**</exclude>
825-
</excludes>
826-
</configuration>
827-
</execution>
828-
</executions>
829-
</plugin>
830-
</plugins>
831-
</build>
832-
</profile>
758+
759+
<profile>
760+
<id>spi-jar</id>
761+
<!-- This profile builds (optional) SPI into separate JAR files -->
762+
<build>
763+
<plugins>
764+
<plugin>
765+
<artifactId>maven-jar-plugin</artifactId>
766+
<version>${maven.jar.version}</version>
767+
<executions>
768+
<execution>
769+
<id>spi-jar</id>
770+
<goals>
771+
<goal>jar</goal>
772+
</goals>
773+
<configuration>
774+
<classifier>spi</classifier>
775+
<includes>
776+
<include>javax/measure/spi/**</include>
777+
</includes>
778+
</configuration>
779+
</execution>
780+
</executions>
781+
</plugin>
782+
</plugins>
783+
</build>
784+
</profile>
785+
786+
<!-- Profile JARs -->
787+
<profile>
788+
<id>format-profile</id>
789+
<!-- This profile builds the Format Profile (core+format) into a separate
790+
jar file -->
791+
<activation>
792+
<activeByDefault>false</activeByDefault>
793+
</activation>
794+
<build>
795+
<plugins>
796+
<plugin>
797+
<artifactId>maven-jar-plugin</artifactId>
798+
<version>${maven.jar.version}</version>
799+
<executions>
800+
<execution>
801+
<id>format-profile-jar</id>
802+
<goals>
803+
<goal>jar</goal>
804+
</goals>
805+
<configuration>
806+
<classifier>format-profile</classifier>
807+
<excludes>
808+
<exclude>javax/measure/quantity/**</exclude>
809+
<exclude>javax/measure/spi/**</exclude>
810+
</excludes>
811+
</configuration>
812+
</execution>
813+
</executions>
814+
</plugin>
815+
</plugins>
816+
</build>
817+
</profile>
818+
819+
<profile>
820+
<id>spi-profile</id>
821+
<!-- This profile builds the SPI Profile (core+format+spi) into a separate
822+
jar file -->
823+
<activation>
824+
<activeByDefault>false</activeByDefault>
825+
</activation>
826+
<build>
827+
<plugins>
828+
<plugin>
829+
<artifactId>maven-jar-plugin</artifactId>
830+
<version>${maven.jar.version}</version>
831+
<executions>
832+
<execution>
833+
<id>core-jar</id>
834+
<goals>
835+
<goal>jar</goal>
836+
</goals>
837+
<configuration>
838+
<classifier>spi-profile</classifier>
839+
<excludes>
840+
<exclude>javax/measure/quantity/**</exclude>
841+
</excludes>
842+
</configuration>
843+
</execution>
844+
</executions>
845+
</plugin>
846+
</plugins>
847+
</build>
848+
</profile>
833849

834850
<profile>
835851
<id>documentation</id>

‎src/main/java/javax/measure/spi/ServiceProvider.java‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,8 +139,10 @@ public static List<ServiceProvider> available() {
139139
/**
140140
* Returns the current {@link ServiceProvider}. If necessary the {@link ServiceProvider} will be lazily loaded.
141141
* <p>
142-
* If there are no providers available, an {@linkplain IllegalStateException} is thrown, otherwise the provider with the highest priority is used or the one explicitly designated via {@link setCurrent()} .
142+
* If there are no providers available, an {@linkplain IllegalStateException} is thrown, otherwise the provider with the highest priority is used or
143+
* the one explicitly designated via {@link setCurrent()} .
143144
* </p>
145+
*
144146
* @return the {@link ServiceProvider} used.
145147
* @throws IllegalStateException
146148
* if no {@link ServiceProvider} has been found.

0 commit comments

Comments
 (0)