Skip to content

Commit

Permalink
fixed pom versions
Browse files Browse the repository at this point in the history
  • Loading branch information
ppazos committed Jun 6, 2023
1 parent 4629a0c commit ea95d04
Show file tree
Hide file tree
Showing 20 changed files with 171 additions and 168 deletions.
18 changes: 9 additions & 9 deletions adl-parser/pom.xml
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">

<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.openehr.java-libs</groupId>
<artifactId>java-libs</artifactId>
<version>0-SNAPSHOT</version>
<version>1.0.20-SNAPSHOT</version>
</parent>
<artifactId>adl-parser</artifactId>
<packaging>jar</packaging>
Expand All @@ -15,9 +15,9 @@
<url>http://www.openehr.org/</url>
</organization>
<inceptionYear>2004</inceptionYear>

<description>java ADL Parser</description>

<build>
<plugins>
<plugin>
Expand All @@ -35,7 +35,7 @@
</execution>
</executions>
</plugin>

<plugin>
<artifactId>maven-assembly-plugin</artifactId>
<configuration>
Expand Down Expand Up @@ -88,7 +88,7 @@
</plugins>
</pluginManagement>
</build>

<dependencies>
<dependency>
<groupId>org.openehr.java-libs</groupId>
Expand All @@ -109,7 +109,7 @@
<groupId>org.openehr.java-libs</groupId>
<artifactId>openehr-ap</artifactId>
<version>${project.version}</version>
</dependency>
</dependency>
<dependency>
<groupId>org.openehr.java-libs</groupId>
<artifactId>measure-serv</artifactId>
Expand All @@ -119,12 +119,12 @@
<groupId>org.openehr.java-libs</groupId>
<artifactId>mini-termserv</artifactId>
<version>${project.version}</version>
</dependency>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>3.8.1</version>
<scope>test</scope>
</dependency>
</dependency>
</dependencies>
</project>
28 changes: 14 additions & 14 deletions adl-parser/src/test/java/se/acode/openehr/parser/CDvScaleTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ public CDvScaleTest(String test) throws Exception {
*/
protected void setUp() throws Exception {
ADLParser parser = new ADLParser(loadFromClasspath(
"adl-test-ENTRY.c_dv_scale.test.adl"));
"adl-test-entry.c_dv_scale.test.adl"));
archetype = parser.parse();
}

