Merge remote branch 'upstream/master'

pom.xml

@@ -2,7 +2,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.dynmap</groupId>
   <artifactId>dynmap</artifactId>
-  <version>0.22</version>
+  <version>0.23</version>
   <name>dynmap</name>
     <properties>
        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -13,6 +13,24 @@
   	<url>https://github.com/FrozenCow/dynmap/issues</url>
   </issueManagement>
   <build>
+	  <resources>
+		<resource>
+		  <directory>src/main/resources</directory>
+		  <filtering>true</filtering>
+		  <includes>
+			<include>*.yml</include>
+			<include>*.txt</include>
+		  </includes>
+		</resource>
+		<resource>
+		  <directory>src/main/resources</directory>
+		  <filtering>false</filtering>
+		  <excludes>
+			<exclude>*.yml</exclude>
+			<exclude>*.txt</exclude>
+		  </excludes>
+		</resource>
+	  </resources>
       <plugins>
           <plugin>
               <groupId>org.apache.maven.plugins</groupId>

src/main/assembly/package.xml

@@ -15,9 +15,20 @@
         <include>CHANGELOG*</include>
       </includes>
     </fileSet>
+    <fileSet>
+      <directory>${project.basedir}/web/</directory>
+      <outputDirectory>/dynmap/web/</outputDirectory>
+	  <includes>
+		<include>version.js</include>
+	  </includes>
+      <filtered>true</filtered>
+    </fileSet>
     <fileSet>
       <directory>${project.basedir}/web</directory>
       <outputDirectory>/dynmap/web</outputDirectory>
+	  <excludes>
+		<exclude>version.js</exclude>
+	  </excludes>
     </fileSet>
     <fileSet>
       <directory>${project.basedir}/colorschemes</directory>
@@ -32,7 +43,9 @@
   </fileSets>
   <files>
   	<file>
-  		<source>${project.build.directory}/${artifactId}-${version}.jar</source>
+  	  <source>${project.build.directory}/${artifactId}-${version}.jar</source>
-  		<outputDirectory>/</outputDirectory>
+  	  <outputDirectory>/</outputDirectory>
-  		<destName>dynmap.jar</destName></file></files>
+  	  <destName>dynmap.jar</destName>
+	</file>
+  </files>
 </assembly>

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

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

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
-            
+            

web/index.html

@@ -27,6 +27,7 @@
 	<link rel="stylesheet" type="text/css" href="css/dynmap_style.css" media="screen" />
 	<!-- <link rel="stylesheet" type="text/css" href="css/override.css" media="screen" /> -->
 
+	<script type="text/javascript" src="version.js"></script>
 	<script type="text/javascript" src="js/jquery.json.js"></script>
 	<script type="text/javascript" src="js/jquery.mousewheel.js"></script>
 	<script type="text/javascript" src="js/minecraft.js"></script>

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'...

web/version.js

@@ -0,0 +1 @@
+var dynmapversion = "${project.version}";