Merge branch 'feature-mcp-server-32827' of github.com:ttmunyunguma/open-liberty into feature-mcp-server-32827

Author: ttmunyunguma

dev/io.openliberty.jakarta/build.gradle

@@ -0,0 +1,16 @@
+/*******************************************************************************
+ * Copyright (c) 2025 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-2.0/
+ *******************************************************************************/
+configurations {
+  cdi40 {
+    canBeResolved = true
+  }
+}
+
+artifacts {
+  cdi40(file('build/libs/io.openliberty.jakarta.cdi.4.0.jar'))
+}

dev/io.openliberty.mcp.internal_fat/.classpath

@@ -5,6 +5,11 @@
 			<attribute name="test" value="true"/>
 		</attributes>
 	</classpathentry>
+	<classpathentry kind="src" path="noParamTest">
+		<attributes>
+			<attribute name="test" value="true"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17">
 		<attributes>
 			<attribute name="module" value="true"/>

dev/io.openliberty.mcp.internal_fat/build.gradle

@@ -15,37 +15,38 @@ apply from: '../wlp-gradle/subprojects/repos.gradle'
 configurations.requiredLibs {
   transitive = false
 }
+
+sourceSets {
+  // Source set where we don't include parameter names
+  noParamNamesTest {
+    java {
+      srcDirs = ['noParamTest']
+    }
+  }
+}
+
 dependencies {
   requiredLibs 'org.json:json:20080701',
                'org.skyscreamer:jsonassert:2.0-rc1'
+  noParamNamesTestCompileOnly project(':io.openliberty.mcp'),
+                              project(path: ':io.openliberty.jakarta', configuration: 'cdi40')
+  implementation sourceSets.noParamNamesTest.output
 }
+
 /* Added to allow method parmaters to be available for MCP Tool Server*/ 
 // Allow us to test getting the name of a tool argument directly from the Java 
 compileJava {
-    options.compilerArgs << '-parameters'
-}
-
-sourceSets {
-	main {
-		java {
-			srcDirs = ['fat/src']
-		}
-	}
-	noParamNamesTest {
-		java {
-			srcDirs = ['noParamTest']
-		}
-		compileClasspath += sourceSets.main.compileClasspath
-		runtimeClasspath += sourceSets.main.runtimeClasspath + output
-	}
+  options.compilerArgs << '-parameters'
 }
 
-task noParamNamesTest(type: Test) {
-	description = "Compiles without -parameters"
-	
-	testClassesDirs = sourceSets.noParamNamesTest.output.classesDirs
+// Build the noParamNamesTest code into a jar
+tasks.register('noParamNamesTestJar', Jar) {
+  dependsOn noParamNamesTestClasses
+  from sourceSets.noParamNamesTest.output
+  archiveFileName = 'noParamNamesTest.jar'
 }
 
-tasks.named("compileNoParamNamesTestJava"){
-	options.compilerArgs.remove('-parameters')
+// Build the noParamNamesTest jar before the autoFVT zip so that it gets included in the zip
+tasks.named('autoFVT') {
+  dependsOn noParamNamesTestJar
 }