Skip to content

Commit e6bb1d1

Browse files
committed
unify maven build with other plugins
1 parent abb2c72 commit e6bb1d1

3 files changed

Lines changed: 24 additions & 98 deletions

File tree

.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,5 @@
88
/checkstyle-josm-pt_assistant.xml
99
/bintest/
1010
/target
11-
/test/build
11+
/test/build/
12+
/test/config/

pom.xml

Lines changed: 22 additions & 95 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,24 @@
11
<?xml version="1.0"?>
22
<project xmlns="http://maven.apache.org/POM/4.0.0">
33
<modelVersion>4.0.0</modelVersion>
4-
<groupId>org.openstreetmap.josm.plugins</groupId>
4+
<parent>
5+
<groupId>org.openstreetmap.josm.plugins</groupId>
6+
<artifactId>plugin-root</artifactId>
7+
<version>1.0-SNAPSHOT</version>
8+
</parent>
59
<artifactId>pt_assistant</artifactId>
610
<version>1.0-SNAPSHOT</version>
711
<properties>
8-
<jmockit.version>1.49.a</jmockit.version>
9-
<pmd.version>7.5.0</pmd.version>
10-
<jacoco.version>0.8.12</jacoco.version>
11-
<checkstyle.version>10.18.1</checkstyle.version>
12-
<spotbugs.version>4.8.6</spotbugs.version>
12+
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
13+
<plugin.src.dir>src/main/java</plugin.src.dir>
14+
<plugin.main.version>19044</plugin.main.version>
15+
<plugin.author>Biswesh Mohapatra &lt;biswesh123@gmail.com&gt;, simon04, Rodion Scherbakov</plugin.author>
16+
<plugin.class>org.openstreetmap.josm.plugins.pt_assistant.PTAssistantPlugin</plugin.class>
17+
<plugin.description>Provides validation and fixing for public transport route according to version 2 of the public transport schema</plugin.description>
18+
<plugin.icon>images/bus.svg</plugin.icon>
19+
<plugin.link>https://wiki.openstreetmap.org/wiki/JOSM/Plugins/PT_Assistant</plugin.link>
20+
<plugin.canloadatruntime>true</plugin.canloadatruntime>
1321
</properties>
14-
<repositories>
15-
<repository>
16-
<id>JOSM-public</id>
17-
<url>https://josm.openstreetmap.de/repository/public/</url>
18-
</repository>
19-
</repositories>
2022
<dependencyManagement>
2123
<dependencies>
2224
<dependency>
@@ -102,93 +104,18 @@
102104
</dependency>
103105
</dependencies>
104106
<build>
105-
<testSourceDirectory>test/unit</testSourceDirectory>
106-
<testResources>
107-
<testResource>
108-
<directory>test/data</directory>
109-
</testResource>
110-
</testResources>
111107
<plugins>
112108
<plugin>
113109
<groupId>org.apache.maven.plugins</groupId>
114-
<artifactId>maven-compiler-plugin</artifactId>
115-
<version>3.13.0</version>
110+
<artifactId>maven-jar-plugin</artifactId>
116111
<configuration>
117-
<release>11</release>
118-
</configuration>
119-
</plugin>
120-
<plugin>
121-
<groupId>com.diffplug.spotless</groupId>
122-
<artifactId>spotless-maven-plugin</artifactId>
123-
<version>2.43.0</version>
124-
<configuration>
125-
<java>
126-
<eclipse>
127-
<version>4.21</version>
128-
<file>${project.basedir}/../00_core_tools/eclipse/formatter.xml</file>
129-
</eclipse>
130-
<removeUnusedImports/>
131-
<licenseHeader>
132-
<content>// License: GPL. For details, see LICENSE file.</content>
133-
</licenseHeader>
134-
<includes>
135-
<include>src/main/java/**/*.java</include>
136-
<include>test/unit/**/*.java</include>
137-
<include>test/integration/**/*.java</include>
138-
</includes>
139-
</java>
140-
</configuration>
141-
<executions>
142-
<execution>
143-
<goals>
144-
<goal>check</goal>
145-
</goals>
146-
</execution>
147-
</executions>
148-
</plugin>
149-
<plugin>
150-
<groupId>org.apache.maven.plugins</groupId>
151-
<artifactId>maven-enforcer-plugin</artifactId>
152-
<version>3.5.0</version>
153-
<executions>
154-
<execution>
155-
<id>enforce-maven</id>
156-
<goals>
157-
<goal>enforce</goal>
158-
</goals>
159-
</execution>
160-
</executions>
161-
<configuration>
162-
<rules>
163-
<requireMavenVersion>
164-
<version>3.6.3</version>
165-
</requireMavenVersion>
166-
</rules>
167-
</configuration>
168-
</plugin>
169-
<!-- Configure the test plugin, specifically enable autodetection of global extensions -->
170-
<plugin>
171-
<artifactId>maven-surefire-plugin</artifactId>
172-
<version>3.2.5</version>
173-
<configuration>
174-
<skipAfterFailureCount>1</skipAfterFailureCount>
175-
<argLine>-javaagent:"${settings.localRepository}"/org/jmockit/jmockit/${jmockit.version}/jmockit-${jmockit.version}.jar</argLine>
176-
<properties>
177-
<configurationParameters>
178-
file.encoding = UTF-8
179-
java.locale.providers = SPI,CLDR
180-
junit.jupiter.extensions.autodetection.enabled = true
181-
junit.jupiter.execution.parallel.enabled = true
182-
</configurationParameters>
183-
</properties>
184-
<systemPropertyVariables>
185-
<josm.home>test/build/config/josm.home</josm.home>
186-
<josm.test.data>test/resources</josm.test.data>
187-
<java.awt.headless>true</java.awt.headless>
188-
<glass.platform>Monocle</glass.platform>
189-
<monocle.platform>Headless</monocle.platform>
190-
<prism.order>sw</prism.order>
191-
</systemPropertyVariables>
112+
<archive>
113+
<manifestEntries>
114+
<Plugin-Link>${plugin.link}</Plugin-Link>
115+
<Plugin-Icon>${plugin.icon}</Plugin-Icon>
116+
<Plugin-Canloadatruntime>${plugin.canloadatruntime}</Plugin-Canloadatruntime>
117+
</manifestEntries>
118+
</archive>
192119
</configuration>
193120
</plugin>
194121
</plugins>

src/main/java/org/openstreetmap/josm/plugins/pt_assistant/validation/NodeChecker.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -92,8 +92,6 @@ protected void performPlatformPartOfWayTest() {
9292

9393
/**
9494
* Checks if the given stop_position node belongs to any stop_area relation
95-
*
96-
* @author xamanu
9795
*/
9896
protected void performNodePartOfStopAreaTest() {
9997

0 commit comments

Comments
 (0)