diff --git a/pom.xml b/pom.xml index b7ce19e0..64e71e5c 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 org.dynmap dynmap - 0.22 + 0.23 dynmap UTF-8 @@ -13,6 +13,24 @@ https://github.com/FrozenCow/dynmap/issues + + + src/main/resources + true + + *.yml + *.txt + + + + src/main/resources + false + + *.yml + *.txt + + + org.apache.maven.plugins diff --git a/src/main/assembly/package.xml b/src/main/assembly/package.xml index b11688c4..ad84a28f 100644 --- a/src/main/assembly/package.xml +++ b/src/main/assembly/package.xml @@ -15,9 +15,20 @@ CHANGELOG* + + ${project.basedir}/web/ + /dynmap/web/ + + version.js + + true + ${project.basedir}/web /dynmap/web + + version.js + ${project.basedir}/colorschemes @@ -32,7 +43,9 @@ - ${project.build.directory}/${artifactId}-${version}.jar - / - dynmap.jar + ${project.build.directory}/${artifactId}-${version}.jar + / + dynmap.jar + + diff --git a/src/main/resources/lightings.txt b/src/main/resources/lightings.txt index a5f6c97e..935cd856 100644 --- a/src/main/resources/lightings.txt +++ b/src/main/resources/lightings.txt @@ -1,4 +1,4 @@ -version: 0.22 +version: ${project.version} # # This file contains default standard lighting profiles. The contents of this file CAN need to be replaced and updated # during upgrades, so new or updated lighting definitions should be done in the custom-lightings.txt file diff --git a/src/main/resources/perspectives.txt b/src/main/resources/perspectives.txt index 0fc3ca84..47407b31 100644 --- a/src/main/resources/perspectives.txt +++ b/src/main/resources/perspectives.txt @@ -1,4 +1,4 @@ -version: 0.22 +version: ${project.version} # # This file contains default standard perspective definitions. The contents of this file CAN need to be replaced and updated # during upgrades, so new or updated perspective definitions should be done in the custom-perspectives.txt file diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml index 8a45511e..04ef011e 100644 --- a/src/main/resources/plugin.yml +++ b/src/main/resources/plugin.yml @@ -1,6 +1,6 @@ name: dynmap main: org.dynmap.DynmapPlugin -version: "0.22" +version: "${project.version}" authors: [FrozenCow, mikeprimm, zeeZ] softdepend: [Permissions] commands: @@ -139,4 +139,4 @@ permissions: dynmap.marker.addicon: description: Allows /dmarker addicon default: op - \ No newline at end of file + diff --git a/web/index.html b/web/index.html index ba399cf9..d7e54ae0 100644 --- a/web/index.html +++ b/web/index.html @@ -27,6 +27,7 @@ + diff --git a/web/js/map.js b/web/js/map.js index 9d1250cd..1fb8378f 100644 --- a/web/js/map.js +++ b/web/js/map.js @@ -1,7 +1,6 @@ "use strict"; //if (!console) console = { log: function() {} }; -var dynmapversion = "0.22"; // This needs to match plugin verison var componentconstructors = {}; var maptypes = {}; var map = null; // Leaflet assumes top-level 'map'... diff --git a/web/version.js b/web/version.js new file mode 100644 index 00000000..463dc200 --- /dev/null +++ b/web/version.js @@ -0,0 +1 @@ +var dynmapversion = "${project.version}"; \ No newline at end of file