Skip to content

Commit ff2ef99

Browse files
atsticksatsticks
committed
Fixed build.
1 parent 8e38341 commit ff2ef99

File tree

10 files changed

+84
-107
lines changed

10 files changed

+84
-107
lines changed

‎pom.xml‎

Lines changed: 56 additions & 92 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<artifactId>money-api</artifactId>
1616
<packaging>jar</packaging>
1717

18-
<version>1.0-SNAPSHOT</version>
18+
<version>0.9</version>
1919

2020
<name>JSR 354 (Money and Currency API)</name>
2121
<url>http://java.net/projects/javamoney</url>
@@ -309,7 +309,6 @@
309309
<executions>
310310
<execution>
311311
<id>attach-sources</id>
312-
<!-- phase>verify</phase -->
313312
<goals>
314313
<goal>jar</goal>
315314
</goals>
@@ -411,12 +410,6 @@
411410
<version>${testng.version}</version>
412411
<scope>test</scope>
413412
</dependency>
414-
<!-- dependency>
415-
<groupId>junit</groupId>
416-
<artifactId>junit</artifactId>
417-
<version>${junit.version}</version>
418-
<scope>test</scope>
419-
</dependency -->
420413
</dependencies>
421414
</dependencyManagement>
422415

@@ -426,11 +419,6 @@
426419
<artifactId>testng</artifactId>
427420
<scope>test</scope>
428421
</dependency>
429-
<!-- dependency>
430-
<groupId>junit</groupId>
431-
<artifactId>junit</artifactId>
432-
<scope>test</scope>
433-
</dependency -->
434422
</dependencies>
435423

436424
<build>
@@ -452,6 +440,11 @@
452440

