Skip to content

Commit 86a807b

Browse files
tsmocktsmock
committed
Drop gradle and ivy
Signed-off-by: Taylor Smock <[email protected]>
1 parent 1be5a72 commit 86a807b

File tree

5 files changed

+124
-180
lines changed

5 files changed

+124
-180
lines changed

Diff for: ‎build.gradle

-147
This file was deleted.

Diff for: ‎build.xml

+8-13
Original file line numberDiff line numberDiff line change
@@ -2,19 +2,16 @@
22
<project xmlns:ivy="antlib:org.apache.ivy.ant" name="wikipedia" default="dist" basedir=".">
33
<property name="plugin.src.dir" value="src/main/java"/>
44
<property name="plugin.resources.dir" value="src/main/resources"/>
5-
65
<!-- edit the properties of this plugin in the file `gradle.properties` -->
7-
<property name="plugin.main.version " value=" 18877"/>
8-
<property name="plugin.canloadatruntime " value=" true"/>
9-
<property name="plugin.author " value=" floscher &lt;incoming+josm-plugin-wikipedia-6702380-issue-@incoming.gitlab.com&gt;, simon04"/>
10-
<property name="plugin.class " value=" org.wikipedia.WikipediaPlugin"/>
11-
<property name="plugin.icon " value=" images/dialogs/wikipedia.png"/>
12-
<property name="plugin.link " value=" https://josm.openstreetmap.de/wiki/Help/Plugin/Wikipedia"/>
13-
<property name="plugin.description " value=" Simplifies linking OSM objects to Wikipedia articles and Wikidata items"/>
14-
6+
<property name="plugin.main.version" value="18877"/>
7+
<property name="plugin.canloadatruntime" value="true"/>
8+
<property name="plugin.author" value="floscher &lt;incoming+josm-plugin-wikipedia-6702380-issue-@incoming.gitlab.com&gt;, simon04"/>
9+
<property name="plugin.class" value="org.wikipedia.WikipediaPlugin"/>
10+
<property name="plugin.icon" value="images/dialogs/wikipedia.png"/>
11+
<property name="plugin.link" value="https://josm.openstreetmap.de/wiki/Help/Plugin/Wikipedia"/>
12+
<property name="plugin.description" value="Simplifies linking OSM objects to Wikipedia articles and Wikidata items"/>
1513
<!-- ** include targets that all plugins have in common ** -->
1614
<import file="../build-common.xml"/>
17-
1815
<!-- Override the `setup-dist-default` task from build-common.xml -->
1916
<target name="setup-dist-default">
2017
<copy todir="${plugin.build.dir}" failonerror="no" includeemptydirs="no">
@@ -29,9 +26,7 @@
2926
</fileset>
3027
</copy>
3128
</target>
32-
3329
<target name="pre-compile" depends="fetch_dependencies">
34-
<!-- include fetch_dependencies task -->
30+
<!-- include fetch_dependencies task -->
3531
</target>
36-
3732
</project>

Diff for: ‎gradle.properties

-12
This file was deleted.

Diff for: ‎ivy.xml

-8
This file was deleted.

Diff for: ‎pom.xml

