Skip to content

Commit

Permalink
Merge pull request #1365 from CMSgov/release/v2023.1.0
Browse files Browse the repository at this point in the history 
Release/v2023.1.0
  • Loading branch information
@saquino0827
saquino0827 committed Sep 11, 2023
2 parents be99bee + 8a4c40b commit 0407cae
Show file tree
Hide file tree
Showing 22 changed files with 104 additions and 92 deletions.
8 changes: 4 additions & 4 deletions acceptance-tests/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>
<artifactId>acceptance-tests</artifactId>
<groupId>gov.cms.qpp.conversion</groupId>
<version>2022.2.1-RELEASE</version>
<version>2022.3.0-RELEASE</version>
<name>conversion-tests</name>
<packaging>jar</packaging>
<properties>
Expand Down Expand Up @@ -43,7 +43,7 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-web</artifactId>
<version>5.2.22.RELEASE</version>
<version>5.3.26</version>
</dependency>

<dependency>
Expand Down Expand Up @@ -92,12 +92,12 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>3.0.0-M3</version>
<version>3.0.0</version>
<dependencies>
<dependency>
<groupId>org.apache.maven.surefire</groupId>
<artifactId>surefire-junit47</artifactId>
<version>3.0.0-M3</version>
<version>3.0.0</version>
</dependency>
</dependencies>
</plugin>
Expand Down
2 changes: 1 addition & 1 deletion commandline/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>gov.cms.qpp.conversion</groupId>
<artifactId>qpp-conversion-tool-parent</artifactId>
<version>2022.2.1-RELEASE</version>
<version>2022.3.0-RELEASE</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion commons/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>gov.cms.qpp.conversion</groupId>
<artifactId>qpp-conversion-tool-parent</artifactId>
<version>2022.2.1-RELEASE</version>
<version>2022.3.0-RELEASE</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
4 changes: 2 additions & 2 deletions converter/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>gov.cms.qpp.conversion</groupId>
<artifactId>qpp-conversion-tool-parent</artifactId>
<version>2022.2.1-RELEASE</version>
<version>2022.3.0-RELEASE</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down Expand Up @@ -169,7 +169,7 @@
<dependency>
<groupId>gov.cms.qpp.conversion</groupId>
<artifactId>commons</artifactId>
<version>2022.2.1-RELEASE</version>
<version>2022.3.0-RELEASE</version>
<scope>compile</scope>
</dependency>

