Skip to content

Commit 6534081

Browse files
authored
Merge pull request #1 from pdowler/main
update README and github actions
2 parents 4c2450d + 4fc3e2b commit 6534081

File tree

3 files changed

+21
-9
lines changed

3 files changed

+21
-9
lines changed

.github/workflows/build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
steps:
2222

2323
- name: Checkout the repository
24-
uses: actions/checkout@v1
24+
uses: actions/checkout@v3
2525
with:
2626
submodules: true
2727

.github/workflows/preview.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
steps:
2323

2424
- name: Checkout the repository
25-
uses: actions/checkout@v1
25+
uses: actions/checkout@v3
2626
with:
2727
submodules: true
2828

README.md

Lines changed: 19 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,32 @@
11
# CAOM
2-
Common Archive Observation Model
2+
## Common Archive Observation Model
33

4+
The draft version is CAOM-2.5:
5+
[![PDF-Preview](https://img.shields.io/badge/Preview-PDF-blue)](../../releases/download/auto-pdf-preview/CAOM-draft.pdf)
6+
7+
The version of CAOM in use in the community (not an IVOA standard) is CAOM-2.4:
8+
<a href="http://www.opencadc.org/caom2/">https://www.opencadc.org/caom2/</a>. Previous
9+
non-IVOA standard versions of the VO-DML specification remain in the `src`.
10+
11+
## VO-DML Usage
412
This module contains a <a href="http://www.ivoa.net/documents/VODML/index.html">VO-DML</a>
513
description of the CAOM data model and test code to validate the model using the
6-
<a href="https://github.com/opencadc/core/tree/master/cadc-vodml">cadc-vodml</a> tools.
14+
<a href="https://github.com/opencadc/core/tree/master/cadc-vodml">cadc-vodml</a> tools. The model
15+
is currently defined using the VO-DML-1.0 recommendation.
716

8-
The current released version is CAOM-2.4:
9-
<a href="http://www.opencadc.org/caom2/">http://www.opencadc.org/caom2/</a>
17+
The VO-DML validation requires gradle (6.8 to 8.x). To run the tests locally: `grade test`.
1018

11-
The draft version is CAOM-2.5:
12-
[![PDF-Preview](https://img.shields.io/badge/Preview-PDF-blue)](../../releases/download/auto-pdf-preview/CAOM-draft.pdf)
19+
VO-DML source files are in `src/main/resources`.
1320

21+
## UML Diagrams
22+
UML diagrams are created and maintained manually using
23+
<a href="https://argouml-tigris-org.github.io/tigris/argouml/">ArgoUML</a>.
1424

25+
The UML project file and exported images are in `src/uml`.
26+
27+
## License
1528
<a rel="license" href="http://creativecommons.org/licenses/by-sa/4.0/">
1629
<img alt="Creative Commons License" style="border-width:0" src="https://i.creativecommons.org/l/by-sa/4.0/88x31.png" /></a>
1730
<br />The Common Archive Observation Model is licensed under the
1831
<a rel="license" href="http://creativecommons.org/licenses/by-sa/4.0/">
1932
Creative Commons Attribution-ShareAlike 4.0 International License</a>.
20-

0 commit comments

Comments
 (0)