+116
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,116 @@
1+
<?xml version="1.0"?>
2+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
3+
<modelVersion>4.0.0</modelVersion>
4+
<parent>
5+
<groupId>org.openstreetmap.josm.plugins</groupId>
6+
<artifactId>plugin-root</artifactId>
7+
<version>SNAPSHOT</version>
8+
</parent>
9+
<artifactId>wikipedia</artifactId>
10+
<url>${plugin.link}</url>
11+
<developers>
12+
<developer>
13+
<id>floscher</id>
14+
</developer>
15+
<developer>
16+
<id>simon04</id>
17+
</developer>
18+
</developers>
19+
<properties>
20+
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
21+
<plugin.src.dir>${project.basedir}/src/main/java</plugin.src.dir>
22+
<plugin.resources.dir>${project.basedir}/src/main/resources</plugin.resources.dir>
23+
<plugin.main.version>18877</plugin.main.version>
24+
<plugin.canloadatruntime>true</plugin.canloadatruntime>
25+
<plugin.author>floscher &lt;incoming+josm-plugin-wikipedia-6702380-issue-@incoming.gitlab.com&gt;, simon04</plugin.author>
26+
<plugin.class>org.wikipedia.WikipediaPlugin</plugin.class>
27+
<plugin.icon>images/dialogs/wikipedia.png</plugin.icon>
28+
<plugin.link>https://josm.openstreetmap.de/wiki/Help/Plugin/Wikipedia</plugin.link>
29+
<plugin.description>Simplifies linking OSM objects to Wikipedia articles and Wikidata items</plugin.description>
30+
</properties>
31+
<dependencies>
32+
<dependency>
33+
<groupId>com.fasterxml.jackson.core</groupId>
34+
<artifactId>jackson-databind</artifactId>
35+
<version>2.15.3</version>
36+
<scope>compile</scope>
37+
</dependency>
38+
<dependency>
39+
<groupId>org.wikidata.wdtk</groupId>
40+
<artifactId>wdtk-wikibaseapi</artifactId>
41+
<version>0.11.1</version>
42+
<scope>compile</scope>
43+
</dependency>
44+
<dependency>
45+
<groupId>org.wikidata.wdtk</groupId>
46+
<artifactId>wdtk-dumpfiles</artifactId>
47+
<version>0.11.1</version>
48+
<scope>compile</scope>
49+
</dependency>
50+
<dependency>
51+
<groupId>org.wiremock</groupId>
52+
<artifactId>wiremock</artifactId>
53+
<scope>test</scope>
54+
</dependency>
55+
<dependency>
56+
<groupId>org.junit.platform</groupId>
57+
<artifactId>junit-platform-launcher</artifactId>
58+
<scope>test</scope>
59+
</dependency>
60+
<dependency>
61+
<groupId>org.junit.platform</groupId>
62+
<artifactId>junit-platform-suite</artifactId>
63+
<scope>test</scope>
64+
</dependency>
65+
<dependency>
66+
<groupId>org.junit.vintage</groupId>
67+
<artifactId>junit-vintage-engine</artifactId>
68+
<scope>test</scope>
69+
</dependency>
70+
<dependency>
71+
<groupId>org.junit.jupiter</groupId>
72+
<artifactId>junit-jupiter-params</artifactId>
73+
<scope>test</scope>
74+
</dependency>
75+
<dependency>
76+
<groupId>org.junit.jupiter</groupId>
77+
<artifactId>junit-jupiter-api</artifactId>
78+
<scope>test</scope>
79+
</dependency>
80+
<dependency>
81+
<groupId>org.junit.jupiter</groupId>
82+
<artifactId>junit-jupiter-engine</artifactId>
83+
<scope>test</scope>
84+
</dependency>
85+
<dependency>
86+
<groupId>org.junit.jupiter</groupId>
87+
<artifactId>junit-jupiter-migrationsupport</artifactId>
88+
<scope>test</scope>
89+
</dependency>
90+
<dependency>
91+
<groupId>org.jmockit</groupId>
92+
<artifactId>jmockit</artifactId>
93+
</dependency>
94+
<dependency>
95+
<groupId>org.awaitility</groupId>
96+
<artifactId>awaitility</artifactId>
97+
</dependency>
98+
</dependencies>
99+
<build>
100+
<plugins>
101+
<plugin>
102+
<groupId>org.apache.maven.plugins</groupId>
103+
<artifactId>maven-jar-plugin</artifactId>
104+
<configuration>
105+
<archive>
106+
<manifestEntries>
107+
<Plugin-Link>${plugin.link}</Plugin-Link>
108+
<Plugin-Canloadatruntime>${plugin.canloadatruntime}</Plugin-Canloadatruntime>
109+
<Plugin-Icon>${plugin.icon}</Plugin-Icon>
110+
</manifestEntries>
111+
</archive>
112+
</configuration>
113+
</plugin>
114+
</plugins>
115+
</build>
116+
</project>

0 commit comments

Comments
 (0)