fix the issue the path used during the packaging of the xds router de…

…mo is incorrect. Signed-off-by: daizhenyu <[email protected]>
sermant-io · Jan 3, 2025 · 5fb6aa3 · 5fb6aa3
1 parent 93ded5d
commit 5fb6aa3
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/scripts/copy_jar.sh b/scripts/copy_jar.sh
@@ -34,9 +34,9 @@ mkdir -p package/mq-gray-demo
 # 创建首个插件
 find . -type d -name "agent" -exec cp -rv {} package/first-plugin-demo/ \;
 # xDS服务发现
-find . -type d -name "product" -exec cp -rv {} package/xds-service-discovery-demo/ \;
+cp -rv ./xds-service-discovery-demo/product package/xds-service-discovery-demo/
 # xDS路由
-find . -type d -name "router-product" -exec cp -rv {} package/xds-router-demo/ \;
+cp -rv ./xds-router-demo/router-product package/xds-router-demo/
 # 动态配置
 find . -type f -name "spring-provider.jar" -exec cp -v {} package/dynamic-demo/ \;
 # 流控

diff --git a/xds-router-demo/spring-cloud-client-xds/pom.xml b/xds-router-demo/spring-cloud-client-xds/pom.xml
@@ -64,7 +64,7 @@
                 <configuration>
                     <mainClass>io.sermant.demo.xds.spring.client.SpringCloudClientApplication</mainClass>
                     <finalName>spring-client</finalName>
-                    <outputDirectory>${pom.basedir}/../product/spring-client</outputDirectory>
+                    <outputDirectory>${pom.basedir}/../router-product/spring-client</outputDirectory>
                 </configuration>
                 <executions>
                     <execution>
@@ -89,7 +89,7 @@
                         <configuration>
                             <filesets>
                                 <fileset>
-                                    <directory>${pom.basedir}/../product/spring-client</directory>
+                                    <directory>${pom.basedir}/../router-product/spring-client</directory>
                                     <includes>
                                         <include>spring-client.jar</include>
                                     </includes>

diff --git a/xds-router-demo/spring-cloud-server-xds/pom.xml b/xds-router-demo/spring-cloud-server-xds/pom.xml
@@ -36,7 +36,7 @@
                 <configuration>
                     <mainClass>io.sermant.demo.xds.spring.server.SpringCloudServerApplication</mainClass>
                     <finalName>spring-server</finalName>
-                    <outputDirectory>${pom.basedir}/../product/spring-server</outputDirectory>
+                    <outputDirectory>${pom.basedir}/../router-product/spring-server</outputDirectory>
                 </configuration>
                 <executions>
                     <execution>
@@ -61,7 +61,7 @@
                         <configuration>
                             <filesets>
                                 <fileset>
-                                    <directory>${pom.basedir}/../product/spring-server</directory>
+                                    <directory>${pom.basedir}/../router-product/spring-server</directory>
                                     <includes>
                                         <include>spring-server.jar</include>
                                     </includes>