Expand All @@ -44,13 +44,13 @@ public void testCDvScaleWithoutAssumedValue() throws Exception {
String[] codes = {
"at0003.0", "at0003.1", "at0003.2", "at0003.3", "at0003.4"
};

double[] values = { 0.0, 1.0, 2.5, 3.8, 4.4 };
String terminology = "local";
assertFalse("unexpected assumed value",

assertFalse("unexpected assumed value",
((CDvScale) node).hasAssumedValue());

assertCDvScale(node, terminology, codes, values, null);
}

Expand All @@ -62,22 +62,22 @@ public void testCDvScaleWithAssumedValueAndIntegers() throws Exception {
double[] values = { 0, 1, 2, 3, 4.1 };
String terminology = "local";
Scale assumed = new Scale(2, new CodePhrase(terminology, codes[2]));
assertTrue("expected to have assumed value",

assertTrue("expected to have assumed value",
((CDvScale) node).hasAssumedValue());

assertCDvScale(node, terminology, codes, values, assumed);
}

public void testEmptyDvScale() throws Exception {
node = archetype.node("/types[at0001]/items[at10003]/value");

assertTrue("CComplexObject expected", node instanceof CComplexObject );
assertTrue("DV_SCALE RM Type expected", ((CComplexObject) node).getRmTypeName().equals("DV_SCALE"));

assertTrue("any allowed expected", node.isAnyAllowed());
}

public void testCDvScaleWithDuplicatedValues() throws Exception {
node = archetype.node("/types[at0001]/items[at10004]/value");
String[] codes = {
Expand All @@ -91,11 +91,11 @@ public void testCDvScaleWithDuplicatedValues() throws Exception {

assertCDvScale(node, terminology, codes, values, null);
}

public void testDvScaleNormal() throws Exception {
node = archetype.node("/types[at0001]/items[at10005]/value");
String[] codes = {
"at0003.0", "at0003.2"
"at0003.0", "at0003.2"
};
double[] values = { 0, 1.5 };
String terminology = "local";
Expand All @@ -106,7 +106,7 @@ public void testDvScaleNormal() throws Exception {

//assertCDvScale(node, terminology, codes, values, null);
}

private void assertCDvScale(ArchetypeConstraint node, String terminoloy,
String[] codes, double[] values, Scale assumedValue) {

Expand Down
12 changes: 6 additions & 6 deletions adl-serializer/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<groupId>org.openehr.java-libs</groupId>
<artifactId>java-libs</artifactId>
<version>0-SNAPSHOT</version>
<version>1.0.20-SNAPSHOT</version>
</parent>
<artifactId>adl-serializer</artifactId>
<packaging>jar</packaging>
Expand All @@ -14,17 +14,17 @@
<url>http://www.openehr.org/</url>
</organization>
<inceptionYear>2004</inceptionYear>

<description>java ADL Serializer for Archetype Object Model</description>

<build>
<testResources>
<testResource>
<directory>src/test/adl</directory>
</testResource>
</testResources>
</build>

<dependencies>
<dependency>
<groupId>org.openehr.java-libs</groupId>
Expand All @@ -50,12 +50,12 @@
<groupId>org.openehr.java-libs</groupId>
<artifactId>mini-termserv</artifactId>
<version>${project.version}</version>
</dependency>
</dependency>
<dependency>
<groupId>org.openehr.java-libs</groupId>
<artifactId>adl-parser</artifactId>
<version>${project.version}</version>
<scope>test</scope>
<scope>test</scope>
</dependency>
<dependency>
<groupId>commons-lang</groupId>
Expand Down
14 changes: 7 additions & 7 deletions archetype-validator/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,20 +4,20 @@
<parent>
<groupId>org.openehr.java-libs</groupId>
<artifactId>java-libs</artifactId>
<version>0-SNAPSHOT</version>
<version>1.0.20-SNAPSHOT</version>
</parent>
<artifactId>archetype-validator</artifactId>
<packaging>jar</packaging>
<name>Archetype Validator</name>
<url>http://svn.openehr.org/ref_impl_java/TRUNK/project_page.htm</url>
<url>http://svn.openehr.org/ref_impl_java/TRUNK/project_page.htm</url>
<organization>
<name>openEHR</name>
<url>http://www.openehr.org/</url>
</organization>
<inceptionYear>2008</inceptionYear>

<description>Archetype Validator</description>

<build>
<plugins>
<plugin>
Expand All @@ -27,10 +27,10 @@
<source>1.7</source>
<target>1.7</target>
</configuration>
</plugin>
</plugin>
</plugins>
</build>

<dependencies>
<dependency>
<groupId>commons-lang</groupId>
Expand Down Expand Up @@ -76,7 +76,7 @@
<groupId>org.openehr.java-libs</groupId>
<artifactId>adl-parser</artifactId>
<version>${project.version}</version>
<scope>test</scope>
<scope>test</scope>
</dependency>
<dependency>
<groupId>junit</groupId>
Expand Down
20 changes: 10 additions & 10 deletions dadl-binding/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,41 +4,41 @@
<parent>
<groupId>org.openehr.java-libs</groupId>
<artifactId>java-libs</artifactId>
<version>0-SNAPSHOT</version>
<version>1.0.20-SNAPSHOT</version>
</parent>
<artifactId>dadl-binding</artifactId>
<packaging>jar</packaging>
<name>java dADL Binding</name>
<url>http://www.openehr.org/svn/ref_impl_java/TRUNK/project_page.htm</url>
<url>http://www.openehr.org/svn/ref_impl_java/TRUNK/project_page.htm</url>
<organization>
<name>openEHR</name>
<url>http://www.openehr.org/</url>
</organization>
<inceptionYear>2008</inceptionYear>
<description>java openEHR RM and dADL Binding Component</description>

<dependencies>
<dependency>
<groupId>org.openehr.java-libs</groupId>
<artifactId>openehr-rm-core</artifactId>
<version>${project.version}</version>
</dependency>

<!-- due to XPathUtil, should be removed once it's relocated.. -->
<dependency>
<groupId>org.openehr.java-libs</groupId>
<artifactId>openehr-aom</artifactId>
<version>${project.version}</version>
</dependency>

<!-- due to XPathUtil, should be removed once it's relocated.. -->
<dependency>
<groupId>org.openehr.java-libs</groupId>
<artifactId>adl-parser</artifactId>
<version>${project.version}</version>
</dependency>


<dependency>
<groupId>org.openehr.java-libs</groupId>
<artifactId>openehr-rm-domain</artifactId>
Expand All @@ -62,19 +62,19 @@
<dependency>
<groupId>org.openehr.java-libs</groupId>
<artifactId>dadl-parser</artifactId>
<version>${project.version}</version>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>3.8.1</version>
<scope>test</scope>
</dependency>
</dependency>
<dependency>
<groupId>commons-jxpath</groupId>
<artifactId>commons-jxpath</artifactId>
<version>1.3</version>
</dependency>
</dependency>
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
Expand Down
12 changes: 6 additions & 6 deletions dadl-parser/pom.xml
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">

<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.openehr.java-libs</groupId>
<artifactId>java-libs</artifactId>
<version>0-SNAPSHOT</version>
<version>1.0.20-SNAPSHOT</version>
</parent>
<artifactId>dadl-parser</artifactId>
<packaging>jar</packaging>
<name>java dADL Parser</name>
<url>http://svn.openehr.org/ref_impl_java/TRUNK/project_page.htm</url>
<url>http://svn.openehr.org/ref_impl_java/TRUNK/project_page.htm</url>
<organization>
<name>openEHR</name>
<url>http://www.openehr.org/</url>
</organization>
<inceptionYear>2007</inceptionYear>

<description>java dADL Parser</description>

<build>
Expand Down Expand Up @@ -63,7 +63,7 @@
</plugins>
</pluginManagement>
</build>

<dependencies>
<dependency>
<groupId>org.openehr.java-libs</groupId>
Expand All @@ -75,6 +75,6 @@
<artifactId>junit</artifactId>
<version>3.8.1</version>
<scope>test</scope>
</dependency>
</dependency>
</dependencies>
</project>
12 changes: 6 additions & 6 deletions measure-serv/pom.xml
Original file line number Diff line number Diff line change
@@ -1,25 +1,25 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">

<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.openehr.java-libs</groupId>
<artifactId>java-libs</artifactId>
<version>0-SNAPSHOT</version>
<version>1.0.20-SNAPSHOT</version>
</parent>
<artifactId>measure-serv</artifactId>
<packaging>jar</packaging>
<name>openEHR Measurement Service Implementation</name>
<url>http://www.openehr.org/projects/java.html</url>
<url>http://www.openehr.org/projects/java.html</url>

<organization>
<name>openEHR</name>
<url>http://www.openehr.org/</url>
</organization>
<inceptionYear>2007</inceptionYear>

<description>Java implementation of the openEHR Measurement Service</description>
<dependencies>

<dependencies>
<dependency>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
Expand Down
Loading

0 comments on commit ea95d04

Please sign in to comment.