Commit 50c3ffd0 authored by Kostis Trantzas's avatar Kostis Trantzas
Browse files

Merge branch '4-integrate-spring-ai-version-1-1-0' into 'develop' 

Resolve "Integrate spring-ai version 1.1.0 and investigate new features"

See merge request !5
parents 445c5278 58c06fb1

.classpath

+24 −11
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="UTF-8"?>

<classpath>

	<classpathentry kind="src" output="target/classes" path="src/main/java">

	<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources">

		<attributes>

			<attribute name="maven.pomderived" value="true"/>

			<attribute name="optional" value="true"/>

		</attributes>

	</classpathentry>

	<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources">

		<attributes>

			<attribute name="test" value="true"/>

			<attribute name="maven.pomderived" value="true"/>

			<attribute name="optional" value="true"/>

		</attributes>

	</classpathentry>

	<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources">

	<classpathentry kind="src" path="src/main/java"/>

	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">

		<attributes>

			<attribute name="maven.pomderived" value="true"/>

		</attributes>

	</classpathentry>

	<classpathentry kind="src" output="target/test-classes" path="src/test/java">

	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17">

		<attributes>

			<attribute name="test" value="true"/>

			<attribute name="optional" value="true"/>

			<attribute name="module" value="true"/>

			<attribute name="maven.pomderived" value="true"/>

		</attributes>

	</classpathentry>

	<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources">

	<classpathentry kind="src" path=".apt_generated">

		<attributes>

			<attribute name="optional" value="true"/>

		</attributes>

	</classpathentry>

	<classpathentry kind="src" output="target/test-classes" path=".apt_generated_tests">

		<attributes>

			<attribute name="test" value="true"/>

			<attribute name="maven.pomderived" value="true"/>

			<attribute name="optional" value="true"/>

		</attributes>

	</classpathentry>

	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">

	<classpathentry kind="src" path="target/generated-sources/annotations">

		<attributes>

			<attribute name="maven.pomderived" value="true"/>

			<attribute name="optional" value="true"/>

		</attributes>

	</classpathentry>

	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17">

	<classpathentry kind="src" output="target/test-classes" path="target/generated-test-sources/test-annotations">

		<attributes>

			<attribute name="maven.pomderived" value="true"/>

			<attribute name="test" value="true"/>

			<attribute name="optional" value="true"/>

		</attributes>

	</classpathentry>

	<classpathentry kind="output" path="target/classes"/>

.project

+11 −0
Original line number Diff line number Diff line
@@ -20,4 +20,15 @@ 
		<nature>org.eclipse.jdt.core.javanature</nature>

		<nature>org.eclipse.m2e.core.maven2Nature</nature>

	</natures>

	<filteredResources>

		<filter>

			<id>1747415794116</id>

			<name></name>

			<type>30</type>

			<matcher>

				<id>org.eclipse.core.resources.regexFilterMatcher</id>

				<arguments>node_modules|\.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__</arguments>

			</matcher>

		</filter>

	</filteredResources>

</projectDescription>

.settings/org.eclipse.core.resources.prefs

+2 −2
Original line number Diff line number Diff line 
eclipse.preferences.version=1

encoding//src/main/java=UTF-8

encoding//src/main/java=utf-8

encoding//src/main/resources=UTF-8

encoding//src/test/java=UTF-8

encoding//src/test/java=utf-8

encoding//src/test/resources=UTF-8

encoding/<project>=UTF-8

.settings/org.eclipse.jdt.core.prefs

+13 −1
Original line number Diff line number Diff line 
eclipse.preferences.version=1

org.eclipse.jdt.core.compiler.annotation.missingNonNullByDefaultAnnotation=ignore

org.eclipse.jdt.core.compiler.annotation.nonnull=org.springframework.lang.NonNull

org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.springframework.lang.NonNullApi

org.eclipse.jdt.core.compiler.annotation.nullable=org.springframework.lang.Nullable

org.eclipse.jdt.core.compiler.annotation.nullanalysis=enabled

org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled

org.eclipse.jdt.core.compiler.codegen.methodParameters=generate

org.eclipse.jdt.core.compiler.codegen.targetPlatform=17
@@ -11,6 +16,13 @@ org.eclipse.jdt.core.compiler.problem.assertIdentifier=error 
org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled

org.eclipse.jdt.core.compiler.problem.enumIdentifier=error

org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning

org.eclipse.jdt.core.compiler.problem.nullAnnotationInferenceConflict=warning

org.eclipse.jdt.core.compiler.problem.nullReference=warning

org.eclipse.jdt.core.compiler.problem.nullSpecViolation=warning

org.eclipse.jdt.core.compiler.problem.nullUncheckedConversion=ignore

org.eclipse.jdt.core.compiler.problem.potentialNullReference=warning

org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning

org.eclipse.jdt.core.compiler.release=enabled

org.eclipse.jdt.core.compiler.problem.syntacticNullAnalysisForFields=enabled

org.eclipse.jdt.core.compiler.processAnnotations=enabled

org.eclipse.jdt.core.compiler.release=disabled

org.eclipse.jdt.core.compiler.source=17

pom.xml

+21 −6
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ 
		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>

		<spring.boot-version>3.4.5</spring.boot-version>

		<spring-ai.version>1.0.0-M7</spring-ai.version>

		<spring-ai.version>1.1.0</spring-ai.version>

		<lombok-version>1.18.28</lombok-version>

		<springdoc.version>2.1.0</springdoc.version>

		<mapstruct.version>1.5.3.Final</mapstruct.version>
@@ -98,15 +98,32 @@ 


		<dependency>

			<groupId>org.springframework.ai</groupId>

			<artifactId>spring-ai-starter-mcp-server-webflux</artifactId>

			<artifactId>spring-ai-starter-mcp-server-webmvc</artifactId>

		</dependency>







		<!-- security -->

		<dependency>

	        <groupId>org.springaicommunity</groupId>

	        <artifactId>mcp-server-security</artifactId>

        	<version>0.0.4</version>

	    </dependency>

	    <dependency>

	        <groupId>org.springframework.boot</groupId>

	        <artifactId>spring-boot-starter-security</artifactId>

	    </dependency>

	

	    <!-- OPTIONAL: For OAuth2 support -->

	    <dependency>

	        <groupId>org.springframework.boot</groupId>

	        <artifactId>spring-boot-starter-oauth2-resource-server</artifactId>

	    </dependency>





		<dependency>

			<groupId>com.jayway.jsonpath</groupId>

			<artifactId>json-path</artifactId>

		</dependency>



		<dependency>

			<groupId>org.projectlombok</groupId>
@@ -135,8 +152,6 @@ 
		</dependency>









		<!-- swagger -->



		<dependency>