Expand Down
3 changes: 1 addition & 2 deletions converter/src/main/java/gov/cms/qpp/conversion/model/validation/ApmEntityIds.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,7 @@ public class ApmEntityIds {

private Set<String> validPcfApmEntityIds;

public ApmEntityIds(InputStream cpcPlusFileStream, InputStream pcfFilestream) {
validCpcPlusApmEntityIds = JsonHelper.readJson(cpcPlusFileStream, SET_OF_STRINGS_TYPE);
public ApmEntityIds(InputStream pcfFilestream) {
validPcfApmEntityIds = JsonHelper.readJson(pcfFilestream, SET_OF_STRINGS_TYPE);
}

Expand Down
2 changes: 1 addition & 1 deletion generate-race-cpcplus/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>qpp-conversion-tool-parent</artifactId>
<groupId>gov.cms.qpp.conversion</groupId>
<version>2022.2.1-RELEASE</version>
<version>2022.3.0-RELEASE</version>
<relativePath>../</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Expand Down
4 changes: 2 additions & 2 deletions generate/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>qpp-conversion-tool-parent</artifactId>
<groupId>gov.cms.qpp.conversion</groupId>
<version>2022.2.1-RELEASE</version>
<version>2022.3.0-RELEASE</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Expand Down Expand Up @@ -61,7 +61,7 @@
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-core</artifactId>
<version>3.6.2</version>
<version>3.8.1</version>
<exclusions>
<exclusion>
<groupId>org.apache.maven.shared</groupId>
Expand Down
32 changes: 18 additions & 14 deletions infrastructure/terraform/dev/.terraform.lock.hcl
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions infrastructure/terraform/dev/main.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@ terraform {
required_providers {
aws = {
source = "hashicorp/aws"
version = "=3.70.0"
version = "4.55.0"
}
}
required_version = "1.0.0"
required_version = "1.5.0"
}

provider "aws" {
Expand Down
32 changes: 18 additions & 14 deletions infrastructure/terraform/devpre/.terraform.lock.hcl
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions infrastructure/terraform/devpre/main.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@ terraform {
required_providers {
aws = {
source = "hashicorp/aws"
version = "=3.70.0"
version = "4.55.0"
}
}
required_version = "1.0.0"
required_version = "1.5.0"
}

provider "aws" {
Expand Down
32 changes: 18 additions & 14 deletions infrastructure/terraform/impl/.terraform.lock.hcl
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions infrastructure/terraform/impl/main.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@ terraform {
required_providers {
aws = {
source = "hashicorp/aws"
version = "=3.70.0"
version = "4.55.0"
}
}
required_version = "1.0.0"
required_version = "1.5.0"
}

provider "aws" {
Expand Down
32 changes: 18 additions & 14 deletions infrastructure/terraform/prod/.terraform.lock.hcl
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions infrastructure/terraform/prod/main.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@ terraform {
required_providers {
aws = {
source = "hashicorp/aws"
version = "=3.70.0"
version = "4.55.0"
}
}
required_version = "1.0.0"
required_version = "1.5.0"
}

provider "aws" {
Expand Down
10 changes: 5 additions & 5 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<groupId>gov.cms.qpp.conversion</groupId>
<artifactId>qpp-conversion-tool-parent</artifactId>
<packaging>pom</packaging>
<version>2022.2.1-RELEASE</version>
<version>2022.3.0-RELEASE</version>
<name>QPP Conversion Tool</name>

<properties>
Expand Down Expand Up @@ -138,7 +138,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>3.0.0-M4</version>
<version>3.0.0</version>
<configuration>
<useSystemClassLoader>false</useSystemClassLoader>
<trimStackTrace>false</trimStackTrace>
Expand Down Expand Up @@ -213,7 +213,7 @@
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>2.13.4</version>
<version>2.13.4.2</version>
</dependency>

<dependency>
Expand All @@ -225,13 +225,13 @@
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>30.0-jre</version>
<version>32.1.1-jre</version>
</dependency>

<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava-testlib</artifactId>
<version>30.1.1-jre</version>
<version>32.1.1-jre</version>
</dependency>

<dependency>
Expand Down
2 changes: 1 addition & 1 deletion qpp-data-restoration/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

<groupId>gov.cms.qpp.conversion</groupId>
<artifactId>qpp-data-restoration</artifactId>
<version>2022.2.1-RELEASE</version>
<version>2022.3.0-RELEASE</version>
<packaging>jar</packaging>

<name>qpp-data-restoration</name>
Expand Down
2 changes: 1 addition & 1 deletion qrda3-update-measures/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<artifactId>qpp-conversion-tool-parent</artifactId>
<groupId>gov.cms.qpp.conversion</groupId>
<version>2022.2.1-RELEASE</version>
<version>2022.3.0-RELEASE</version>
<relativePath>../</relativePath>
</parent>

Expand Down
4 changes: 2 additions & 2 deletions rest-api/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>gov.cms.qpp.conversion</groupId>
<artifactId>qpp-conversion-tool-parent</artifactId>
<version>2022.2.1-RELEASE</version>
<version>2022.3.0-RELEASE</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down Expand Up @@ -160,7 +160,7 @@
<dependency>
<groupId>org.yaml</groupId>
<artifactId>snakeyaml</artifactId>
<version>1.32</version>
<version>2.0</version>
</dependency>

<dependency>
Expand Down
Loading

0 comments on commit 0407cae

Please sign in to comment.