From 5353617c7b2135ab00f98d8e05b2f8dfb2e096ed Mon Sep 17 00:00:00 2001 From: riku <risaku@163.com> Date: 星期三, 30 六月 2021 09:55:40 +0800 Subject: [PATCH] 1. 新增污染权重分析功能 --- pom.xml | 120 ++++++++++++++++++++++++++++++++++++++++++++++------------- 1 files changed, 93 insertions(+), 27 deletions(-) diff --git a/pom.xml b/pom.xml index 4e9ea76..f4855d6 100644 --- a/pom.xml +++ b/pom.xml @@ -17,7 +17,7 @@ <properties> <java.version>1.8</java.version> - <kotlin.version>1.2.71</kotlin.version> + <kotlin.version>1.5.0</kotlin.version> <!-- tk.mybatis --> <mapper.plugin>tk.mybatis.mapper.generator.MapperPlugin</mapper.plugin> <mapper.Mapper>tk.mybatis.mapper.common.Mapper</mapper.Mapper> @@ -42,10 +42,6 @@ <dependency> <groupId>org.jetbrains.kotlin</groupId> <artifactId>kotlin-reflect</artifactId> - </dependency> - <dependency> - <groupId>org.jetbrains.kotlin</groupId> - <artifactId>kotlin-stdlib-jdk8</artifactId> </dependency> <dependency> @@ -129,35 +125,61 @@ <artifactId>fastjson</artifactId> <version>1.2.75</version> </dependency> + <dependency> + <groupId>org.jetbrains.kotlin</groupId> + <artifactId>kotlin-stdlib-jdk8</artifactId> + <version>${kotlin.version}</version> + </dependency> + <dependency> + <groupId>org.jetbrains.kotlin</groupId> + <artifactId>kotlin-test-junit</artifactId> + <version>${kotlin.version}</version> + <scope>test</scope> + </dependency> + <!-- https://mvnrepository.com/artifact/org.jetbrains.kotlin/kotlin-maven-plugin --> + <dependency> + <groupId>org.jetbrains.kotlin</groupId> + <artifactId>kotlin-maven-plugin</artifactId> + <version>${kotlin.version}</version> + <scope>provided</scope> + </dependency> + + <!-- https://mvnrepository.com/artifact/org.jetbrains.kotlin/kotlin-maven-allopen --> + <dependency> + <groupId>org.jetbrains.kotlin</groupId> + <artifactId>kotlin-maven-allopen</artifactId> + <version>${kotlin.version}</version> + </dependency> + </dependencies> <build> - <sourceDirectory>${project.basedir}/src/main/kotlin</sourceDirectory> - <testSourceDirectory>${project.basedir}/src/test/kotlin</testSourceDirectory> + <sourceDirectory>src/main/kotlin</sourceDirectory> + <testSourceDirectory>src/test/kotlin</testSourceDirectory> <plugins> <!-- <plugin>--> <!-- <groupId>org.springframework.boot</groupId>--> <!-- <artifactId>spring-boot-maven-plugin</artifactId>--> <!-- </plugin>--> -<!-- <plugin>--> -<!-- <groupId>org.jetbrains.kotlin</groupId>--> -<!-- <artifactId>kotlin-maven-plugin</artifactId>--> -<!-- <configuration>--> -<!-- <args>--> -<!-- <arg>-Xjsr305=strict</arg>--> -<!-- </args>--> -<!-- <compilerPlugins>--> -<!-- <plugin>spring</plugin>--> -<!-- </compilerPlugins>--> -<!-- </configuration>--> -<!-- <dependencies>--> -<!-- <dependency>--> -<!-- <groupId>org.jetbrains.kotlin</groupId>--> -<!-- <artifactId>kotlin-maven-allopen</artifactId>--> -<!-- <version>${kotlin.version}</version>--> -<!-- </dependency>--> -<!-- </dependencies>--> -<!-- </plugin>--> + <plugin> + <groupId>org.jetbrains.kotlin</groupId> + <artifactId>kotlin-maven-plugin</artifactId> + <configuration> + <args> + <arg>-Xjsr305=strict</arg> + </args> + <compilerPlugins> + <plugin>spring</plugin> + </compilerPlugins> + </configuration> + <dependencies> + <dependency> + <groupId>org.jetbrains.kotlin</groupId> + <artifactId>kotlin-maven-allopen</artifactId> + <version>${kotlin.version}</version> + </dependency> + </dependencies> + </plugin> <!-- mybatis generator 鑷姩鐢熸垚浠g爜鎻掍欢 --> <plugin> <groupId>org.mybatis.generator</groupId> @@ -178,6 +200,50 @@ </dependency> </dependencies> </plugin> +<!-- <plugin>--> +<!-- <groupId>org.jetbrains.kotlin</groupId>--> +<!-- <artifactId>kotlin-maven-plugin</artifactId>--> +<!-- <version>${kotlin.version}</version>--> +<!-- <executions>--> +<!-- <execution>--> +<!-- <id>compile</id>--> +<!-- <phase>compile</phase>--> +<!-- <goals>--> +<!-- <goal>compile</goal>--> +<!-- </goals>--> +<!-- </execution>--> +<!-- <execution>--> +<!-- <id>test-compile</id>--> +<!-- <phase>test-compile</phase>--> +<!-- <goals>--> +<!-- <goal>test-compile</goal>--> +<!-- </goals>--> +<!-- </execution>--> +<!-- </executions>--> +<!-- <configuration>--> +<!-- <jvmTarget>1.8</jvmTarget>--> +<!-- </configuration>--> +<!-- </plugin>--> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-compiler-plugin</artifactId> + <executions> + <execution> + <id>compile</id> + <phase>compile</phase> + <goals> + <goal>compile</goal> + </goals> + </execution> + <execution> + <id>testCompile</id> + <phase>test-compile</phase> + <goals> + <goal>testCompile</goal> + </goals> + </execution> + </executions> + </plugin> </plugins> </build> @@ -186,7 +252,7 @@ <repository> <id>alimaven</id> <name>aliyun maven</name> - <url>http://maven.aliyun.com/nexus/content/groups/public/</url> + <url>https://maven.aliyun.com/repository/public</url> </repository> <repository> <id>spring-snapshots</id> -- Gitblit v1.9.3