453441
<pluginManagement>
454442
<plugins>
443+
<plugin>
444+
<groupId>org.apache.maven.plugins</groupId>
445+
<artifactId>maven-site-plugin</artifactId>
446+
<version>3.1</version>
447+
</plugin>
455448
<!-- ======================================================= -->
456449
<!-- Packaging (OSGi bundle) -->
457450
<!-- ======================================================= -->
@@ -562,15 +555,13 @@
562555
</execution>
563556
</executions>
564557
<configuration>
565-
<detectLinks>true</detectLinks>
566-
<!-- excludePackageNames>blabla</excludePackageNames -->
558+
<additionalparam>-Xdoclint:none</additionalparam>
559+
<detectLinks>false</detectLinks>
567560
<keywords>true</keywords>
561+
<linksource>false</linksource>
568562
<failOnError>false</failOnError>
569-
<linksource>true</linksource>
570-
<!-- overview>${basedir}/overview.html</overview -->
571-
<source>${maven.compile.sourceLevel}</source>
572-
<!-- stylesheetfile>${basedir}/src/site/css/money-jdoc.css</stylesheetfile -->
573-
<verbose>true</verbose>
563+
<source>1.8</source>
564+
<verbose>false</verbose>
574565
</configuration>
575566
</plugin>
576567
<plugin>
@@ -603,14 +594,7 @@
603594
<plugin>
604595
<groupId>org.apache.maven.plugins</groupId>
605596
<artifactId>maven-javadoc-plugin</artifactId>
606-
<executions>
607-
<execution>
608-
<id>attach-javadocs</id>
609-
<goals>
610-
<goal>jar</goal>
611-
</goals>
612-
</execution>
613-
</executions>
597+
<version>2.9.1</version>
614598
</plugin>
615599
<plugin>
616600
<groupId>org.apache.maven.plugins</groupId>
@@ -679,13 +663,6 @@
679663
<plugin>
680664
<groupId>org.apache.maven.plugins</groupId>
681665
<artifactId>maven-jar-plugin</artifactId>
682-
<executions>
683-
<execution>
684-
<goals>
685-
<goal>test-jar</goal>
686-
</goals>
687-
</execution>
688-
</executions>
689666
</plugin>
690667
<plugin>
691668
<groupId>org.asciidoctor</groupId>
@@ -817,6 +794,7 @@
817794
</docletArtifact>
818795
<show>private</show>
819796
<additionalparam>
797+
-Xdoclint:none
820798
-inferrel -inferdep -quiet -hide java.*
821799
-collpackages java.util.*
822800
-postfixpackage -nodefontname Tahoma
@@ -827,16 +805,31 @@
827805
</reportSet>
828806
</reportSets>
829807
</plugin>
808+
<plugin>
809+
<groupId>org.codehaus.mojo</groupId>
810+
<artifactId>jdepend-maven-plugin</artifactId>
811+
<version>2.0-beta-2</version>
812+
</plugin>
830813
<plugin>
831814
<groupId>org.apache.maven.plugins</groupId>
832-
<artifactId>maven-jxr-plugin</artifactId>
833-
<version>2.3</version>
815+
<artifactId>maven-surefire-report-plugin</artifactId>
816+
<version>2.15</version>
834817
<configuration>
835818
<aggregate>true</aggregate>
836-
<linkJavadoc>true</linkJavadoc>
819+
<xrefLocation>${project.reporting.outputDirectory}/../xref-test</xrefLocation>
820+
<linkXRef>true</linkXRef>
821+
</configuration>
822+
</plugin>
823+
<plugin>
824+
<groupId>org.apache.maven.plugins</groupId>
825+
<artifactId>maven-pmd-plugin</artifactId>
826+
<version>3.0.1</version>
827+
<configuration>
828+
<targetJdk>${maven.compile.targetLevel}</targetJdk>
829+
<format>xml</format>
830+
<linkXRef>true</linkXRef>
837831
<aggregate>true</aggregate>
838-
<javadocDir>${project.name}/apidocs</javadocDir>
839-
<windowTitle>JSR 354 - Java Money Sources</windowTitle>
832+
<sourceEncoding>${project.build.sourceEncoding}</sourceEncoding>
840833
</configuration>
841834
</plugin>
842835
<plugin>
@@ -849,7 +842,8 @@
849842
<tagListOptions>
850843
<tagClasses>
851844
<tagClass>
852-
<displayName>Important fixes that have to be done until the next
845+
<displayName>Important fixes that have to be done until the
846+
next
853847
release
854848
</displayName>
855849
<tags>
@@ -891,33 +885,22 @@
891885
</plugin>
892886
<plugin>
893887
<groupId>org.apache.maven.plugins</groupId>
894-
<artifactId>maven-pmd-plugin</artifactId>
895-
<version>3.0.1</version>
888+
<artifactId>maven-jxr-plugin</artifactId>
889+
<version>2.3</version>
896890
<configuration>
897-
<targetJdk>${maven.compile.targetLevel}</targetJdk>
898-
<format>xml</format>
899-
<linkXRef>true</linkXRef>
900891
<aggregate>true</aggregate>
901-
<sourceEncoding>${project.build.sourceEncoding}</sourceEncoding>
902-
</configuration>
903-
</plugin>
904-
<plugin>
905-
<groupId>org.apache.maven.plugins</groupId>
906-
<artifactId>maven-surefire-report-plugin</artifactId>
907-
<version>2.15</version>
908-
<configuration>
892+
<linkJavadoc>true</linkJavadoc>
909893
<aggregate>true</aggregate>
910-
<xrefLocation>${project.reporting.outputDirectory}/../xref-test</xrefLocation>
911-
<linkXRef>true</linkXRef>
894+
<javadocDir>${project.name}/apidocs</javadocDir>
895+
<!-- stylesheet>${basedir}/src/site/css/javamoneys-jdoc.css</stylesheet -->
896+
<windowTitle>JSR 354 - Java Money API Sources</windowTitle>
912897
</configuration>
913898
</plugin>
914-
915899
<plugin>
916-
<groupId>org.codehaus.mojo</groupId>
917-
<artifactId>jdepend-maven-plugin</artifactId>
918-
<version>2.0-beta-2</version>
900+
<groupId>org.apache.maven.plugins</groupId>
901+
<artifactId>maven-dependency-plugin</artifactId>
902+
<version>2.8</version>
919903
</plugin>
920-
921904
<plugin>
922905
<groupId>org.jacoco</groupId>
923906
<artifactId>jacoco-maven-plugin</artifactId>
@@ -927,7 +910,6 @@
927910
<dataFile>${basedir}/target/coverage-reports/jacoco-unit.exec</dataFile>
928911
</configuration>
929912
</plugin>
930-
931913
<plugin>
932914
<groupId>org.codehaus.mojo</groupId>
933915
<artifactId>findbugs-maven-plugin</artifactId>
@@ -948,43 +930,25 @@
948930
<groupId>org.apache.maven.plugins</groupId>
949931
<artifactId>maven-project-info-reports-plugin</artifactId>
950932
<version>2.7</version>
951-
<reportSets>
952-
<reportSet>
953-
<inherited>true</inherited>
954-
<reports>
955-
<report>index</report>
956-
<report>scm</report>
957-
<report>plugin-management</report>
958-
<report>plugins</report>
959-
<report>summary</report>
960-
<report>dependencies</report>
961-
<report>dependency-convergence</report>
962-
<report>dependency-management</report>
963-
</reports>
964-
</reportSet>
965-
<reportSet>
966-
<inherited>false</inherited>
967-
<reports>
968-
<report>project-team</report>
969-
<report>issue-tracking</report>
970-
<report>license</report>
971-
<report>mailing-list</report>
972-
<report>cim</report>
973-
</reports>
974-
</reportSet>
975-
</reportSets>
976933
</plugin>
977-
978934
<plugin>
979935
<groupId>org.codehaus.mojo</groupId>
980-
<artifactId>dashboard-maven-plugin</artifactId>
981-
<version>1.0.0-beta-1</version>
936+
<artifactId>findbugs-maven-plugin</artifactId>
937+
<version>2.5.2</version>
938+
<configuration>
939+
<xrefLocation>${project.reporting.outputDirectory}/../xref</xrefLocation>
940+
<xmlOutput>true</xmlOutput>
941+
<effort>Max</effort>
942+
<threshold>Low</threshold>
943+
<failOnError>false</failOnError>
944+
<findbugsXmlOutput>true</findbugsXmlOutput>
945+
<findbugsXmlOutputDirectory>target/site</findbugsXmlOutputDirectory>
946+
<xrefLocation>xref/</xrefLocation>
947+
</configuration>
982948
</plugin>
983-
984949
<plugin>
985950
<groupId>org.apache.maven.plugins</groupId>
986951
<artifactId>maven-site-plugin</artifactId>
987-
<version>3.1</version>
988952
</plugin>
989953
</plugins>
990954
</reporting>

