This commit is contained in:
markiantorno 2020-06-03 13:33:12 -04:00
parent 38e2afbf25
commit 7a63c0b353
6 changed files with 40 additions and 20 deletions

View File

@ -7,6 +7,24 @@ trigger:
pr: none pr: none
strategy:
matrix:
# dstu2:
# module: "org.hl7.fhir.dstu2"
# dstu3:
# module: "org.hl7.fhir.dstu3"
# dstu2016may:
# module: "org.hl7.fhir.dstu2016may"
# r4:
# module: "org.hl7.fhir.r4"
r5:
module: "org.hl7.fhir.r5"
# validator:
# module: "org.hl7.fhir.validation"
# validator_cli:
# module: "org.hl7.fhir.validation.cli"
maxParallel: 3
pool: pool:
vmImage: "ubuntu-16.04" vmImage: "ubuntu-16.04"
@ -14,6 +32,9 @@ variables:
currentModule: $(module) currentModule: $(module)
steps: steps:
# Debugging output to identify current module.
- bash: echo Publishing SNAPSHOT for $(module)
displayName: 'Print module name.'
# Signing, for now, occurs for all builds, SNAPSHOT or release. So we need a valid # Signing, for now, occurs for all builds, SNAPSHOT or release. So we need a valid
# signing key. The next two steps download the public and private keys from the # signing key. The next two steps download the public and private keys from the
@ -83,9 +104,9 @@ steps:
# Deploy the SNAPSHOT artifact to sonatype nexus. # Deploy the SNAPSHOT artifact to sonatype nexus.
# This is done for the master branch merges only. # This is done for the master branch merges only.
- task: Maven@3 - task: Maven@3
displayName: 'Deploying SNAPSHOTS to Sonatype staging' displayName: 'Deploy $(module) to Sonatype staging'
inputs: inputs:
mavenPomFile: '$(System.DefaultWorkingDirectory)/pom.xml' mavenPomFile: '$(System.DefaultWorkingDirectory)/$(module)/pom.xml'
goals: clean deploy goals: clean deploy
options: '--settings $(System.DefaultWorkingDirectory)/settings.xml -X' options: '--settings $(System.DefaultWorkingDirectory)/settings.xml -X'
publishJUnitResults: false publishJUnitResults: false

View File

@ -13,12 +13,13 @@
<packaging>bundle</packaging> <packaging>bundle</packaging>
<dependencies> <dependencies>
<!-- HAPI Dependencies --> <!-- HAPI Dependencies -->
<dependency> <dependency>
<groupId>ca.uhn.hapi.fhir</groupId> <groupId>ca.uhn.hapi.fhir</groupId>
<artifactId>org.hl7.fhir.utilities</artifactId> <artifactId>org.hl7.fhir.utilities</artifactId>
<version>${project.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>ca.uhn.hapi.fhir</groupId> <groupId>ca.uhn.hapi.fhir</groupId>
<artifactId>hapi-fhir-base</artifactId> <artifactId>hapi-fhir-base</artifactId>

View File

@ -12,7 +12,6 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<artifactId>org.hl7.fhir.report</artifactId> <artifactId>org.hl7.fhir.report</artifactId>
<packaging>bundle</packaging> <packaging>bundle</packaging>
<properties> <properties>

View File

@ -13,7 +13,6 @@
<packaging>bundle</packaging> <packaging>bundle</packaging>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>ca.uhn.hapi.fhir</groupId> <groupId>ca.uhn.hapi.fhir</groupId>
<artifactId>hapi-fhir-base</artifactId> <artifactId>hapi-fhir-base</artifactId>

View File

@ -23,6 +23,7 @@
<groupId>ca.uhn.hapi.fhir</groupId> <groupId>ca.uhn.hapi.fhir</groupId>
<artifactId>hapi-fhir-base</artifactId> <artifactId>hapi-fhir-base</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>ca.uhn.hapi.fhir</groupId> <groupId>ca.uhn.hapi.fhir</groupId>
<artifactId>org.hl7.fhir.utilities</artifactId> <artifactId>org.hl7.fhir.utilities</artifactId>

29
pom.xml
View File

@ -33,6 +33,20 @@
<url>http://hl7.org</url> <url>http://hl7.org</url>
</organization> </organization>
<modules>
<module>org.hl7.fhir.utilities</module>
<module>org.hl7.fhir.dstu2</module>
<module>org.hl7.fhir.dstu2016may</module>
<module>org.hl7.fhir.dstu3</module>
<module>org.hl7.fhir.r4</module>
<module>org.hl7.fhir.r5</module>
<module>org.hl7.fhir.convertors</module>
<module>org.hl7.fhir.validation</module>
<module>org.hl7.fhir.validation.cli</module>
<!-- The report project exists only to aggregate the test results from the other projects into a central report. -->
<module>org.hl7.fhir.report</module>
</modules>
<repositories> <repositories>
<repository> <repository>
<snapshots> <snapshots>
@ -122,21 +136,6 @@
</dependencies> </dependencies>
</dependencyManagement> </dependencyManagement>
<modules>
<module>org.hl7.fhir.utilities</module>
<module>org.hl7.fhir.dstu2</module>
<module>org.hl7.fhir.dstu2016may</module>
<module>org.hl7.fhir.dstu3</module>
<module>org.hl7.fhir.r4</module>
<module>org.hl7.fhir.r5</module>
<module>org.hl7.fhir.convertors</module>
<module>org.hl7.fhir.validation</module>
<module>org.hl7.fhir.validation.cli</module>
<!-- The report project exists only to aggregate the test results from the other projects into a central report. -->
<module>org.hl7.fhir.report</module>
</modules>
<build> <build>
<plugins> <plugins>
<plugin> <plugin>