Skip to content

Commit a89f4d1

Browse files
committed
cleanup after merging main
1 parent 6cfcc3d commit a89f4d1

File tree

2 files changed

+7
-2
lines changed

2 files changed

+7
-2
lines changed

imagetool/src/main/java/com/oracle/weblogic/imagetool/settings/UserSettings.java

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ private <T> T getValue(String settingName, Class<T> type, Map<String, Object> se
153153
}
154154

155155
logger.severe("Setting for {0} could not be loaded. Expected {1}, but found {2}. Invalid value: {3}",
156-
settingName, type, value.getClass(), value.toString());
156+
settingName, type, value.getClass(), value.toString());
157157
return null;
158158
}
159159

@@ -243,6 +243,11 @@ public Map<String,Object> getInstallers() {
243243
return installers;
244244
}
245245

246+
/**
247+
* Given an installer type, returns the user setting for the default installer version to use.
248+
* @param installerType Installer type such as JDK, WLS, SOA, etc.
249+
* @return the user configured default value
250+
*/
246251
public String getDefaultInstallerVersion(InstallerType installerType) {
247252
if (installers == null) {
248253
return null;

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@
9090
<dependency>
9191
<groupId>org.yaml</groupId>
9292
<artifactId>snakeyaml</artifactId>
93-
<version>1.29</version>
93+
<version>1.30</version>
9494
</dependency>
9595
</dependencies>
9696
</dependencyManagement>

0 commit comments

Comments
 (0)