From 7a1949e18241e3d77affecb41bd80385ed57d6f2 Mon Sep 17 00:00:00 2001
From: Divya Chhabra <dchhabra@tibco.com>
Date: Mon, 21 Mar 2022 19:32:18 +0530
Subject: [PATCH 1/2] AMBW-45306 Support for assertion of activities within a
 group

---
 Source/bw6-maven-plugin/pom.xml                                 | 2 +-
 .../com/tibco/bw/maven/plugin/test/helpers/TestFileParser.java  | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/Source/bw6-maven-plugin/pom.xml b/Source/bw6-maven-plugin/pom.xml
index 2bd28133..cbc295a3 100644
--- a/Source/bw6-maven-plugin/pom.xml
+++ b/Source/bw6-maven-plugin/pom.xml
@@ -2,7 +2,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>com.tibco.plugins</groupId>
 	<artifactId>bw6-maven-plugin</artifactId>
-	<version>2.9.1</version>
+	<version>2.9.2</version>
 	<packaging>maven-plugin</packaging>
 	<name>Plugin Code for Apache Maven and TIBCO BusinessWorks™</name>
 	<description>Plugin Code for Apache Maven and TIBCO BusinessWorks™.
diff --git a/Source/bw6-maven-plugin/src/main/java/com/tibco/bw/maven/plugin/test/helpers/TestFileParser.java b/Source/bw6-maven-plugin/src/main/java/com/tibco/bw/maven/plugin/test/helpers/TestFileParser.java
index aa0cac98..ab5409fa 100644
--- a/Source/bw6-maven-plugin/src/main/java/com/tibco/bw/maven/plugin/test/helpers/TestFileParser.java
+++ b/Source/bw6-maven-plugin/src/main/java/com/tibco/bw/maven/plugin/test/helpers/TestFileParser.java
@@ -124,6 +124,7 @@ else if(null != cEl.getAttributes().getNamedItem("assertionType") && "Activity".
 
 									String location = cEl.getAttributes().getNamedItem("Id").getNodeValue();
 									String activityName = cEl.getAttributes().getNamedItem("Name").getNodeValue();
+									ast.setActivityId(activityName);
 									ast.setLocation(location);
 
 									NodeList gChildNodes = cEl.getChildNodes();

From 82f240358cfb8ad51529ff2c9ad2308beefd1590 Mon Sep 17 00:00:00 2001
From: vpawar-tibco <vpawar@tibco.com>
Date: Thu, 7 Apr 2022 15:27:51 +0530
Subject: [PATCH 2/2] Fixed AMBW-45786

---
 .../plugin/application/BWEARPackagerMojo.java | 41 +++++++++++++++++--
 1 file changed, 37 insertions(+), 4 deletions(-)

diff --git a/Source/bw6-maven-plugin/src/main/java/com/tibco/bw/maven/plugin/application/BWEARPackagerMojo.java b/Source/bw6-maven-plugin/src/main/java/com/tibco/bw/maven/plugin/application/BWEARPackagerMojo.java
index 06befa92..1000237f 100755
--- a/Source/bw6-maven-plugin/src/main/java/com/tibco/bw/maven/plugin/application/BWEARPackagerMojo.java
+++ b/Source/bw6-maven-plugin/src/main/java/com/tibco/bw/maven/plugin/application/BWEARPackagerMojo.java
@@ -211,9 +211,9 @@ private void addModules() throws Exception {
 			//This is necessary for the ear file to run properly
     		List<MavenProject> projects = parser.getModulesProjectSet();
 			Set<File> artifactFiles = new HashSet<File>(); 
-    		for(MavenProject project : projects){
+    		for(MavenProject moduleProject : projects){
     			
-    			Set<Artifact> dependencyArtifacts = project.getDependencyArtifacts();
+    			Set<Artifact> dependencyArtifacts = moduleProject.getDependencyArtifacts();
 
     			for(Artifact artifact : dependencyArtifacts) {
     				
@@ -248,10 +248,43 @@ private void addModules() throws Exception {
     				}
     				
     			}
+    			
+    			//add transitive dependencies of app module into EAR.
+    			DependencyResolutionResult resolutionResult = getDependenciesResolutionResult(moduleProject);
+    			if (resolutionResult != null) {
+    		        	for(Dependency dependency : resolutionResult.getDependencies()) {
+    		    			if(dependency.getArtifact().getVersion().equals("0.0.0")) { //$NON-NLS-1$
+    		    				continue;
+    		    			}
+    		    			
+    		    			if(moduleVersionMap.containsKey(dependency.getArtifact().getArtifactId())){
+    		    				continue;
+    		    			}
+    		    			
+    		    			Manifest mf = ManifestParser.parseManifestFromJAR( dependency.getArtifact().getFile() );
+    		    			
+    	    				if(mf !=null){
+    							for( Object str : mf.getMainAttributes().keySet())
+    							{
+    								getLog().debug( str.toString() );
+    								if( "TIBCO-BW-SharedModule".equals(str.toString() ))
+    								{
+    									String dependencyVersion = BWProjectUtils.getModuleVersion(dependency.getArtifact().getFile());
+    									moduleVersionMap.put(dependency.getArtifact().getArtifactId(), dependencyVersion);
+    									artifactFiles.add(dependency.getArtifact().getFile());
+    									break;
+    									
+    								}
+    							}
+    	    				}
+
+    		        	}
+    		        }  
+    			
     		}
     		
 			//This code takes dependencies in the application project and adds them to the EAR file root level
-	        DependencyResolutionResult resolutionResult = getDependenciesResolutionResult();
+	        DependencyResolutionResult resolutionResult = getDependenciesResolutionResult(project);
 	        if (resolutionResult != null) {
 	        	for(Dependency dependency : resolutionResult.getDependencies()) {
 	    			if(dependency.getArtifact().getVersion().equals("0.0.0")) { //$NON-NLS-1$
@@ -333,7 +366,7 @@ private void addManifestJSON()
 
     }
 
-	private DependencyResolutionResult getDependenciesResolutionResult() {
+	private DependencyResolutionResult getDependenciesResolutionResult(MavenProject project) {
 		DependencyResolutionResult resolutionResult = null;
         try {
         	getLog().debug("Looking up dependency tree for the current project => " +  project + " and the current session => " + session);