From c61290f72c294eb0a811c6047da55292e144933b Mon Sep 17 00:00:00 2001 From: Alex Vazquez Date: Wed, 8 Feb 2023 11:38:57 +0100 Subject: [PATCH] fix for #680 ported to 2.9.4 --- .../plugin/module/BWModulePackageMojo.java | 23 +++++++++---------- .../plugin/test/setuplocal/ESMTestFile.java | 10 +++----- 2 files changed, 14 insertions(+), 19 deletions(-) diff --git a/Source/bw6-maven-plugin/src/main/java/com/tibco/bw/maven/plugin/module/BWModulePackageMojo.java b/Source/bw6-maven-plugin/src/main/java/com/tibco/bw/maven/plugin/module/BWModulePackageMojo.java index 397177e7..3b01bfc3 100644 --- a/Source/bw6-maven-plugin/src/main/java/com/tibco/bw/maven/plugin/module/BWModulePackageMojo.java +++ b/Source/bw6-maven-plugin/src/main/java/com/tibco/bw/maven/plugin/module/BWModulePackageMojo.java @@ -192,18 +192,17 @@ private void addDependencies() throws Exception { boolean isSharedModule = false; Manifest mf = ManifestParser.parseManifestFromJAR( file); - if(mf == null){ - throw new Exception("Failed to get Manifest for - "+ file.getName() +". Please verify if jar file is valid, the MANIFEST.MF should be first or second entry in the jar file. Use Command - jar tf to verify."); - } - for( Object str : mf.getMainAttributes().keySet()) - { - getLog().debug( str.toString() ); - if( Constants.TIBCO_SHARED_MODULE.equals(str.toString() )) - { - isSharedModule = true; - break; - } - } + if(mf != null){ + for( Object str : mf.getMainAttributes().keySet()) + { + getLog().debug( str.toString() ); + if( Constants.TIBCO_SHARED_MODULE.equals(str.toString() )) + { + isSharedModule = true; + break; + } + } + } if(!isSharedModule) { getLog().debug("Dependency added with name " + file.toString()); jarArchiver.addFile(file, "lib/" + file.getName()); diff --git a/Source/bw6-maven-plugin/src/main/java/com/tibco/bw/maven/plugin/test/setuplocal/ESMTestFile.java b/Source/bw6-maven-plugin/src/main/java/com/tibco/bw/maven/plugin/test/setuplocal/ESMTestFile.java index 1b451c55..26d2d507 100644 --- a/Source/bw6-maven-plugin/src/main/java/com/tibco/bw/maven/plugin/test/setuplocal/ESMTestFile.java +++ b/Source/bw6-maven-plugin/src/main/java/com/tibco/bw/maven/plugin/test/setuplocal/ESMTestFile.java @@ -114,13 +114,8 @@ private void checkForSharedModule( Map artifactFiles) { } boolean isSharedModule = false; Manifest mf = ManifestParser.parseManifestFromJAR( file); - if(mf == null){ - try { - throw new Exception("Failed to get Manifest for - "+ file.getName() +". Please verify if jar file is valid, the MANIFEST.MF should be first or second entry in the jar file. Use Command - jar tf to verify."); - } catch (Exception e) { - e.printStackTrace(); - } - } + if(mf != null){ + for( Object str : mf.getMainAttributes().keySet()) { if( Constants.TIBCO_SHARED_MODULE.equals(str.toString() )) @@ -136,6 +131,7 @@ private void checkForSharedModule( Map artifactFiles) { e.printStackTrace(); } } + } } }