Skip to content

Commit

Permalink
Finalized v2.2.0 (#77)
Browse files Browse the repository at this point in the history
  • Loading branch information
@pmanko
pmanko authored Jan 12, 2022
1 parent 66e5c9f commit 0edc4c9
Show file tree
Hide file tree
Showing 4 changed files with 157 additions and 140 deletions.
3 changes: 3 additions & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,3 +25,6 @@ null/*
#vs Code
.vscode/*
api/id_file

.flattened-pom.xml

260 changes: 123 additions & 137 deletions api/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -1,146 +1,132 @@
<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="http://maven.apache.org/POM/4.0.0"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
xmlns="http://maven.apache.org/POM/4.0.0"
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.openmrs.module</groupId>
<artifactId>xds-sender</artifactId>
<version>2.2.0-SNAPSHOT</version>
</parent>
<parent>
<groupId>org.openmrs.module</groupId>
<artifactId>xds-sender</artifactId>
<version>${revision}</version>
</parent>

<artifactId>xds-sender-api</artifactId>
<packaging>jar</packaging>
<name>XDS Sender API</name>
<description>API project for XDS Sender</description>
<artifactId>xds-sender-api</artifactId>
<packaging>jar</packaging>
<name>XDS Sender API</name>
<description>API project for XDS Sender</description>

<dependencies>
<dependency>
<groupId>org.openmrs.module</groupId>
<artifactId>fhir2-api</artifactId>
<version>${fhirModuleVersion}</version>
</dependency>
<dependency>
<groupId>org.openmrs.module</groupId>
<artifactId>labintegration-api</artifactId>
</dependency>
<dependency>
<groupId>org.marc.everest</groupId>
<artifactId>everest-core</artifactId>
</dependency>
<dependency>
<groupId>org.marc.everest</groupId>
<artifactId>everest-rmim-uv-cdar2</artifactId>
</dependency>
<dependency>
<groupId>org.marc.everest</groupId>
<artifactId>everest-formatters-xml-its1</artifactId>
</dependency>
<dependency>
<groupId>org.marc.everest</groupId>
<artifactId>everest-formatters-xml-dt-r1</artifactId>
</dependency>
<dependency>
<groupId>org.openmrs</groupId>
<artifactId>event-api</artifactId>
</dependency>
<dependency>
<groupId>org.openmrs.web</groupId>
<artifactId>openmrs-web</artifactId>
</dependency>
<dependencies>
<dependency>
<groupId>org.openmrs.module</groupId>
<artifactId>fhir2-api</artifactId>
<version>${fhirModuleVersion}</version>
</dependency>
<dependency>
<groupId>org.openmrs.module</groupId>
<artifactId>labintegration-api</artifactId>
</dependency>
<dependency>
<groupId>org.marc.everest</groupId>
<artifactId>everest-core</artifactId>
</dependency>
<dependency>
<groupId>org.marc.everest</groupId>
<artifactId>everest-rmim-uv-cdar2</artifactId>
</dependency>
<dependency>
<groupId>org.marc.everest</groupId>
<artifactId>everest-formatters-xml-its1</artifactId>
</dependency>
<dependency>
<groupId>org.marc.everest</groupId>
<artifactId>everest-formatters-xml-dt-r1</artifactId>
</dependency>
<dependency>
<groupId>org.openmrs</groupId>
<artifactId>event-api</artifactId>
</dependency>
<dependency>
<groupId>org.openmrs.web</groupId>
<artifactId>openmrs-web</artifactId>
</dependency>

<!-- DCM4CHEE modules (for JAX-b classes and InfoSetUtil) -->
<dependency>
<groupId>org.dcm4che</groupId>
<artifactId>dcm4chee-xds2-infoset</artifactId>
</dependency>
<dependency>
<groupId>org.dcm4che</groupId>
<artifactId>dcm4chee-xds2-common</artifactId>
<exclusions>
<exclusion>
<groupId>org.jboss.spec.javax.servlet</groupId>
<artifactId>jboss-servlet-api_3.0_spec</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.ws</groupId>
<artifactId>spring-ws-core</artifactId>
</dependency>
<!-- <dependency>-->
<!-- <groupId>ca.uhn.hapi.fhir</groupId>-->
<!-- <artifactId>hapi-fhir-base</artifactId>-->
<!-- </dependency>-->
<!-- <dependency>-->
<!-- <groupId>ca.uhn.hapi.fhir</groupId>-->
<!-- <artifactId>hapi-fhir-client</artifactId>-->
<!-- </dependency>-->
<!-- <dependency>-->
<!-- <groupId>ca.uhn.hapi.fhir</groupId>-->
<!-- <artifactId>hapi-fhir-structures-r4</artifactId>-->
<!-- </dependency>-->
<!-- DCM4CHEE modules (for JAX-b classes and InfoSetUtil) -->
<dependency>
<groupId>org.dcm4che</groupId>
<artifactId>dcm4chee-xds2-infoset</artifactId>
</dependency>
<dependency>
<groupId>org.dcm4che</groupId>
<artifactId>dcm4chee-xds2-common</artifactId>
<exclusions>
<exclusion>
<groupId>org.jboss.spec.javax.servlet</groupId>
<artifactId>jboss-servlet-api_3.0_spec</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.ws</groupId>
<artifactId>spring-ws-core</artifactId>
</dependency>
<dependency>
<groupId>com.squareup.okhttp3</groupId>
<artifactId>okhttp</artifactId>
<version>4.1.0</version>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.13.1</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>de.lars-sh</groupId>
<artifactId>lombok-annotations</artifactId>
<version>1.18.16</version>
</dependency>


<dependency>
<groupId>com.squareup.okhttp3</groupId>
<artifactId>okhttp</artifactId>
<version>4.1.0</version>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.13.1</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>de.lars-sh</groupId>
<artifactId>lombok-annotations</artifactId>
<version>1.18.16</version>
</dependency>
</dependencies>

</dependencies>

<build>
<plugins>
<plugin>
<groupId>org.jvnet.jaxb2.maven2</groupId>
<artifactId>maven-jaxb2-plugin</artifactId>
<version>0.13.3</version>
<executions>
<execution>
<goals>
<goal>generate</goal>
</goals>
</execution>
</executions>
<configuration>
<bindingDirectory>src/main/resources/xjb</bindingDirectory>
<schemaLanguage>WSDL</schemaLanguage>
<generatePackage>org.openmrs.module.xdssender.notificationspullpoint</generatePackage>
<schemas>
<schema>
<url>http://docs.oasis-open.org/wsn/bw-2.wsdl</url>
</schema>
<schema>
<url>https://docs.oasis-open.org/wsn/brw-2.wsdl</url>
</schema>
</schemas>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>8</source>
<target>8</target>
</configuration>
</plugin>
</plugins>
</build>
<build>
<plugins>
<plugin>
<groupId>org.jvnet.jaxb2.maven2</groupId>
<artifactId>maven-jaxb2-plugin</artifactId>
<version>0.13.3</version>
<executions>
<execution>
<goals>
<goal>generate</goal>
</goals>
</execution>
</executions>
<configuration>
<bindingDirectory>src/main/resources/xjb</bindingDirectory>
<schemaLanguage>WSDL</schemaLanguage>
<generatePackage>org.openmrs.module.xdssender.notificationspullpoint</generatePackage>
<schemas>
<schema>
<url>http://docs.oasis-open.org/wsn/bw-2.wsdl</url>
</schema>
<schema>
<url>https://docs.oasis-open.org/wsn/brw-2.wsdl</url>
</schema>
</schemas>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>8</source>
<target>8</target>
</configuration>
</plugin>
</plugins>
</build>

</project>
2 changes: 1 addition & 1 deletion omod/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.openmrs.module</groupId>
<artifactId>xds-sender</artifactId>
<version>2.2.0-SNAPSHOT</version>
<version>${revision}</version>
</parent>

<artifactId>xds-sender-omod</artifactId>
Expand Down
32 changes: 30 additions & 2 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

<groupId>org.openmrs.module</groupId>
<artifactId>xds-sender</artifactId>
<version>2.2.0-SNAPSHOT</version>
<version>${revision}</version>
<packaging>pom</packaging>
<name>XDS Sender</name>
<description>Module for sending XDS.b documents for encounters</description>
Expand All @@ -28,6 +28,7 @@
</modules>

<properties>
<revision>2.2.0</revision>
<openmrsPlatformVersion>2.0.5</openmrsPlatformVersion>
<everestVersion>1.1.0</everestVersion>
<dcm4chee-xds2Version>2.0.6</dcm4chee-xds2Version>
Expand All @@ -39,7 +40,7 @@
<javaCompilerVersion>1.7</javaCompilerVersion>
<springWsVersion>2.4.7.RELEASE</springWsVersion>
<hapiFhirVersion>5.0.2</hapiFhirVersion>
<fhirModuleVersion>1.2.2</fhirModuleVersion>
<fhirModuleVersion>1.3.0</fhirModuleVersion>
<labintegrationVersion>2.1.0-SNAPSHOT</labintegrationVersion>
</properties>

Expand Down Expand Up @@ -183,6 +184,33 @@
</dependencyManagement>

<build>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>flatten-maven-plugin</artifactId>
<version>1.1.0</version>
<configuration>
<updatePomFile>true</updatePomFile>
<flattenMode>resolveCiFriendliesOnly</flattenMode>
</configuration>
<executions>
<execution>
<id>flatten</id>
<phase>process-resources</phase>
<goals>
<goal>flatten</goal>
</goals>
</execution>
<execution>
<id>flatten.clean</id>
<phase>clean</phase>
<goals>
<goal>clean</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
<pluginManagement>
<plugins>
<plugin>
Expand Down

0 comments on commit 0edc4c9

Please sign in to comment.