Skip to content

Commit aa9ee56

Browse files
committed
Fixed licence header infos.
Upgraded asciidoc for PDF. Removed licence from spec file (is part of the API package).
1 parent 0a1a734 commit aa9ee56

File tree

4 files changed

+54
-214
lines changed

4 files changed

+54
-214
lines changed

EVALUATION-LICENCE.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ <h3>JSR-000354 Java Money & Currency 1.0 Final Release for Evaluation
1111

1212
<p>
1313
Specification: JSR-354 Java Money & Currency Specification ("Specification")<BR>
14-
Version: 1.0<BR>
15-
Status: Final Release<BR>
14+
Version: 1.0-RC3<BR>
15+
Status: Proposed Final Draft<BR>
1616
Specification Lead: Credit Suisse ("Specification Lead")<BR>
1717
Release: 02 February 2015<BR>
1818
Copyright 2015 Credit Suisse, Inc.<BR>

IMPLEMENTATION_LICENCE.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ <h3>JSR-000354 Java Money & Currency 1.0 Final Release for Implementation</h3>
1010

1111
<p>
1212
Specification: JSR-354 Java Money & Currency Specification ("Specification")<BR>
13-
Version: 1.0<BR>
14-
Status: Final Release<BR>
13+
Version: 1.0-RC3<BR>
14+
Status: Proposed Final Draft<BR>
1515
Specification Lead: Credit Suisse ("Specification Lead")<BR>
1616
Release: 02 February 2015<BR>
1717
Copyright 2015 Credit Suisse, Inc.<BR>

pom.xml

Lines changed: 30 additions & 6 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>1.0-RC3</version>
1919

2020
<name>JSR 354 (Money and Currency API)</name>
2121
<url>http://java.net/projects/javamoney</url>
@@ -692,11 +692,20 @@
692692
<plugin>
693693
<groupId>org.asciidoctor</groupId>
694694
<artifactId>asciidoctor-maven-plugin</artifactId>
695-
<version>1.5.0</version>
695+
<version>1.5.2</version>
696+
<dependencies>
697+
<dependency>
698+
<groupId>org.asciidoctor</groupId>
699+
<artifactId>asciidoctorj-pdf</artifactId>
700+
<version>1.5.0-alpha.6</version>
701+
</dependency>
702+
</dependencies>
696703
<configuration>
697704
<sourceDirectory>src/main/asciidoc</sourceDirectory>
698705
<baseDir>${project.basedir}</baseDir>
699-
<eruby>erubis</eruby>
706+
<imagesDir>src/main/asciidoc/images/</imagesDir>
707+
<embedAssets>true</embedAssets>
708+
<!-- eruby>erubis</eruby -->
700709
</configuration>
701710
<executions>
702711
<execution>
@@ -709,9 +718,24 @@
709718
<outputDirectory>target/docs</outputDirectory>
710719
<sourceHighlighter>coderay</sourceHighlighter>
711720
<backend>html</backend>
712-
<embedAssets>true</embedAssets>
713-
<imagesDir>src/main/asciidoc/images/</imagesDir>
714-
<baseDir>src/main/asciidoc/</baseDir>
721+
</configuration>
722+
</execution>
723+
<execution>
724+
<id>output-docbook</id>
725+
<phase>prepare-package</phase>
726+
<goals>
727+
<goal>process-asciidoc</goal>
728+
</goals>
729+
<configuration>
730+
<backend>pdf</backend>
731+
<!-- WARNING callout bullets don't yet work with CodeRay -->
732+
<sourceHighlighter>coderay</sourceHighlighter>
733+
<attributes>
734+
<pagenums/>
735+
<toc/>
736+
<idprefix/>
737+
<idseparator>-</idseparator>
738+
</attributes>
715739
</configuration>
716740
</execution>
717741
</executions>

src/main/asciidoc/JavaMoneySpecification.adoc

