Skip to content

Commit 9c32c40

Browse files
committed
small fixes to build, pom.xml still does not generate full manifest - parent is missing
1 parent 286e621 commit 9c32c40

2 files changed

Lines changed: 27 additions & 4 deletions

File tree

‎build.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,13 @@
44
<property name="plugin.test.dir" value="src/test"/>
55
<property name="plugin.resources.dir" value="src/main/resources"/>
66

7-
<!-- edit the properties of this plugin in the file `gradle.properties` -->
8-
<property file="${basedir}/gradle.properties"/>
97
<property name="plugin.main.version" value="19067" />
108
<property name="plugin.compile.version" value="19067" />
119
<property name="plugin.canloadatruntime" value="true" />
1210
<property name="plugin.author" value="Taylor Smock" />
1311
<property name="plugin.class" value="org.openstreetmap.josm.plugins.mapwithai.MapWithAIPlugin" />
1412
<property name="plugin.icon" value="images/dialogs/mapwithai.svg" />
1513
<property name="plugin.link" value="https://github.com/JOSM/MapWithAI" />
16-
<property name="plugin.minimum.java.version" value="17" />
1714
<property name="plugin.description" value="Allows the use of MapWithAI data in JOSM (same data as used in RapiD)" />
1815

1916
<property name="plugin.requires" value="pmtiles;utilsplugin2" />
@@ -29,6 +26,9 @@
2926
<copy todir="${plugin.build.dir}" failonerror="no" includeemptydirs="no">
3027
<fileset dir="${plugin.resources.dir}"/>
3128
</copy>
29+
<copy todir="${plugin.build.dir}/data" failonerror="no" includeemptydirs="no">
30+
<fileset dir="data"/>
31+
</copy>
3232
<copy todir="${plugin.build.dir}">
3333
<fileset dir=".">
3434
<include name="README"/>

‎pom.xml‎

Lines changed: 24 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,16 @@
99
<jacoco.version>0.8.12</jacoco.version>
1010
<checkstyle.version>10.18.1</checkstyle.version>
1111
<spotbugs.version>4.8.6</spotbugs.version>
12+
<plugin.main.version>19067</plugin.main.version>
13+
<plugin.author>Taylor Smock</plugin.author>
14+
<plugin.class>org.openstreetmap.josm.plugins.mapwithai.MapWithAIPlugin</plugin.class>
15+
<plugin.description>Allows the use of MapWithAI data in JOSM (same data as used in RapiD)</plugin.description>
16+
<plugin.icon>images/dialogs/mapwithai.svg</plugin.icon>
17+
<plugin.link>https://github.com/JOSM/MapWithAI</plugin.link>
18+
<plugin.canloadatruntime>true</plugin.canloadatruntime>
19+
<plugin.requires>pmtiles;utilsplugin2</plugin.requires>
20+
<plugin.minimum.java.version>17</plugin.minimum.java.version>
21+
<java.lang.version>17</java.lang.version>
1222
</properties>
1323
<repositories>
1424
<repository>
@@ -188,6 +198,19 @@
188198
</systemPropertyVariables>
189199
</configuration>
190200
</plugin>
191-
</plugins>
201+
<plugin>
202+
<groupId>org.apache.maven.plugins</groupId>
203+
<artifactId>maven-jar-plugin</artifactId>
204+
<configuration>
205+
<archive>
206+
<manifestEntries>
207+
<Plugin-Link>${plugin.link}</Plugin-Link>
208+
<Plugin-Icon>${plugin.icon}</Plugin-Icon>
209+
<Plugin-Canloadatruntime>${plugin.canloadatruntime}</Plugin-Canloadatruntime>
210+
</manifestEntries>
211+
</archive>
212+
</configuration>
213+
</plugin>
214+
</plugins>
192215
</build>
193216
</project>

0 commit comments

Comments
 (0)