227620 EAR Import adds unnecessary dependencies
diff --git a/features/org.eclipse.jst.web_core.feature.patch/buildnotes_org.eclipse.jst.web_core.feature.patch.html b/features/org.eclipse.jst.web_core.feature.patch/buildnotes_org.eclipse.jst.web_core.feature.patch.html index 599f712..fda1c66 100644 --- a/features/org.eclipse.jst.web_core.feature.patch/buildnotes_org.eclipse.jst.web_core.feature.patch.html +++ b/features/org.eclipse.jst.web_core.feature.patch/buildnotes_org.eclipse.jst.web_core.feature.patch.html
@@ -27,4 +27,5 @@ <p>Bug <a href='https://bugs.eclipse.org/bugs/show_bug.cgi?id=217138'>217138</a>. EAR Libraries needs to follow export rules</p> <p>Bug <a href='https://bugs.eclipse.org/bugs/show_bug.cgi?id=159017'>159017</a>. 'J2EE Modules Dependencies' pref page fails to load if ...</p> <p>Bug <a href='https://bugs.eclipse.org/bugs/show_bug.cgi?id=220958'>220958</a>. J2EEFlexProjDeployable isSingleRootStructure is false for web modules with non-manifest binary dependencies</p> +<p>Bug <a href='https://bugs.eclipse.org/bugs/show_bug.cgi?id=227620'>227620</a>. EAR Import adds unnecessary dependencies</p> </body></html> \ No newline at end of file
diff --git a/features/org.eclipse.jst.web_core.feature.patch/feature.properties b/features/org.eclipse.jst.web_core.feature.patch/feature.properties index c8d1444..7261cae 100644 --- a/features/org.eclipse.jst.web_core.feature.patch/feature.properties +++ b/features/org.eclipse.jst.web_core.feature.patch/feature.properties
@@ -41,6 +41,7 @@ Bug https://bugs.eclipse.org/bugs/show_bug.cgi?id=217138 EAR Libraries needs to follow export rules\n\ Bug https://bugs.eclipse.org/bugs/show_bug.cgi?id=159017 'J2EE Modules Dependencies' pref page fails to load if ... \n\ Bug https://bugs.eclipse.org/bugs/show_bug.cgi?id=220958 J2EEFlexProjDeployable isSingleRootStructure is false for web modules with non-manifest binary dependencies\n\ +Bug https://bugs.eclipse.org/bugs/show_bug.cgi?id=227620 EAR Import adds unnecessary dependencies \n\ \n\ # "copyright" property - text of the "Feature Update Copyright"
diff --git a/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/operations/EARComponentImportOperation.java b/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/operations/EARComponentImportOperation.java index 33c50f8..ba22c31 100644 --- a/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/operations/EARComponentImportOperation.java +++ b/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/operations/EARComponentImportOperation.java
@@ -115,8 +115,10 @@ Archive nestedArchive = (Archive) importModel.getProperty(IEARComponentImportDataModelProperties.FILE); importModel.setProperty(IJ2EEComponentImportDataModelProperties.CLOSE_ARCHIVE_ON_DISPOSE, Boolean.FALSE); IDataModel compCreationModel = importModel.getNestedModel(IJ2EEComponentImportDataModelProperties.NESTED_MODEL_J2EE_COMPONENT_CREATION); - if (compCreationModel.isProperty(IJ2EEFacetProjectCreationDataModelProperties.MODULE_URI)) + if (compCreationModel.isProperty(IJ2EEFacetProjectCreationDataModelProperties.MODULE_URI)){ compCreationModel.setProperty(IJ2EEFacetProjectCreationDataModelProperties.MODULE_URI, nestedArchive.getURI()); + } + compCreationModel.setBooleanProperty(IJ2EEFacetProjectCreationDataModelProperties.ADD_TO_EAR, false); try { importModel.getDefaultOperation().execute(new SubProgressMonitor(monitor, PROJECT_CREATION_WORK + nestedArchive.getFiles().size()), info); } catch (ExecutionException e) {