Lines changed: 20 additions & 204 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
JSR 354 Money and Currency -- Specification
22
===========================================
33
:title: JSR 354 (Money & Currency) - Specification
4-
:revnumber: 1.0-SNAPSHOT
5-
:revremark: Public Final Draft
6-
:revdate: February 2015
7-
:longversion: {revnumber} ({revremark}) {revdate}
4+
:revnumber: 1.0-RC3
5+
:revremark: Proposed Final Draft
6+
:revdate: March 2015
7+
:longversion: 1.0-RC3 (Proposed Final Draft) March 2015
88
:authorinitials: ATR
99
:author: Anatole Tresch, Credit Suisse
1010
@@ -24,209 +24,25 @@
2424

2525
image::https://raw.githubusercontent.com/JavaMoney/jsr354-api/master/src/main/asciidoc/images/javamoney_cup.jpg[]
2626

27-
toc::[]
28-
29-
<<<
3027
:numbered!:
3128

32-
*EVALUATION LICENCE*
33-
34-
*JSR-000354 Money and Currency API 1.0 Final Draft Review*
35-
36-
CREDIT SUISSE AG IS WILLING TO LICENSE THIS SPECIFICATION TO YOU ONLY
37-
UPON THE CONDITION THAT YOU ACCEPT ALL OF THE TERMS CONTAINED IN THIS
38-
LICENSE AGREEMENT ("AGREEMENT"). PLEASE READ THE TERMS AND CONDITIONS
39-
OF THIS AGREEMENT CAREFULLY. BY DOWNLOADING THIS SPECIFICATION, YOU
40-
ACCEPT THE TERMS AND CONDITIONS OF THIS AGREEMENT. IF YOU ARE NOT
41-
WILLING TO BE BOUND BY THEM, SELECT THE "DECLINE" BUTTON AT THE
42-
BOTTOM OF THIS PAGE AND THE DOWNLOADING PROCESS WILL NOT CONTINUE.
43-
44-
45-
Specification: JSR-354 Money and Currency API ("Specification")+
46-
Version: {revnumber}+
47-
Status: {revremark}+
48-
Release: {revdate}+
49-
Copyright 2012-2015 Credit Suisse AG+
50-
8070 Zurich, Switzerland+
51-
All rights reserved.+
52-
53-
*NOTICE*
54-
55-
The Specification is protected by copyright and the information
56-
described therein may be protected by one or more U.S. patents,
57-
foreign patents, or pending applications. Except as provided under
58-
the following license, no part of the Specification may be
59-
reproduced in any form by any means without the prior written
60-
authorization of Credit Suisse AG ("the Specification Lead") and its
61-
licensors, if any. Any use of the Specification and the information
62-
described therein will be governed by the terms and conditions of
63-
this Agreement.
64-
65-
Subject to the terms and conditions of this license, including your
66-
compliance with Paragraphs 1 and 2 below, the Specification Lead
67-
hereby grants you a fully-paid, non-exclusive, non-transferable,
68-
limited license (without the right to sublicense) under the
69-
Specification Lead's intellectual property rights to:
70-
71-
1. Review the Specification for the purposes of evaluation. This
72-
includes:
73-
(i) developing implementations of the Specification for your
74-
internal, non-commercial use;
75-
(ii) discussing the Specification with any third party; and
76-
(iii) excerpting brief portions of the Specification in oral or
77-
written communications which discuss the Specification
78-
provided that such excerpts do not in the aggregate
79-
constitute a significant portion of the Technology.
80-
81-
2. Distribute implementations of the Specification to third parties
82-
for their testing and evaluation use, provided that any such
83-
implementation:
84-
(a) does not modify, subset, superset or otherwise extend the
85-
Licensor Name Space, or include any public or protected packages,
86-
classes, Java interfaces, fields or methods within the Licensor
87-
Name Space other than those required/authorized by the
88-
Specification or Specifications being implemented;
89-
(b) is clearly and prominently marked with the word "UNTESTED" or
90-
"EARLY ACCESS" or "INCOMPATIBLE" or "UNSTABLE" or "BETA" in
91-
any list of available builds and in proximity to every link
92-
initiating its download, where the list or link is under
93-
Licensee's control; and
94-
(c) includes the following notice: "This is an implementation of
95-
an early-draft specification developed under the Java Community
96-
Process (JCP) and is made available for testing and evaluation
97-
purposes only. The code is not compatible with any specification
98-
of the JCP."
99-
100-
The grant set forth above concerning your distribution of
101-
implementations of the specification is contingent upon your
102-
agreement to terminate development and distribution of your
103-
"early draft" implementation as soon as feasible following final
104-
completion of the specification. If you fail to do so, the foregoing
105-
grant shall be considered null and void. No provision of this
106-
Agreement shall be understood to restrict your ability to make
107-
and distribute to third parties applications written to the
108-
Specification. Other than this limited license, you acquire no
109-
right, title or interest in or to the Specification or any other
110-
intellectual property of the Specification Lead, and the
111-
Specification may only be used in accordance with the license terms
112-
set forth herein. This license will expire on the earlier of:
113-
(a) two (2) years from the date of Release listed above; (b) the
114-
date on which the final version of the Specification is publicly
115-
released; or (c) the date on which the Java Specification Request
116-
(JSR) to which the Specification corresponds is withdrawn. In
117-
addition, this license will terminate immediately without notice
118-
from the Specification Lead if you fail to comply with any provision
119-
of this license. Upon termination, you must cease use of or destroy
120-
the Specification.
121-
122-
"Licensor Name Space" means the public class or interface
123-
declarations whose names begin with "java", "javax", "com.oracle"
124-
or their equivalents in any subsequent naming convention adopted
125-
by Credit Suisse AG through the Java Community Process, or any
126-
recognized successors or replacements thereof.
127-
128-
*TRADEMARKS*
129-
130-
No right, title, or interest in or to any trademarks, service
131-
marks, or trade names of Credit Suisse AG or Credit Suisse AG's
132-
licensors is granted hereunder. Oracle, the Oracle logo, Java
133-
are trademarks or registered trademarks of Oracle USA, Inc. in
134-
the U.S. and other countries.
135-
136-
137-
*DISCLAIMER OF WARRANTIES*
138-
139-
THE SPECIFICATION IS PROVIDED "AS IS" AND IS EXPERIMENTAL AND
140-
MAY CONTAIN DEFECTS OR DEFICIENCIES WHICH CANNOT OR WILL NOT BE
141-
CORRECTED BY THE SPECIFICATION LEADS. THE SPECIFICATION LEADS MAKE
142-
NO REPRESENTATIONS OR WARRANTIES, EITHER EXPRESS OR IMPLIED,
143-
INCLUDING BUT NOT LIMITED TO, WARRANTIES OF MERCHANTABILITY,
144-
FITNESS FOR A PARTICULAR PURPOSE, OR NON-INFRINGEMENT THAT THE
145-
CONTENTS OF THE SPECIFICATION ARE SUITABLE FOR ANY PURPOSE OR
146-
THAT ANY PRACTICE OR IMPLEMENTATION OF SUCH CONTENTS WILL NOT
147-
INFRINGE ANY THIRD PARTY PATENTS, COPYRIGHTS, TRADE SECRETS OR
148-
OTHER RIGHTS.
149-
150-
This document does not represent any commitment to release or
151-
implement any portion of the Specification in any product.
152-
153-
THE SPECIFICATION COULD INCLUDE TECHNICAL INACCURACIES OR
154-
TYPOGRAPHICAL ERRORS. CHANGES ARE PERIODICALLY ADDED TO THE
155-
INFORMATION THEREIN; THESE CHANGES WILL BE INCORPORATED INTO
156-
NEW VERSIONS OF THE SPECIFICATION, IF ANY. THE SPECIFICATION
157-
LEADS MAY MAKE IMPROVEMENTS AND/OR CHANGES TO THE PRODUCT(S)
158-
AND/OR THE PROGRAM(S) DESCRIBED IN THE SPECIFICATION AT ANY
159-
TIME.
160-
161-
Any use of such changes in the Specification will be governed
162-
by the then-current license for the applicable version of the
163-
Specification.
164-
165-
*LIMITATION OF LIABILITY*
166-
167-
TO THE EXTENT NOT PROHIBITED BY LAW, IN NO EVENT WILL THE
168-
SPECIFICATION LEADS AND/OR THEIR LICENSORS BE LIABLE FOR ANY
169-
DAMAGES, INCLUDING WITHOUT LIMITATION, LOST REVENUE, PROFITS OR
170-
DATA, OR FOR SPECIAL, INDIRECT, CONSEQUENTIAL, INCIDENTAL OR
171-
PUNITIVE DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF
172-
LIABILITY, ARISING OUT OF OR RELATED TO ANY FURNISHING, PRACTICING,
173-
MODIFYING OR ANY USE OF THE SPECIFICATION, EVEN IF CREDIT SUISSE
174-
AND/OR ITS LICENSORS HAVE BEEN ADVISED OF THE POSSIBILITY OF SUCH
175-
DAMAGES.
176-
177-
You will hold the Specification Lead (and its licensors) harmless
178-
from any claims based on your use of the Specification for any
179-
purposes other than the limited right of evaluation as described
180-
above, and from any claims that later versions or releases of any
181-
Specification furnished to you are incompatible with the
182-
Specification provided to you under this license.
183-
184-
*RESTRICTED RIGHTS LEGEND*
185-
186-
If this Software is being acquired by or on behalf of the U.S.
187-
Government or by a U.S. Government prime contractor or subcontractor
188-
(at any tier), then the Government's rights in the Software and
189-
accompanying documentation shall be only as set forth in this license;
190-
this is in accordance with 48 C.F.R. 227.7201 through 227.7202-4 (for
191-
Department of Defense (DoD) acquisitions) and with 48 C.F.R. 2.101
192-
and 12.212 (for non-DoD acquisitions)
193-
194-
*REPORT*
195-
196-
You may wish to report any ambiguities, inconsistencies or
197-
inaccuracies you may find in connection with your evaluation of
198-
the Specification ("Feedback"). To the extent that you provide
199-
the Specification Lead with any Feedback, you hereby:
200-
(i) agree that such Feedback is provided on a non-proprietary and
201-
non-confidential basis, and
202-
(ii) grant the Specification Lead a perpetual, non-exclusive,
203-
worldwide, fully paid-up, irrevocable license, with the right
204-
to sublicense through multiple levels of sublicensees, to
205-
incorporate, disclose, and use without limitation the
206-
Feedback for any purpose related to the Specification and
207-
future versions, implementations, and test suites thereof.
208-
209-
*GENERAL TERMS*
210-
211-
Any action related to this Agreement will be governed by California
212-
law and controlling U.S. federal law. The U.N. Convention for the
213-
International Sale of Goods and the choice of law rules of any
214-
jurisdiction will not apply. The Specification is subject to U.S.
215-
export control laws and may be subject to export or import
216-
regulations in other countries. Licensee agrees to comply strictly
217-
with all such laws and regulations and acknowledges that it has
218-
the responsibility to obtain such licenses to export, re-export or
219-
import as may be required after delivery to Licensee. This Agreement
220-
is the parties' entire a agreement relating to its subject matter.
221-
It supersedes all prior or contemporaneous oral or written
222-
communications, proposals, conditions, representations and
223-
warranties and prevails over any conflicting or additional terms of
224-
any quote, order, acknowledgment, or other communication between the
225-
parties relating to its subject matter during the term of this
226-
Agreement. No modification to this Agreement will be binding,
227-
unless in writing and signed by an authorized representative of
228-
each party.
29+
==== Version Information:
30+
------------------------------------------------------------------
31+
Specification: JSR-354 Money and Currency API ("Specification")
32+
Version: 1.0-RC3
33+
Status: Proposed Final Draft
34+
Release: March 2015
35+
Copyright: 2012-2015
36+
Credit Suisse AG
37+
P.O.Box
38+
8070 Zurich
39+
Switzerland
40+
All rights reserved.
41+
------------------------------------------------------------------
22942

43+
toc::[]
44+
45+
<<<
23046
:numbered:
23147

23248
<<<

0 commit comments

Comments
 (0)