Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
vaidikcode committed Oct 24, 2024
2 parents 8140b31 + fc62273 commit 6a9f78e
Show file tree
Hide file tree
Showing 977 changed files with 50,434 additions and 42,007 deletions.
4 changes: 2 additions & 2 deletions examples/examples-release-17/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@
<dependency>
<groupId>org.wiremock</groupId>
<artifactId>wiremock</artifactId>
<version>3.9.1</version>
<version>3.9.2</version>
<scope>test</scope>
</dependency>
<!--for
Expand Down Expand Up @@ -118,7 +118,7 @@
</plugins>
</build>
<properties>
<junit-jupiter.version>5.11.2</junit-jupiter.version>
<junit-jupiter.version>5.11.3</junit-jupiter.version>
<spring.boot.version>3.3.4</spring.boot.version>
</properties>
</project>
4 changes: 2 additions & 2 deletions examples/examples-release-18/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@
<dependency>
<groupId>org.wiremock</groupId>
<artifactId>wiremock</artifactId>
<version>3.9.1</version>
<version>3.9.2</version>
<scope>test</scope>
</dependency>
<!--for
Expand Down Expand Up @@ -119,7 +119,7 @@
</plugins>
</build>
<properties>
<junit-jupiter.version>5.11.2</junit-jupiter.version>
<junit-jupiter.version>5.11.3</junit-jupiter.version>
<spring.boot.version>3.3.4</spring.boot.version>
</properties>
</project>
6 changes: 3 additions & 3 deletions examples/examples-release-19/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@
<dependency>
<groupId>org.wiremock</groupId>
<artifactId>wiremock</artifactId>
<version>3.9.1</version>
<version>3.9.2</version>
<scope>test</scope>
</dependency>
<!--for
Expand All @@ -93,7 +93,7 @@
<dependency>
<groupId>com.amazonaws</groupId>
<artifactId>aws-java-sdk-sts</artifactId>
<version>1.12.774</version>
<version>1.12.777</version>
</dependency>

</dependencies>
Expand Down Expand Up @@ -123,7 +123,7 @@
</plugins>
</build>
<properties>
<junit-jupiter.version>5.11.2</junit-jupiter.version>
<junit-jupiter.version>5.11.3</junit-jupiter.version>
<spring.boot.version>3.3.4</spring.boot.version>
</properties>
</project>
6 changes: 3 additions & 3 deletions examples/examples-release-20/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@
<dependency>
<groupId>org.wiremock</groupId>
<artifactId>wiremock</artifactId>
<version>3.9.1</version>
<version>3.9.2</version>
<scope>test</scope>
</dependency>
<!--for
Expand All @@ -93,7 +93,7 @@
<dependency>
<groupId>com.amazonaws</groupId>
<artifactId>aws-java-sdk-sts</artifactId>
<version>1.12.774</version>
<version>1.12.777</version>
</dependency>

</dependencies>
Expand Down Expand Up @@ -123,7 +123,7 @@
</plugins>
</build>
<properties>
<junit-jupiter.version>5.11.2</junit-jupiter.version>
<junit-jupiter.version>5.11.3</junit-jupiter.version>
<spring.boot.version>3.3.4</spring.boot.version>
</properties>
</project>

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ public V1ContainerStatusBuilder(V1ContainerStatus instance) {
public V1ContainerStatus build() {
V1ContainerStatus buildable = new V1ContainerStatus();
buildable.setAllocatedResources(fluent.getAllocatedResources());
buildable.setAllocatedResourcesStatus(fluent.buildAllocatedResourcesStatus());
buildable.setContainerID(fluent.getContainerID());
buildable.setImage(fluent.getImage());
buildable.setImageID(fluent.getImageID());
Expand All @@ -34,6 +35,7 @@ public V1ContainerStatus build() {
buildable.setRestartCount(fluent.getRestartCount());
buildable.setStarted(fluent.getStarted());
buildable.setState(fluent.buildState());
buildable.setUser(fluent.buildUser());
buildable.setVolumeMounts(fluent.buildVolumeMounts());
return buildable;
}
Expand Down
Loading

0 comments on commit 6a9f78e

Please sign in to comment.