Skip to content

Commit 1a27ed5

Browse files
jericksjericks
committed
Update maven and plugins
1 parent 4156531 commit 1a27ed5

2 files changed

Lines changed: 78 additions & 69 deletions

File tree

‎.mvn/wrapper/maven-wrapper.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
distributionUrl=https://repo1.maven.org/maven2/org/apache/maven/apache-maven/3.8.2/apache-maven-3.8.2-bin.zip
1+
distributionUrl=https://repo1.maven.org/maven2/org/apache/maven/apache-maven/3.8.6/apache-maven-3.8.6-bin.zip

‎pom.xml‎

Lines changed: 77 additions & 68 deletions
Original file line numberDiff line numberDiff line change
@@ -2,34 +2,17 @@
22
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
33
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
44
<modelVersion>4.0.0</modelVersion>
5+
<name>geoscript groovy</name>
6+
<description>A groovy implementation of geoscript.</description>
7+
<url>http://geoscript.net/</url>
58
<groupId>org.geoscript</groupId>
69
<artifactId>geoscript-groovy</artifactId>
710
<packaging>jar</packaging>
811
<version>1.20-SNAPSHOT</version>
9-
<repositories>
10-
<repository>
11-
<id>osgeo-releases</id>
12-
<name>OSGeo Nexus Release Repository</name>
13-
<url>https://repo.osgeo.org/repository/release/</url>
14-
<snapshots>
15-
<enabled>false</enabled>
16-
</snapshots>
17-
<releases>
18-
<enabled>true</enabled>
19-
</releases>
20-
</repository>
21-
<repository>
22-
<id>osgeo-snapshots</id>
23-
<name>OSGeo Nexus Snapshot Repository</name>
24-
<url>https://repo.osgeo.org/repository/snapshot/</url>
25-
<snapshots>
26-
<enabled>true</enabled>
27-
</snapshots>
28-
<releases>
29-
<enabled>false</enabled>
30-
</releases>
31-
</repository>
32-
</repositories>
12+
<properties>
13+
<gt.version>28-SNAPSHOT</gt.version>
14+
<groovy.version>3.0.12</groovy.version>
15+
</properties>
3316
<dependencies>
3417
<dependency>
3518
<groupId>no.ecc.vectortile</groupId>
@@ -342,13 +325,13 @@
342325
<dependency>
343326
<groupId>org.junit.jupiter</groupId>
344327
<artifactId>junit-jupiter</artifactId>
345-
<version>5.8.2</version>
328+
<version>5.9.1</version>
346329
<scope>test</scope>
347330
</dependency>
348331
<dependency>
349332
<groupId>com.squareup.okhttp3</groupId>
350333
<artifactId>mockwebserver</artifactId>
351-
<version>4.4.1</version>
334+
<version>4.10.0</version>
352335
<scope>test</scope>
353336
</dependency>
354337
</dependencies>
@@ -366,6 +349,7 @@
366349
</pluginRepository>
367350
</pluginRepositories>
368351
<build>
352+
<sourceDirectory>src/main/groovy</sourceDirectory>
369353
<resources>
370354
<resource>
371355
<directory>src/main/resources</directory>
@@ -381,7 +365,7 @@
381365
</plugin>
382366
<plugin>
383367
<artifactId>maven-compiler-plugin</artifactId>
384-
<version>3.8.1</version>
368+
<version>3.10.1</version>
385369
<configuration>
386370
<source>1.8</source>
387371
<target>1.8</target>
@@ -403,18 +387,37 @@
403387
<plugin>
404388
<groupId>org.apache.maven.plugins</groupId>
405389
<artifactId>maven-surefire-plugin</artifactId>
406-
<version>3.0.0-M5</version>
390+
<version>3.0.0-M7</version>
407391
<configuration>
408392
<forkMode>once</forkMode>
409-
<argLine>-Xms512m -Xmx1024m -XX:PermSize=256m -XX:MaxPermSize=1024m</argLine>
393+
<argLine>@{argLine} -Xms512m -Xmx1024m -XX:PermSize=256m -XX:MaxPermSize=1024m</argLine>
410394
<systemPropertyVariables>
411395
<org.geotools.referencing.forceXY>true</org.geotools.referencing.forceXY>
412396
</systemPropertyVariables>
413397
</configuration>
414398
</plugin>
399+
<plugin>
400+
<groupId>org.jacoco</groupId>
401+
<artifactId>jacoco-maven-plugin</artifactId>
402+
<version>0.8.8</version>
403+
<executions>
404+
<execution>
405+
<goals>
406+
<goal>prepare-agent</goal>
407+
</goals>
408+
</execution>
409+
<execution>
410+
<id>report</id>
411+
<phase>test</phase>
412+
<goals>
413+
<goal>report</goal>
414+
</goals>
415+
</execution>
416+
</executions>
417+
</plugin>
415418
<plugin>
416419
<artifactId>maven-antrun-plugin</artifactId>
417-
<version>3.0.0</version>
420+
<version>3.1.0</version>
418421
<executions>
419422
<execution>
420423
<phase>package</phase>
@@ -450,7 +453,7 @@
450453
<plugin>
451454
<groupId>org.apache.maven.plugins</groupId>
452455
<artifactId>maven-jar-plugin</artifactId>
453-
<version>3.2.0</version>
456+
<version>3.3.0</version>
454457
<configuration>
455458
<archive>
456459
<manifest>
@@ -461,7 +464,7 @@
461464
</plugin>
462465
<plugin>
463466
<artifactId>maven-assembly-plugin</artifactId>
464-
<version>3.3.0</version>
467+
<version>3.4.2</version>
465468
<configuration>
466469
<descriptors>
467470
<descriptor>src/assembly/dir.xml</descriptor>
@@ -481,7 +484,7 @@
481484
<plugin>
482485
<groupId>org.apache.maven.plugins</groupId>
483486
<artifactId>maven-shade-plugin</artifactId>
484-
<version>3.2.4</version>
487+
<version>3.4.0</version>
485488
<executions>
486489
<execution>
487490
<phase>package</phase>
@@ -528,17 +531,10 @@
528531
</execution>
529532
</executions>
530533
</plugin>
531-
<!-- Code quality: mvn codenarc:codenarc -->
532534
<plugin>
533-
<groupId>org.codehaus.mojo</groupId>
534-
<artifactId>codenarc-maven-plugin</artifactId>
535-
<version>0.22-1</version>
536-
</plugin>
537-
<!-- Test coverage: mvn cobertura:cobertura -->
538-
<plugin>
539-
<groupId>org.codehaus.mojo</groupId>
540-
<artifactId>cobertura-maven-plugin</artifactId>
541-
<version>2.5.1</version>
535+
<groupId>org.apache.maven.plugins</groupId>
536+
<artifactId>maven-site-plugin</artifactId>
537+
<version>3.12.1</version>
542538
</plugin>
543539
</plugins>
544540
<extensions>
@@ -552,41 +548,54 @@
552548
<reporting>
553549
<!-- mvn site -->
554550
<plugins>
555-
<plugin>
556-
<groupId>org.codehaus.mojo</groupId>
557-
<artifactId>codenarc-maven-plugin</artifactId>
558-
<version>0.22-1</version>
559-
</plugin>
560-
<plugin>
561-
<groupId>org.codehaus.mojo</groupId>
562-
<artifactId>cobertura-maven-plugin</artifactId>
563-
<version>2.7</version>
564-
<configuration>
565-
<formats>
566-
<format>html</format>
567-
<format>xml</format>
568-
</formats>
569-
</configuration>
570-
</plugin>
571551
<plugin>
572552
<groupId>org.apache.maven.plugins</groupId>
573553
<artifactId>maven-surefire-report-plugin</artifactId>
574-
<version>2.19.1</version>
554+
<version>3.0.0-M7</version>
555+
</plugin>
556+
<plugin>
557+
<groupId>org.jacoco</groupId>
558+
<artifactId>jacoco-maven-plugin</artifactId>
559+
<version>0.8.8</version>
560+
<reportSets>
561+
<reportSet>
562+
<reports>
563+
<report>report</report>
564+
</reports>
565+
</reportSet>
566+
</reportSets>
575567
</plugin>
576568
<plugin>
577569
<groupId>org.codehaus.mojo</groupId>
578570
<artifactId>versions-maven-plugin</artifactId>
579-
<version>2.3</version>
571+
<version>2.12.0</version>
580572
</plugin>
581573
</plugins>
582574
</reporting>
583-
<properties>
584-
<gt.version>28-SNAPSHOT</gt.version>
585-
<groovy.version>3.0.12</groovy.version>
586-
</properties>
587-
<name>geoscript groovy</name>
588-
<description>A groovy implementation of geoscript.</description>
589-
<url>http://geoscript.org/</url>
575+
<repositories>
576+
<repository>
577+
<id>osgeo-releases</id>
578+
<name>OSGeo Nexus Release Repository</name>
579+
<url>https://repo.osgeo.org/repository/release/</url>
580+
<snapshots>
581+
<enabled>false</enabled>
582+
</snapshots>
583+
<releases>
584+
<enabled>true</enabled>
585+
</releases>
586+
</repository>
587+
<repository>
588+
<id>osgeo-snapshots</id>
589+
<name>OSGeo Nexus Snapshot Repository</name>
590+
<url>https://repo.osgeo.org/repository/snapshot/</url>
591+
<snapshots>
592+
<enabled>true</enabled>
593+
</snapshots>
594+
<releases>
595+
<enabled>false</enabled>
596+
</releases>
597+
</repository>
598+
</repositories>
590599
<licenses>
591600
<license>
592601
<name>MIT</name>

0 commit comments

Comments
 (0)