Skip to content

Commit 843dab1

Browse files
bischoffzbischoffz
authored
Merge pull request #212 from HHS/dev
v4.1.0 release
2 parents 4a8321b + 4ce8052 commit 843dab1

File tree

981 files changed

+10915
-12914
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

981 files changed

+10915
-12914
lines changed

‎.github/workflows/dev_build.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030

3131
- name: Get Util Version
3232
run: |
33-
echo "util_version=v$(mvn help:evaluate -Dexpression=util.version -q -DforceStdout --file gcm/pom.xml)" >> "$GITHUB_ENV"
33+
echo "util_version=v$(mvn help:evaluate -Dexpression=util.version -q -DforceStdout --file pom.xml)" >> "$GITHUB_ENV"
3434
3535
- name: Checkout Util
3636
uses: actions/checkout@v4
@@ -42,7 +42,7 @@ jobs:
4242
- name: Build Util
4343
run: mvn clean install -DskipTests --file util/pom.xml
4444
- name: Build GCM
45-
run: mvn clean install --file gcm/pom.xml
45+
run: mvn clean install --file pom.xml
4646

4747
# Optional: Uploads the full dependency graph to GitHub to improve the quality of Dependabot alerts this repository can receive
4848
# - name: Update dependency graph

‎.github/workflows/release_build.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131

3232
- name: Get Util Version
3333
run: |
34-
echo "util_version=v$(mvn help:evaluate -Dexpression=util.version -q -DforceStdout --file gcm/pom.xml)" >> "$GITHUB_ENV"
34+
echo "util_version=v$(mvn help:evaluate -Dexpression=util.version -q -DforceStdout --file pom.xml)" >> "$GITHUB_ENV"
3535
3636
- name: Checkout Util
3737
uses: actions/checkout@v4
@@ -43,16 +43,16 @@ jobs:
4343
- name: Build Util
4444
run: mvn clean install -DskipTests --file util/pom.xml
4545
- name: Build GCM
46-
run: mvn clean install -Prelease --file gcm/pom.xml
46+
run: mvn clean install -Prelease --file pom.xml
4747

4848
- name: Get Version
4949
run: |
50-
echo "version=$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout --file gcm/pom.xml)" >> "$GITHUB_ENV"
50+
echo "version=$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout --file pom.xml)" >> "$GITHUB_ENV"
5151
5252
- name: Make Release
5353
uses: ncipollo/release-action@v1
5454
with:
55-
artifacts: "gcm/target/gcm-${{ env.version }}*.jar"
55+
artifacts: "simulation/target/gcm-simulation-${{ env.version }}*.jar"
5656
prerelease: ${{ endsWith(env.version, 'SNAPSHOT') || contains(env.version, '-RC') }}
5757
name: "v${{ env.version }}"
5858
tag: "v${{ env.version }}"

‎.github/workflows/release_pr_build.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727

2828
- name: Get Util Version
2929
run: |
30-
echo "util_version=v$(mvn help:evaluate -Dexpression=util.version -q -DforceStdout --file gcm/pom.xml)" >> "$GITHUB_ENV"
30+
echo "util_version=v$(mvn help:evaluate -Dexpression=util.version -q -DforceStdout --file pom.xml)" >> "$GITHUB_ENV"
3131
3232
- name: Checkout Util
3333
uses: actions/checkout@v4
@@ -39,7 +39,7 @@ jobs:
3939
- name: Build Util
4040
run: mvn clean install -DskipTests --file util/pom.xml
4141
- name: Build GCM
42-
run: mvn clean install -Prelease --file gcm/pom.xml
42+
run: mvn clean install -Prelease --file pom.xml
4343

4444
# Optional: Uploads the full dependency graph to GitHub to improve the quality of Dependabot alerts this repository can receive
4545
# - name: Update dependency graph

‎README.md

+14-7
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,19 @@
22
[![GitHub tag (with filter)][tag-shield]][tag-url]
33
[![GitHub contributors][contributors-shield]][contributors-url]
44
[![GitHub Workflow Status (with event)][dev-build-shield]][dev-build-url]
5+
[![GitHub Workflow Status (with event)][release-build-shield]][release-build-url]
56

67

78

