Skip to content

Commit

Permalink
Merge pull request #1 from openEHR/master
Browse files Browse the repository at this point in the history
update from origin
  • Loading branch information
ppazos authored Jun 6, 2023
2 parents a462bdd + 214a170 commit 4629a0c
Show file tree
Hide file tree
Showing 1,046 changed files with 26,081 additions and 7,212 deletions.
9 changes: 9 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
.idea/
*.iml
target
dadl-binding/tree_2_slots.dadl
oet-parser/term_map.txt
oet-parser/test_paths.txt
rm-skeleton/hypersensitivity_max.dadl
rm-skeleton/hypersensitivity_min.dadl
build.sh
39 changes: 39 additions & 0 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
image: java:8

stages:
- build
- release
- publish

maven-build-snapshot:
image: gitlab.cambiocds.com:4567/tools/docker-builder
stage: build
script:
- mvn clean package sonar:sonar -P sonar
except:
- /^release-.*$/
- tags

maven-build-tag:
image: gitlab.cambiocds.com:4567/tools/docker-builder
stage: build
script:
- mvn clean deploy sonar:sonar -P sonar
only:
- tags

release:
image: gitlab.cambiocds.com:4567/tools/docker-builder
stage: release
when: manual
script:
- git remote set-url origin $(echo $CI_REPOSITORY_URL | sed -e 's/[^@]\+@\([^\/]\+\)\//git@\1\:/')
- git checkout -b release-$CURRENT_VERSION
- git push -u origin release-$CURRENT_VERSION
- mvn versions:set -DnewVersion=$CURRENT_VERSION
- git commit -a -m "Changing to version "$CURRENT_VERSION
- git tag $CURRENT_VERSION
- git push origin $CURRENT_VERSION --tags
- git push origin --delete release-$CURRENT_VERSION
only:
- master
6 changes: 0 additions & 6 deletions INSTALL.txt

This file was deleted.

Empty file modified LICENSE.txt
100755 → 100644
Empty file.
32 changes: 32 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
# java-libs
Java openEHR Implementation project (ADL 1.4)

## Getting Started

### Requirements

* Java 8 or higher
* Maven 3.0.4 or higher

### Usage

The java-libs project is available at [Maven Central](http://search.maven.org/).

For example, if you need to use the adl-parser, add into your _pom.xml_:

```xml
<dependency>
<groupId>org.openehr.java-libs</groupId>
<artifactId>adl-parser</artifactId>
<version>1.0.71</version>
</dependency>
```

### Installation

To build the whole project, first clone it, and once inside the project's folder (by default _java-libs_), run:
```bash
mvn clean install
```
This will create binary files in the _target_ directories of each submodule.

5 changes: 0 additions & 5 deletions README.txt

This file was deleted.

Empty file modified adl-parser/docs/changes.txt
100755 → 100644
Empty file.
22 changes: 11 additions & 11 deletions adl-parser/pom.xml
100755 → 100644
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@

<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>openehr</groupId>
<artifactId>ref_impl_java</artifactId>
<version>1.0.5-SNAPSHOT</version>
<groupId>org.openehr.java-libs</groupId>
<artifactId>java-libs</artifactId>
<version>0-SNAPSHOT</version>
</parent>
<artifactId>adl-parser</artifactId>
<packaging>jar</packaging>
Expand Down Expand Up @@ -48,14 +48,14 @@
</manifest>
</archive>
</configuration>
<!-- executions>
<executions>
<execution>
<phase>package</phase>
<goals>
<goal>assembly</goal>
</goals>
</execution>
</executions-->
</executions>
</plugin>
</plugins>
<pluginManagement>
Expand Down Expand Up @@ -91,32 +91,32 @@

<dependencies>
<dependency>
<groupId>openehr</groupId>
<groupId>org.openehr.java-libs</groupId>
<artifactId>openehr-rm-core</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>openehr</groupId>
<groupId>org.openehr.java-libs</groupId>
<artifactId>openehr-rm-domain</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>openehr</groupId>
<groupId>org.openehr.java-libs</groupId>
<artifactId>openehr-aom</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>openehr</groupId>
<groupId>org.openehr.java-libs</groupId>
<artifactId>openehr-ap</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>openehr</groupId>
<groupId>org.openehr.java-libs</groupId>
<artifactId>measure-serv</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>openehr</groupId>
<groupId>org.openehr.java-libs</groupId>
<artifactId>mini-termserv</artifactId>
<version>${project.version}</version>
</dependency>
Expand Down
Empty file modified adl-parser/readme.txt
100755 → 100644
Empty file.
Empty file.
Empty file.
Empty file.
Empty file modified adl-parser/src/main/java/se/acode/openehr/parser/Invariant.java
100755 → 100644
Empty file.
Empty file modified adl-parser/src/main/java/se/acode/openehr/parser/Parsed.java
100755 → 100644
Empty file.
Loading

0 comments on commit 4629a0c

Please sign in to comment.