‎src/main/java/javax/money/MonetaryAmount.java‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,8 @@
1818
* <p>
1919
* Each instance of an amount provides additional meta-data in form of a {@link MonetaryContext}.
2020
* This context contains detailed information on the numeric capabilities, e.g. the supported
21-
* precision and maximal scale, as well as the common implementation flavor. <br/>
21+
* precision and maximal scale, as well as the common implementation flavor.
22+
*
2223
* Also a {@link MonetaryAmount} provides a {@link NumberValue}, which allows easily to extract the
2324
* numeric value, of the amount. And finally {@link #getFactory()} provides a
2425
* {@link MonetaryAmountFactory}, which allows to of instances of {@link MonetaryAmount} based
@@ -47,7 +48,8 @@
4748
* <li>To enable further interoperability a static method {@code from(MonetaryAmount)} is
4849
* recommended to be implemented on each implementation class, that allows conversion of a
4950
* {@code MonetaryAmount} to a concrete instance. E.g.a class {@code MyMoney extends MonetaryAmount}
50-
* would contain the following method:<br/>
51+
* would contain the following method:
52+
*
5153
* <blockquote>
5254
* <p>
5355
* <pre>
@@ -329,7 +331,7 @@ default boolean isZero(){
329331
/**
330332
* Returns a {@code MonetaryAmount} whose value is <tt>(this &times;
331333
* multiplicand)</tt>, and whose scale is {@code (this.scale() +
332-
* multiplicand.scale())}.<br/>
334+
* multiplicand.scale())}.
333335
* By default the input value's scale will be rounded to
334336
* accommodate the internal capabilities, and no {@link java.lang.ArithmeticException}
335337
* is thrown if the input number's scale exceeds the capabilities.

‎src/main/java/javax/money/NumberValue.java‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -129,8 +129,10 @@ public abstract class NumberValue extends Number implements Comparable<NumberVal
129129
* w = longValue()
130130
* n = getFractionNominator()
131131
* d = getFractionDenominator()
132-
* </code><br/>
133-
* the following must be always true:<br/>
132+
* </code>
133+
*
134+
* the following must be always true:
135+
*
134136
* <code>
135137
* !(w<0 && n>0) and
136138
* !(w>0 && n<0) and
@@ -148,8 +150,10 @@ public abstract class NumberValue extends Number implements Comparable<NumberVal
148150
* w = longValue()
149151
* n = getFractionNominator()
150152
* d = getFractionDenominator()
151-
* </code><br/>
152-
* the following must be always true:<br/>
153+
* </code>
154+
*
155+
* the following must be always true:
156+
*
153157
* <code>
154158
* !(w<0 && n>0) and
155159
* !(w>0 && n<0) and

‎src/main/java/javax/money/RoundingContext.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,8 @@
1414
* This class models the spec/configuration for a rounding, modeled as {@link javax.money.MonetaryRounding} in a
1515
* platform independent way. Each RoundingContext instance hereby has a <code>roundingId</code>, which links
1616
* to the {@link javax.money.spi.RoundingProviderSpi} that must of the according rounding instance. The
17-
* <i>default</i> </i><code>roundingId</code> is <code>default</code>.<br/>
17+
* <i>default</i> </i><code>roundingId</code> is <code>default</code>.
18+
*
1819
* A RoundingContext can take up arbitrary attributes that must be documented by the
1920
* {@link javax.money.spi.RoundingProviderSpi} implementations.
2021
* <p>

‎src/main/java/javax/money/convert/ConversionContext.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,8 @@ public static ConversionContext of(String provider, RateType rateType){
119119
}
120120

121121
/**
122-
* Creates a new ConversionContext for the given {@link ProviderContext} and the given {@link RateType}.<br/>
122+
* Creates a new ConversionContext for the given {@link ProviderContext} and the given {@link RateType}.
123+
*
123124
* <i>Note:</i> for adding additional attributes use {@link javax.money.convert.ConversionContextBuilder
124125
* (ProviderContext, RateType)}.
125126
*

‎src/main/java/javax/money/convert/CurrencyConversion.java‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,12 @@
1515
* {@link MonetaryAmount} with a different target {@link CurrencyUnit}. Each instance of this class is bound to
1616
* a specific {@link ExchangeRateProvider} (or a chain of rate providers), a term {@link CurrencyUnit} and
1717
* (optionally) a target timestamp. Additionally the {@link javax.money.convert.ConversionContext} can have additional
18-
* attributes set that are passed to the rate provider (chain).<br/>
18+
* attributes set that are passed to the rate provider (chain).
19+
*
1920
* This interface serves a an API for the clients, but also must be implemented
2021
* and registered as SPI to the mechanisms required by the
21-
* {@link javax.money.spi.MonetaryConversionsSingletonSpi} implementation.<br/>
22+
* {@link javax.money.spi.MonetaryConversionsSingletonSpi} implementation.
23+
*
2224
* By extending {@link MonetaryOperator} currency conversion can simply be applied on each {@link MonetaryAmount}
2325
* calling the amount'0s with method:
2426
* <pre>

‎src/main/java/javax/money/convert/ExchangeRateProvider.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
* corresponding {@link javax.money.convert.ProviderContext}.
2020
* Instances of this class must only provide conversion data for exact one provider, identified by
2121
* {@link ProviderContext#getProvider()}.
22-
* <br/>
22+
*
2323
* When accessing ExchangeRateProvider instances or {@link javax.money.convert.CurrencyConversion} instances from the
2424
* {@link MonetaryConversions}
2525
* in many cases a chain of providers will be returned. It is the reponsibility of the implementation code assembling

‎src/main/java/javax/money/format/MonetaryAmountFormat.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,8 @@
1919
* </p>
2020
* <p>
2121
* To obtain a <code>MonetaryAmountFormat</code> for a specific locale, including the default
22-
* locale, call {@link MonetaryFormats#getAmountFormat(java.util.Locale)}. <br/>
22+
* locale, call {@link MonetaryFormats#getAmountFormat(java.util.Locale)}.
23+
*
2324
* More complex formatting scenarios can be implemented by registering instances of {@link javax.money.spi
2425
* .MonetaryAmountFormatProviderSpi}.
2526
* The spi implementation creates new instances of {@link javax.money.format.MonetaryAmountFormat} based on the

‎src/main/java/javax/money/package-info.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,8 @@
1515
* concrete usage scenarios do not allow to define an implementation that is
1616
* capable of covering all aspects identified. Consequently it must be possible
1717
* that implementations can provide several implementations for monetary
18-
* amounts. <br/>
18+
* amounts.
19+
*
1920
* Users should not reference the interfaces, instead the value types should be
2021
* used.</li>
2122
* <li>Implementations must provide value types for currencies and amounts,

‎src/main/java/javax/money/spi/MonetaryConversionsSingletonSpi.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,8 @@
1919
* SPI (conversoin) that implements the functionalities provided by the
2020
* {@code MonetaryConversions} singleton accessor. It should be registered as a
2121
* service using the JDK {@code ServiceLoader}. Hereby only one instance can be
22-
* registered at a time.<br/>
22+
* registered at a time.
23+
*
2324
* This interface is designed to support also contextual behaviour, e.g. in Java
2425
* EE containers each application may provide its own
2526
* {@link ExchangeRateProvider} instances, e.g. by registering them as CDI

0 commit comments

Comments
 (0)