Skip to content

Commit d793074

Browse files
committed
upgrade jar version
1 parent 6c0e390 commit d793074

File tree

4 files changed

+16
-61
lines changed

4 files changed

+16
-61
lines changed

disjob-reports/pom.xml

-15
Original file line numberDiff line numberDiff line change
@@ -131,21 +131,6 @@
131131
<skip>true</skip>
132132
</configuration>
133133
</plugin>
134-
<plugin>
135-
<groupId>org.sonatype.plugins</groupId>
136-
<artifactId>nexus-staging-maven-plugin</artifactId>
137-
<version>1.6.13</version>
138-
<extensions>true</extensions>
139-
<executions>
140-
<execution>
141-
<id>staging-none</id>
142-
<phase>none</phase>
143-
</execution>
144-
</executions>
145-
<configuration>
146-
<skipNexusStagingDeployMojo>true</skipNexusStagingDeployMojo>
147-
</configuration>
148-
</plugin>
149134
</plugins>
150135
</build>
151136

disjob-samples/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
<maven.compiler.compilerVersion>${java.version}</maven.compiler.compilerVersion>
3838

3939
<spring-boot.version>2.7.18</spring-boot.version>
40-
<!--<spring-boot-admin.version>2.7.15</spring-boot-admin.version>-->
40+
<!--<spring-boot-admin.version>2.7.16</spring-boot-admin.version>-->
4141

4242
<maven-compiler-plugin.version>3.10.1</maven-compiler-plugin.version>
4343
<maven-shade-plugin.version>3.3.0</maven-shade-plugin.version>

disjob-supervisor/pom.xml

-4
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,6 @@
3131
<groupId>org.springframework.boot</groupId>
3232
<artifactId>spring-boot-starter-web</artifactId>
3333
</dependency>
34-
<dependency>
35-
<groupId>org.springframework.boot</groupId>
36-
<artifactId>spring-boot-starter-actuator</artifactId>
37-
</dependency>
3834
<dependency>
3935
<groupId>org.mybatis.spring.boot</groupId>
4036
<artifactId>mybatis-spring-boot-starter</artifactId>

pom.xml

+15-41
Original file line numberDiff line numberDiff line change
@@ -70,18 +70,17 @@
7070
<maven.compiler.source>${java.version}</maven.compiler.source>
7171
<maven.compiler.target>${java.version}</maven.compiler.target>
7272
<maven.compiler.compilerVersion>${java.version}</maven.compiler.compilerVersion>
73-
<argLine>-server -Xms256m -Xmx512m -Dfile.encoding=UTF-8 -Djava.net.preferIPv4Stack=true -XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=512m</argLine>
74-
<!--<java17ArgLine>&#45;&#45;add-exports=java.base/sun.reflect.annotation=ALL-UNNAMED</java17ArgLine>-->
75-
<java17ArgLine></java17ArgLine>
73+
<argLine>-Dfile.encoding=UTF-8 -Djava.net.preferIPv4Stack=true</argLine>
74+
<java9.module.argLine></java9.module.argLine>
7675

7776
<spring-boot.version>2.7.18</spring-boot.version>
7877
<mapstruct.version>1.5.5.Final</mapstruct.version>
79-
<guava.version>33.2.0-jre</guava.version>
78+
<guava.version>33.2.1-jre</guava.version>
8079
<commons-collections4.version>4.4</commons-collections4.version>
8180
<commons-io.version>2.16.1</commons-io.version>
8281
<mybatis-spring-boot-starter.version>2.3.2</mybatis-spring-boot-starter.version>
8382
<jna-platform.version>5.14.0</jna-platform.version>
84-
<curator-recipes.version>5.6.0</curator-recipes.version>
83+
<curator-recipes.version>5.7.0</curator-recipes.version>
8584

8685
<springdoc-openapi-ui.version>1.8.0</springdoc-openapi-ui.version>
8786
<mariaDB4j.version>2.5.3</mariaDB4j.version>
@@ -191,6 +190,15 @@
191190
</dependencies>
192191

193192
<profiles>
193+
<profile>
194+
<id>java9-module-exports</id>
195+
<activation>
196+
<jdk>[9,)</jdk>
197+
</activation>
198+
<properties>
199+
<java9.module.argLine>--add-exports=java.base/sun.reflect.annotation=ALL-UNNAMED</java9.module.argLine>
200+
</properties>
201+
</profile>
194202
<profile>
195203
<id>develop</id>
196204
<activation>
@@ -231,21 +239,6 @@
231239
</execution>
232240
</executions>
233241
</plugin>
234-
<!--
235-
<plugin>
236-
Note: 加上会导致把可执行的jar包(如spring boot jar)deploy到sonatype上
237-
Nexus-bug: https://issues.sonatype.org/browse/NEXUS-9138
238-
<groupId>org.sonatype.plugins</groupId>
239-
<artifactId>nexus-staging-maven-plugin</artifactId>
240-
<version>1.6.13</version>
241-
<extensions>true</extensions>
242-
<configuration>
243-
<serverId>ossrh</serverId>
244-
<nexusUrl>https://s01.oss.sonatype.org/</nexusUrl>
245-
<autoReleaseAfterClose>false</autoReleaseAfterClose>
246-
</configuration>
247-
</plugin>
248-
-->
249242
</plugins>
250243
</build>
251244
</profile>
@@ -347,28 +340,9 @@
347340
<compilerVersion>${java.version}</compilerVersion>
348341
<encoding>${file.encoding}</encoding>
349342
<compilerArgs>
350-
<arg>${java17ArgLine}</arg>
343+
<arg>${java9.module.argLine}</arg>
351344
<arg>-Xlint:unchecked,deprecation</arg>
352345
</compilerArgs>
353-
<!--
354-
<annotationProcessorPaths>
355-
<path>
356-
<groupId>org.projectlombok</groupId>
357-
<artifactId>lombok</artifactId>
358-
<version>${lombok.version}</version>
359-
</path>
360-
<path>
361-
<groupId>org.mapstruct</groupId>
362-
<artifactId>mapstruct-processor</artifactId>
363-
<version>${mapstruct.version}</version>
364-
</path>
365-
<path>
366-
<groupId>org.springframework.boot</groupId>
367-
<artifactId>spring-boot-configuration-processor</artifactId>
368-
<version>${spring-boot.version}</version>
369-
</path>
370-
</annotationProcessorPaths>
371-
-->
372346
</configuration>
373347
</plugin>
374348
<plugin>
@@ -379,7 +353,7 @@
379353
<redirectTestOutputToFile>true</redirectTestOutputToFile>
380354
<forkCount>1</forkCount>
381355
<reuseForks>true</reuseForks>
382-
<argLine>${java17ArgLine} ${argLine} ${jacocoArgLine}</argLine>
356+
<argLine>${java9.module.argLine} ${argLine} ${jacocoArgLine}</argLine>
383357
</configuration>
384358
</plugin>
385359
<plugin>

0 commit comments

Comments
 (0)