89
# General Computational Model
9-
This repository contains the source code for the General Computational Model herein reffered to as GCM, along with a set of tutorials that have been created to aide new users with using this model.
10+
This repository contains the source code for the General Computational Model herein reffered to as GCM, along with a set of lessons that have been created to aide new users with using this model.
1011

1112
## What is GCM?
1213
GCM is a Java based simulation framework for building disease progression models.
1314
Users of GCM should have a general familiarity with Java and object oriented programming and would benefit from some exposure to event based modeling.
1415

1516
## Overview
16-
THere are 3 core tenants to GCM.
17+
There are 3 core tenants to GCM.
1718

1819
### Simulation
1920
GCM is an event based simulation composed of data managers, actors and an event engine.
@@ -40,11 +41,15 @@ The complete set of all combinations (scenarios) of the variant plugin data obje
4041
- Modeling Utilities located [here](https://github.com/HHS/ASPR-ms-util)
4142

4243
## Building
43-
Once you have cloned the repo and imported it into your favorite IDE, navigate into the gcm directory on the command line.
44+
Once you have cloned the repo and imported it into your favorite IDE, navigate into the root directory on the command line.
4445
Once there, run the following command: ```mvn clean install```
4546
That's all there is to building the project.
46-
After running the above command, the next place you should start looking is at the Modeling Guide located in [doc](doc) and following the lessons.
4747

48+
## Documentation
49+
The documentation can be found at [https://hhs.github.io/ASPR-8/](https://hhs.github.io/ASPR-8/)
50+
51+
## Lessons
52+
The documentation contains lessons which the code can be found in [lessons](lessons).
4853

4954
## License
5055
Distributed under the GPLv3 License. See [LICENSE](LICENSE) for more information.
@@ -54,8 +59,10 @@ Distributed under the GPLv3 License. See [LICENSE](LICENSE) for more information
5459
[contributors-shield]: https://img.shields.io/github/contributors/HHS/ASPR-8
5560
[contributors-url]: https://github.com/HHS/ASPR-8/graphs/contributors
5661
[tag-shield]: https://img.shields.io/github/v/tag/HHS/ASPR-8
57-
[tag-url]: https://github.com/HHS/ASPR-8/releases/tag/v4.0.0-RC1
62+
[tag-url]: https://github.com/HHS/ASPR-8/releases/latest
5863
[license-shield]: https://img.shields.io/github/license/HHS/ASPR-8
5964
[license-url]: LICENSE
60-
[dev-build-shield]: https://img.shields.io/github/actions/workflow/status/HHS/ASPR-8/dev-pre-mavencentral.yml?label=dev-build
61-
[dev-build-url]: https://github.com/HHS/ASPR-8/actions/workflows/dev-pre-mavencentral.yml
65+
[dev-build-shield]: https://img.shields.io/github/actions/workflow/status/HHS/ASPR-8/dev_build.yml?label=dev-build
66+
[dev-build-url]: https://github.com/HHS/ASPR-8/actions/workflows/dev_build.yml
67+
[release-build-shield]: https://img.shields.io/github/actions/workflow/status/HHS/ASPR-8/release_build.yml?label=release-build
68+
[release-build-url]: https://github.com/HHS/ASPR-8/actions/workflows/release_build.yml

‎demos/gcm-taskit/pom.xml

+14-81
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,21 @@
1-
<project xmlns="http://maven.apache.org/POM/4.0.0"
2-
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3-
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
1+
<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
2+
xmlns="http://maven.apache.org/POM/4.0.0"
3+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
44

55
<modelVersion>4.0.0</modelVersion>
66

7-
<!-- Organization -->
8-
<organization>
9-
<name>ASPR</name>
10-
<url>https://www.phe.gov</url>
11-
</organization>
7+
<parent>
8+
<groupId>gov.hhs.aspr.ms.gcm.demos</groupId>
9+
<artifactId>parent</artifactId>
10+
<version>${revision}</version>
11+
</parent>
1212

1313
<!-- Artifact -->
14-
<groupId>gov.hhs.aspr.ms.gcm.demos</groupId>
15-
<artifactId>gcm-taskit</artifactId>
16-
<version>${revision}</version>
17-
<packaging>jar</packaging>
18-
<name>serialization demo</name>
14+
<artifactId>gcm-taskit-demo</artifactId>
15+
<name>GCM Serialization Demo</name>
1916
<description>Demonstrate serialization integration with simulation</description>
2017

2118
<properties>
22-
<!-- basic project properties -->
23-
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
24-
<maven.compiler.source>17</maven.compiler.source>
25-
<maven.compiler.target>17</maven.compiler.target>
26-
<revision>${gcm.version}</revision>
27-
2819
<!-- plugin versions -->
2920
<os-maven-plugin.version>1.7.0</os-maven-plugin.version>
3021
<build-helper-maven-plugin.version>3.3.0</build-helper-maven-plugin.version>
@@ -34,34 +25,19 @@
3425
<maven-source-plugin.version>3.2.1</maven-source-plugin.version>
3526

3627
<!-- dependency versions -->
37-
<gcm.version>4.0.0</gcm.version>
38-
<gcm-taskit-protobuf.version>2.4.0-SNAPSHOT</gcm-taskit-protobuf.version>
28+
<gcm-taskit.version>2.6.3-SNAPSHOT</gcm-taskit.version>
3929
<protoc.version>3.21.12</protoc.version>
4030
</properties>
4131

4232
<!-- Dependencies -->
4333
<dependencies>
4434
<dependency>
45-
<groupId>gov.hhs.aspr.ms</groupId>
46-
<artifactId>gcm</artifactId>
47-
<version>${gcm.version}</version>
48-
</dependency>
49-
<dependency>
50-
<groupId>gov.hhs.aspr.ms.gcm.taskit.protobuf</groupId>
51-
<artifactId>gcm-taskit-protobuf</artifactId>
52-
<version>${gcm-taskit-protobuf.version}</version>
35+
<groupId>gov.hhs.aspr.ms.gcm.taskit</groupId>
36+
<artifactId>protobuf</artifactId>
37+
<version>${gcm-taskit.version}</version>
5338
</dependency>
5439
</dependencies>
5540

56-
<!-- Developers -->
57-
<developers>
58-
<developer>
59-
<name>Shawn Hatch</name>
60-
<organization>Leidos</organization>
61-
<organizationUrl>https://www.leidos.com</organizationUrl>
62-
</developer>
63-
</developers>
64-
6541
<!-- Configure Build -->
6642
<build>
6743
<plugins>
@@ -98,34 +74,6 @@
9874
</executions>
9975
</plugin>
10076

101-
<!-- used with the ${revision} for versioning, creates a pom that has the version replaced with the value of ${revision} -->
102-
<plugin>
103-
<groupId>org.codehaus.mojo</groupId>
104-
<artifactId>flatten-maven-plugin</artifactId>
105-
<version>${flatten-maven-plugin.version}</version>
106-
<executions>
107-
<!-- enable flattening -->
108-
<execution>
109-
<id>flatten</id>
110-
<phase>process-resources</phase>
111-
<goals>
112-
<goal>flatten</goal>
113-
</goals>
114-
<configuration>
115-
<updatePomFile>true</updatePomFile>
116-
</configuration>
117-
</execution>
118-
<!-- ensure proper cleanup -->
119-
<execution>
120-
<id>flatten.clean</id>
121-
<phase>clean</phase>
122-
<goals>
123-
<goal>clean</goal>
124-
</goals>
125-
</execution>
126-
</executions>
127-
</plugin>
128-
12977
<plugin>
13078
<groupId>org.xolstice.maven.plugins</groupId>
13179
<artifactId>protobuf-maven-plugin</artifactId>
@@ -173,21 +121,6 @@
173121
</configuration>
174122
</plugin>
175123

176-
<plugin>
177-
<groupId>org.apache.maven.plugins</groupId>
178-
<artifactId>maven-source-plugin</artifactId>
179-
<version>${maven-source-plugin.version}</version>
180-
<executions>
181-
<execution>
182-
<id>attach-sources</id>
183-
<phase>verify</phase>
184-
<goals>
185-
<goal>jar-no-fork</goal>
186-
</goals>
187-
</execution>
188-
</executions>
189-
</plugin>
190124
</plugins>
191125
</build>
192-
193126
</project>

0 commit comments

Comments
 (0)