Merge remote-tracking branch 'origin/master'

YYC

2023-09-07 7243e0b4bd9a267a633d2e481e17646509b6868d

 igds-protocol-modbus/pom.xml

@@ -13,8 +13,6 @@
   </properties>




   <dependencies>

      <!-- 引入IO包 -->
@@ -66,21 +64,32 @@

   </dependencies>

    <build>
       <plugins>
          <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-compiler-plugin</artifactId>
             <configuration>
                <source>1.8</source>
                <target>1.8</target>
                <compilerArguments>
                   <extdirs>src\main\webapp\WEB-INF\lib</extdirs>
                </compilerArguments>
             </configuration>
          </plugin>
       </plugins>
    </build>
   <build>
        <plugins>
            <plugin>
                <groupId>org.apache.maven.plugins</groupId>
                <artifactId>maven-compiler-plugin</artifactId>
                <configuration>
                    <source>${java.version}</source>
                    <target>${java.version}</target>
                </configuration>
            </plugin>
        </plugins>

        <resources>
            <resource>
                <directory>src/main/java</directory>
                <includes>
                    <include>**/*.xml</include>
                    <include>**/*.js</include>
                </includes>
                <filtering>true</filtering>
            </resource>
            <resource>
                <directory>src/main/resources</directory>
            </resource>
        </resources>
    </build>


<!--   <repositories>-->