Remove common portal.module.dependencies

shuyangzhou · Apr 18, 2021 · 1d13d0c · 1d13d0c
1 parent bd877a4
commit 1d13d0c
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 15 deletions.
diff --git a/portal-module-dependency.properties b/portal-module-dependency.properties
@@ -8,8 +8,6 @@
 #Add modules as dependency to other modules
 petra.modules=petra-concurrent,petra-content,petra-encryptor,petra-executor,petra-function,petra-io,petra-lang,petra-log4j,petra-mail,petra-memory,petra-nio,petra-process,petra-reflect,petra-sql-dsl-api,petra-sql-dsl-spi,petra-string,petra-xml
 
-portal.module.dependencies=portal-kernel,portal-test,registry-api
-
 portal-impl=portal-kernel,registry-api,util-bridges,util-java,util-taglib
 portal-kernel=registry-api
 portal-test=portal-kernel,registry-api

diff --git a/src/com/liferay/netbeansproject/container/Module.java b/src/com/liferay/netbeansproject/container/Module.java
@@ -419,23 +419,18 @@ private static Set<String> _resolvePortalModuleDependencies(
 			Properties properties, String moduleName)
 		throws IOException {
 
-		StringBuilder sb = new StringBuilder();
-
 		String dependencies = properties.getProperty(moduleName);
 
-		if (dependencies == null) {
-			sb.append(
-				PropertiesUtil.getRequiredProperty(
-					properties, "portal.module.dependencies"));
-		}
-		else {
-			if (!dependencies.isEmpty()) {
-				sb.append(dependencies);
-				sb.append(',');
-			}
-			sb.append(properties.getProperty("petra.modules"));
+		if (dependencies == null || dependencies.isEmpty()) {
+			return Collections.emptySet();
 		}
 
+		StringBuilder sb = new StringBuilder();
+
+		sb.append(dependencies);
+		sb.append(',');
+		sb.append(properties.getProperty("petra.modules"));
+
 		return new HashSet(Arrays.asList(StringUtil.split(sb.toString(), ',')));
 	}