Skip to content

Commit cf40b37

Browse files
committed
Merge branch 'version-updates' into 'main'
picking up dendendabot version updates See merge request weblogic-cloud/weblogic-deploy-tooling!1470
2 parents 322b643 + a5963c9 commit cf40b37

File tree

3 files changed

+9
-6
lines changed

3 files changed

+9
-6
lines changed

integration-tests/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
<plugin>
2929
<groupId>org.apache.maven.plugins</groupId>
3030
<artifactId>maven-dependency-plugin</artifactId>
31-
<version>3.5.0</version>
31+
<version>3.6.0</version>
3232
</plugin>
3333
<plugin>
3434
<groupId>org.apache.maven.plugins</groupId>

integration-tests/system-test/src/test/java/oracle/weblogic/deploy/integration/ITWdt.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1224,7 +1224,10 @@ private void verifyDiscoveredJDBCWalletModelFile(String expectedModelFile) throw
12241224
checkContents.add(" AdminServerName: admin-server");
12251225
checkContents.add(" ProductionModeEnabled: true");
12261226
checkContents.add(" NMProperties:");
1227-
checkContents.add(" JavaHome: /usr/java/jdk1.8.0_361");
1227+
1228+
// Don't include the JavaHome path in the check since it will vary when running system-tests locally...
1229+
//
1230+
checkContents.add(" JavaHome: ");
12281231
checkContents.add(" Server:");
12291232
checkContents.add(" admin-server: {}");
12301233
checkContents.add(" SecurityConfiguration:");

pom.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
<skipTests>false</skipTests>
4040
<antlr.version>4.9.3</antlr.version>
4141
<snakeyaml.version>2.0</snakeyaml.version>
42-
<picocli.version>4.7.3</picocli.version>
42+
<picocli.version>4.7.4</picocli.version>
4343
<wdt.scm.repo.url>${env.WDT_SCM_REPO_URL}</wdt.scm.repo.url>
4444
<wdt.scm.repo.conn>${env.WDT_SCM_REPO_CONN}</wdt.scm.repo.conn>
4545

@@ -98,7 +98,7 @@
9898
<dependency>
9999
<groupId>com.google.guava</groupId>
100100
<artifactId>guava</artifactId>
101-
<version>31.1-jre</version>
101+
<version>32.0.1-jre</version>
102102
</dependency>
103103
<dependency>
104104
<groupId>javax.xml.bind</groupId>
@@ -108,7 +108,7 @@
108108
<dependency>
109109
<groupId>commons-io</groupId>
110110
<artifactId>commons-io</artifactId>
111-
<version>2.11.0</version>
111+
<version>2.13.0</version>
112112
</dependency>
113113
<dependency>
114114
<groupId>info.picocli</groupId>
@@ -170,7 +170,7 @@
170170
<plugin>
171171
<groupId>org.apache.maven.plugins</groupId>
172172
<artifactId>maven-release-plugin</artifactId>
173-
<version>3.0.0</version>
173+
<version>3.0.1</version>
174174
</plugin>
175175
<plugin>
176176
<groupId>org.apache.maven.plugins</groupId>

0 commit comments

Comments
 (0)