Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/main' into fix/token-manager
Browse files Browse the repository at this point in the history
  • Loading branch information
mdanish98 committed Nov 25, 2024
2 parents 5cce459 + faefac4 commit 406b89b
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion basyx.aasenvironment/basyx.aasenvironment-core/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>33.2.1-jre</version>
<version>33.3.1-jre</version>
</dependency>

<dependency>
Expand Down
2 changes: 1 addition & 1 deletion basyx.aasregistry/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
Plattform_i40-AssetAdministrationShellRegistryServiceSpecification-V3.0.1_SSP-001-resolved.yaml
</openapi.base.name>
<openapi.name>Plattform_i40-Registry-and-Discovery.yaml</openapi.name>
<guava.version>33.2.1-jre</guava.version>
<guava.version>33.3.1-jre</guava.version>
<maven-plugin.version>3.9.0</maven-plugin.version>
<maven-project.version>3.0-alpha-2</maven-project.version>
<mustache.compiler.version>0.9.14</mustache.compiler.version>
Expand Down
2 changes: 1 addition & 1 deletion basyx.submodelregistry/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
<openapi.base.name>
Plattform_i40-SubmodelRegistryServiceSpecification-V3.0.1_SSP-001-resolved.yaml</openapi.base.name>
<openapi.name>Plattform_i40-SubmodelRegistry-and-Discovery.yaml</openapi.name>
<guava.version>33.2.1-jre</guava.version>
<guava.version>33.3.1-jre</guava.version>
<maven-plugin.version>3.6.0</maven-plugin.version>
<maven-project.version>3.0-alpha-2</maven-project.version>
<mustache.compiler.version>0.9.14</mustache.compiler.version>
Expand Down
4 changes: 2 additions & 2 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
<version>3.5.1</version>
<version>3.5.2</version>
<executions>
<execution>
<id>integration-test</id>
Expand Down Expand Up @@ -378,7 +378,7 @@
<dependency>
<groupId>org.apache.tika</groupId>
<artifactId>tika-core</artifactId>
<version>2.9.2</version>
<version>3.0.0</version>
</dependency>
<dependency>
<groupId>org.reflections</groupId>
Expand Down

0 comments on commit 406b89b

Please sign in to comment.