Merge pull request #1614 from IBM/fix-442

Signed-off-by: Lee Surprenant <lmsurpre@us.ibm.com>
LinuxForHealth · Oct 22, 2020 · 3a0f6d3 · 3a0f6d3
2 parents 971490c + d1d7086
commit 3a0f6d3
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 41 deletions.
diff --git a/build/release/build.sh b/build/release/build.sh
@@ -70,7 +70,7 @@ function build_all {
     PROFILES=$(IFS=, ; echo "${PROFILES_ARR[*]}")
     # To add a profile to the validation zip, append to the string.
     # fhir-ig-davinci-hrex,fhir-ig-davinci-pdex are temporarily not included.
-    _mvn 'fhir-parent' "-Pdeploy-bintray,fhir-javadocs,fhir-validation-distribution,fhir-ig-carin-bb,fhir-ig-davinci-formulary,fhir-ig-davinci-pdex-plan-net,fhir-ig-mcode,fhir-ig-us-core,fhir-term,${PROFILES}"
+    _mvn 'fhir-parent' "-Pdeploy-bintray,fhir-javadocs,fhir-validation-distribution,fhir-ig-carin-bb,fhir-ig-davinci-pdex-formulary,fhir-ig-davinci-pdex-plan-net,fhir-ig-mcode,fhir-ig-us-core,fhir-term,${PROFILES}"
 }
 
 ###############################################################################

diff --git a/fhir-validation/pom.xml b/fhir-validation/pom.xml
@@ -220,43 +220,6 @@
                 </plugins>
             </build>
         </profile>
-        <profile>
-            <id>fhir-ig-davinci-pdex-formulary</id>
-            <activation>
-                <activeByDefault>false</activeByDefault>
-            </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-dependency-plugin</artifactId>
-                        <version>3.1.1</version>
-                        <executions>
-                            <execution>
-                                <id>copy-fhir-ig-davinci-pdex-formulary</id>
-                                <phase>package</phase>
-                                <goals>
-                                    <goal>copy</goal>
-                                </goals>
-                                <configuration>
-                                    <artifactItems>
-                                        <artifactItem>
-                                            <groupId>${project.groupId}</groupId>
-                                            <artifactId>fhir-ig-davinci-pdex-formulary</artifactId>
-                                            <version>${project.version}</version>
-                                            <overWrite>false</overWrite>
-                                        </artifactItem>
-                                    </artifactItems>
-                                    <overWriteReleases>false</overWriteReleases>
-                                    <overWriteSnapshots>true</overWriteSnapshots>
-                                    <outputDirectory>${project.build.directory}/jars</outputDirectory>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
         <profile>
             <id>fhir-ig-davinci-pdex-plan-net</id>
             <activation>
@@ -295,7 +258,7 @@
             </build>
         </profile>
         <profile>
-            <id>fhir-ig-davinci-formulary</id>
+            <id>fhir-ig-davinci-pdex-formulary</id>
             <activation>
                 <activeByDefault>false</activeByDefault>
             </activation>
@@ -307,7 +270,7 @@
                         <version>3.1.1</version>
                         <executions>
                             <execution>
-                                <id>copy-fhir-ig-davinci-formulary</id>
+                                <id>copy-fhir-ig-davinci-pdex-formulary</id>
                                 <phase>package</phase>
                                 <goals>
                                     <goal>copy</goal>
@@ -316,7 +279,7 @@
                                     <artifactItems>
                                         <artifactItem>
                                             <groupId>${project.groupId}</groupId>
-                                            <artifactId>fhir-ig-davinci-formulary</artifactId>
+                                            <artifactId>fhir-ig-davinci-pdex-formulary</artifactId>
                                             <version>${project.version}</version>
                                             <overWrite>false</overWrite>
                                         </artifactItem>