Merge branch '7.0' into 7.1

# Conflicts:
#	loader/build.xml
#	loader/pom.xml

Author: michaeloffner

core/src/main/java/lucee/runtime/functions/system/GetSystemInfo.java

@@ -20,7 +20,6 @@
 
 import java.lang.management.ManagementFactory;
 import java.lang.management.OperatingSystemMXBean;
-import java.util.Map;
 
 import javax.management.Attribute;
 import javax.management.AttributeList;

core/src/main/java/lucee/runtime/tag/Admin.java

@@ -995,6 +995,7 @@ else if (addNonCFMLFiles) {
 			else {
 				filter = new ExtensionResourceFilter(true, true, false, new String[] { "class", "MF" });
 			}
+
 			String id = HashUtil.create64BitHashAsString(mapping.getStrPhysical(), Character.MAX_RADIX);
 			// String id = MD5.getDigestAsString(mapping.getStrPhysical());
 
@@ -1003,20 +1004,22 @@ else if (addNonCFMLFiles) {
 			else if (mappingType == MAPPING_CT) type = "ct";
 			else type = "regular";
 
-			String token = HashUtil.create64BitHashAsString(System.currentTimeMillis() + "", Character.MAX_RADIX);
+			// String token = HashUtil.create64BitHashAsString((System.currentTimeMillis() / 10000L) + "",
+			// Character.MAX_RADIX);
+			String qualifier = Caster.toString(System.currentTimeMillis() / 10000L);
 
 			// create manifest
 			Manifest mf = new Manifest();
 			// StringBuilder manifest=new StringBuilder();
 
 			// Write OSGi specific stuff
 			Attributes attrs = mf.getMainAttributes();
+			String bundleName = ListUtil.trim(mapping.getVirtual().replace('/', '.'), ".");
 			attrs.putValue("Bundle-ManifestVersion", Caster.toString(BundleBuilderFactory.MANIFEST_VERSION));
-			attrs.putValue("Bundle-SymbolicName", id);
-			attrs.putValue("Bundle-Name", ListUtil.trim(mapping.getVirtual().replace('/', '.'), "."));
+			attrs.putValue("Bundle-SymbolicName", "luceebundle." + bundleName);
+			attrs.putValue("Bundle-Name", bundleName);
 			attrs.putValue("Bundle-Description", "this is a " + type + " mapping generated by " + Constants.NAME + ".");
-			attrs.putValue("Bundle-Version", "1.0.0." + token);
-			// attrs.putValue("Import-Package","lucee.*");
+			attrs.putValue("Bundle-Version", "1.0.0." + qualifier);
 			attrs.putValue("Require-Bundle", "lucee.core");
 
 			// Mapping

loader/build.xml

@@ -2,7 +2,7 @@
 <project default="core" basedir="." name="Lucee" 
   xmlns:resolver="antlib:org.apache.maven.resolver.ant">
 
-  <property name="version" value="7.1.0.65-SNAPSHOT"/>
+  <property name="version" value="7.1.0.66-SNAPSHOT"/>
 
   <taskdef uri="antlib:org.apache.maven.resolver.ant" resource="org/apache/maven/resolver/ant/antlib.xml">
     <classpath>

loader/pom.xml

@@ -3,7 +3,7 @@
 
   <groupId>org.lucee</groupId>
   <artifactId>lucee</artifactId>
-  <version>7.1.0.65-SNAPSHOT</version>
+  <version>7.1.0.66-SNAPSHOT</version>
   <packaging>jar</packaging>
 
   <name>Lucee Loader Build</name>