Skip to content

Commit

Permalink
Fix build script to force update Compiled.xml
Browse files Browse the repository at this point in the history
  • Loading branch information
@HossamT
HossamT committed Jan 10, 2023
1 parent e9ca9e0 commit 909f06a
Show file tree
Hide file tree
Showing 24 changed files with 51 additions and 42 deletions.
2 changes: 1 addition & 1 deletion crypto-helper/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>gov.nist.healthcare.iz</groupId>
<artifactId>darq</artifactId>
<version>2.1.0-SNAPSHOT.rev2</version>
<version>2.1.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>crypto-helper</artifactId>
Expand Down
4 changes: 2 additions & 2 deletions darq-aart-client/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,15 @@
<parent>
<groupId>gov.nist.healthcare.iz</groupId>
<artifactId>darq</artifactId>
<version>2.1.0-SNAPSHOT.rev2</version>
<version>2.1.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>darq-aart-client</artifactId>
<version>1.1.1</version>
<properties>
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
<qdar.webtool.version>3.1.0-SNAPSHOT.rev2</qdar.webtool.version>
<qdar.webtool.version>3.1.0</qdar.webtool.version>
</properties>
<dependencies>
<dependency>
Expand Down
4 changes: 2 additions & 2 deletions darq-adf-merge-cli/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@
<parent>
<artifactId>darq</artifactId>
<groupId>gov.nist.healthcare.iz</groupId>
<version>2.1.0-SNAPSHOT.rev2</version>
<version>2.1.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<properties>
<timestamp>${maven.build.timestamp}</timestamp>
<maven.build.timestamp.format>MM-dd-yyyy</maven.build.timestamp.format>
<qdar.api.version>2.1.0-SNAPSHOT.rev2</qdar.api.version>
<qdar.api.version>2.1.0</qdar.api.version>
<mqe.version>2022.9-BETA</mqe.version>
</properties>
<artifactId>darq-adf-merge-cli</artifactId>
Expand Down
4 changes: 2 additions & 2 deletions darq-analyzer/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@
<parent>
<groupId>gov.nist.healthcare.iz</groupId>
<artifactId>darq</artifactId>
<version>2.1.0-SNAPSHOT.rev2</version>
<version>2.1.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>darq-analyzer</artifactId>
<properties>
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
<qdar.api.version>2.1.0-SNAPSHOT.rev2</qdar.api.version>
<qdar.api.version>2.1.0</qdar.api.version>
</properties>
<dependencies>
<dependency>
Expand Down
2 changes: 1 addition & 1 deletion darq-common/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>gov.nist.healthcare.iz</groupId>
<artifactId>darq</artifactId>
<version>2.1.0-SNAPSHOT.rev2</version>
<version>2.1.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>darq-common</artifactId>
Expand Down
4 changes: 2 additions & 2 deletions darq-extract-process/darq-adf-utils/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@
<parent>
<groupId>gov.nist.healthcare.iz</groupId>
<artifactId>darq-extract-process</artifactId>
<version>2.1.0-SNAPSHOT.rev2</version>
<version>2.1.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>darq-adf-utils</artifactId>
<properties>
<qdar.api.version>2.1.0-SNAPSHOT.rev2</qdar.api.version>
<qdar.api.version>2.1.0</qdar.api.version>
</properties>
<dependencies>
<dependency>
Expand Down
6 changes: 3 additions & 3 deletions darq-extract-process/darq-cli-app/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,17 @@
<parent>
<groupId>gov.nist.healthcare.iz</groupId>
<artifactId>darq-extract-process</artifactId>
<version>2.1.0-SNAPSHOT.rev2</version>
<version>2.1.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<properties>
<timestamp>${maven.build.timestamp}</timestamp>
<maven.build.timestamp.format>MM-dd-yyyy</maven.build.timestamp.format>
<qdar.api.version>2.1.0-SNAPSHOT.rev2</qdar.api.version>
<qdar.api.version>2.1.0</qdar.api.version>
<mqe.version>2022.9-BETA</mqe.version>
</properties>
<artifactId>darq-cli-app</artifactId>
<version>2.1.0-SNAPSHOT.rev2</version>
<version>2.1.0</version>
<dependencies>
<dependency>
<groupId>gov.nist.healthcare.iz</groupId>
Expand Down
2 changes: 1 addition & 1 deletion darq-extract-process/darq-digest-model/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>gov.nist.healthcare.iz</groupId>
<artifactId>darq-extract-process</artifactId>
<version>2.1.0-SNAPSHOT.rev2</version>
<version>2.1.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>darq-digest-model</artifactId>
Expand Down
4 changes: 2 additions & 2 deletions darq-extract-process/darq-digest-service/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@
<parent>
<groupId>gov.nist.healthcare.iz</groupId>
<artifactId>darq-extract-process</artifactId>
<version>2.1.0-SNAPSHOT.rev2</version>
<version>2.1.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>darq-digest-service</artifactId>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<qdar.api.version>2.1.0-SNAPSHOT.rev2</qdar.api.version>
<qdar.api.version>2.1.0</qdar.api.version>
</properties>
<dependencies>
<dependency>
Expand Down
2 changes: 1 addition & 1 deletion darq-extract-process/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>gov.nist.healthcare.iz</groupId>
<artifactId>darq</artifactId>
<version>2.1.0-SNAPSHOT.rev2</version>
<version>2.1.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>darq-extract-process</artifactId>
Expand Down
4 changes: 2 additions & 2 deletions darq-shared/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,14 @@
<parent>
<artifactId>darq</artifactId>
<groupId>gov.nist.healthcare.iz</groupId>
<version>2.1.0-SNAPSHOT.rev2</version>
<version>2.1.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>darq-shared</artifactId>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<mqe.version>2022.9-BETA</mqe.version>
<qdar.api.version>2.1.0-SNAPSHOT.rev2</qdar.api.version>
<qdar.api.version>2.1.0</qdar.api.version>
</properties>
<dependencies>
<dependency>
Expand Down
4 changes: 2 additions & 2 deletions darq-webapp/darq-app/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@
<parent>
<groupId>gov.nist.healthcare.iz</groupId>
<artifactId>darq-webapp</artifactId>
<version>3.1.0-SNAPSHOT.rev2</version>
<version>3.1.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<packaging>war</packaging>
<artifactId>darq-app</artifactId>
<properties>
<qdar.webtool.version>3.1.0-SNAPSHOT.rev2</qdar.webtool.version>
<qdar.webtool.version>3.1.0</qdar.webtool.version>
<mqe.version>2022.9-BETA</mqe.version>
<timestamp>${maven.build.timestamp}</timestamp>
<maven.build.timestamp.format>MM-dd-yyyy</maven.build.timestamp.format>
Expand Down
2 changes: 1 addition & 1 deletion darq-webapp/darq-configuration/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<groupId>gov.nist.healthcare.iz</groupId>
<artifactId>darq-webapp</artifactId>
<version>3.1.0-SNAPSHOT.rev2</version>
<version>3.1.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>darq-configuration</artifactId>
Expand Down
4 changes: 2 additions & 2 deletions darq-webapp/darq-controller/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@
<parent>
<groupId>gov.nist.healthcare.iz</groupId>
<artifactId>darq-webapp</artifactId>
<version>3.1.0-SNAPSHOT.rev2</version>
<version>3.1.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>darq-controller</artifactId>
<properties>
<qdar.webtool.version>3.1.0-SNAPSHOT.rev2</qdar.webtool.version>
<qdar.webtool.version>3.1.0</qdar.webtool.version>
</properties>
<dependencies>
<dependency>
Expand Down
4 changes: 2 additions & 2 deletions darq-webapp/darq-domain-repository/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@
<parent>
<groupId>gov.nist.healthcare.iz</groupId>
<artifactId>darq-webapp</artifactId>
<version>3.1.0-SNAPSHOT.rev2</version>
<version>3.1.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>darq-domain-repository</artifactId>
<properties>
<qdar.api.version>2.1.0-SNAPSHOT.rev2</qdar.api.version>
<qdar.api.version>2.1.0</qdar.api.version>
</properties>
<dependencies>
<dependency>
Expand Down
6 changes: 3 additions & 3 deletions darq-webapp/darq-service/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@
<parent>
<groupId>gov.nist.healthcare.iz</groupId>
<artifactId>darq-webapp</artifactId>
<version>3.1.0-SNAPSHOT.rev2</version>
<version>3.1.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>darq-service</artifactId>
<properties>
<qdar.webtool.version>3.1.0-SNAPSHOT.rev2</qdar.webtool.version>
<qdar.api.version>2.1.0-SNAPSHOT.rev2</qdar.api.version>
<qdar.webtool.version>3.1.0</qdar.webtool.version>
<qdar.api.version>2.1.0</qdar.api.version>
<mqe.version>2022.9-BETA</mqe.version>
</properties>
<dependencies>
Expand Down
6 changes: 3 additions & 3 deletions darq-webapp/darq-users/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@
<parent>
<groupId>gov.nist.healthcare.iz</groupId>
<artifactId>darq-webapp</artifactId>
<version>3.1.0-SNAPSHOT.rev2</version>
<version>3.1.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>darq-users</artifactId>
<properties>
<qdar.webtool.version>3.1.0-SNAPSHOT.rev2</qdar.webtool.version>
<qdar.api.version>2.1.0-SNAPSHOT.rev2</qdar.api.version>
<qdar.webtool.version>3.1.0</qdar.webtool.version>
<qdar.api.version>2.1.0</qdar.api.version>
</properties>
<dependencies>
<dependency>
Expand Down
6 changes: 3 additions & 3 deletions darq-webapp/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@
<parent>
<groupId>gov.nist.healthcare.iz</groupId>
<artifactId>darq</artifactId>
<version>2.1.0-SNAPSHOT.rev2</version>
<version>2.1.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>darq-webapp</artifactId>
<version>3.1.0-SNAPSHOT.rev2</version>
<version>3.1.0</version>
<packaging>pom</packaging>
<properties>
<qdar.api.version>2.1.0-SNAPSHOT.rev2</qdar.api.version>
<qdar.api.version>2.1.0</qdar.api.version>
</properties>
<modules>
<module>darq-configuration</module>
Expand Down
4 changes: 2 additions & 2 deletions fake-record-generator/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,15 @@
<parent>
<groupId>gov.nist.healthcare.iz</groupId>
<artifactId>darq</artifactId>
<version>2.1.0-SNAPSHOT.rev2</version>
<version>2.1.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>fake-record-generator</artifactId>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
<qdar.api.version>2.1.0-SNAPSHOT.rev2</qdar.api.version>
<qdar.api.version>2.1.0</qdar.api.version>
</properties>
<dependencies>
<dependency>
Expand Down
2 changes: 1 addition & 1 deletion file-parser/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<groupId>gov.nist.healthcare.iz</groupId>
<artifactId>darq</artifactId>
<version>2.1.0-SNAPSHOT.rev2</version>
<version>2.1.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>file-parser</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion lucene-index/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>gov.nist.healthcare.iz</groupId>
<artifactId>darq</artifactId>
<version>2.1.0-SNAPSHOT.rev2</version>
<version>2.1.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>lucene-index</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>gov.nist.healthcare.iz</groupId>
<artifactId>darq</artifactId>
<version>2.1.0-SNAPSHOT.rev2</version>
<version>2.1.0</version>
<packaging>pom</packaging>
<properties>
<maven.compiler.source>1.8</maven.compiler.source>
Expand Down
9 changes: 9 additions & 0 deletions qdar-build.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,14 +59,23 @@ echo "- Moving into CLI"
cp $MQE_VALIDATOR/src/test/resources/Compiled.xml $QDAR/darq-extract-process/darq-cli-app/src/main/resources/Compiled.xml
echo "- Moving into WebApp"
cp $MQE_VALIDATOR/src/test/resources/Compiled.xml $QDAR/darq-webapp/darq-app/src/main/resources/Compiled.xml
echo "- Moving into output directory"
mkdir $OUTPUT/resources
mkdir $OUTPUT/resources/WEB-INF
mkdir $OUTPUT/resources/WEB-INF/classes
cp $MQE_VALIDATOR/src/test/resources/Compiled.xml $OUTPUT/resources/WEB-INF/classes/Compiled.xml
echo "Building qDAR Modules"
cd $QDAR
mvn clean install -DskipTests
echo "Update the Compiled.xml file in darq-cli-app-*-with-dependencies.jar"
jar -uvf $QDAR/darq-extract-process/darq-cli-app/target/darq-cli-app-*-with-dependencies.jar -C $OUTPUT/resources/WEB-INF/classes Compiled.xml
echo "Moving CLI into qDAR Webapp Resource"
cp $QDAR/darq-extract-process/darq-cli-app/target/darq-cli-app-*-with-dependencies.jar $QDAR/darq-webapp/darq-app/src/main/resources/qdar-cli.jar
echo "Building qDAR WAR"
cd $QDAR/darq-webapp/darq-app
mvn clean install -DskipTests
echo "Update the Compiled.xml file in qdar.war"
jar -uvf $QDAR/darq-webapp/darq-app/target/qdar.war -C $OUTPUT/resources WEB-INF/classes/Compiled.xml
echo "Moving Built artifacts into output directory"
cp $QDAR/darq-extract-process/darq-cli-app/target/darq-cli-app-*-with-dependencies.jar $OUTPUT/qdar-cli-nokey.jar
cp $QDAR/darq-webapp/darq-app/target/qdar.war $OUTPUT/qdar.war
Expand Down
4 changes: 2 additions & 2 deletions spring-auth/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@
<parent>
<groupId>gov.nist.healthcare.iz</groupId>
<artifactId>darq</artifactId>
<version>2.1.0-SNAPSHOT.rev2</version>
<version>2.1.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>spring-auth</artifactId>
<properties>
<qdar.api.version>2.1.0-SNAPSHOT.rev2</qdar.api.version>
<qdar.api.version>2.1.0</qdar.api.version>
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
</properties>
Expand Down

0 comments on commit 909f06a

Please sign in to comment.