Minor nonfunctional tweaks

- adjust version number - next stable would be 0.45.0 so current snapshot should be 0.44.1
- change default resolution repo to a virtual repo excluding a couple test repos
- allow user to override default resolution repo (separately from the Artifactory specific one)
- fix copy paste fun in PMD config
- adjust gradle.properties template

config/gradle/artifactory.gradle

@@ -27,16 +27,16 @@ buildscript {
 artifactory {
     contextUrl = 'http://artifactory.terasology.org/artifactory'
 
-    // This is the target for publishing artifacts
+    // This is the target for publishing artifacts. Unless testing locally usually the setting in Jenkins is used
     publish {
         repository {
             // The repoKey can be overridden in Jenkins and via local gradle.properties if desired for testing
             if (rootProject.hasProperty("artifactoryPublishRepo")) {
                 repoKey = artifactoryPublishRepo
-                println "setting PUBLISH repoKey to $artifactoryPublishRepo"
+                //println "setting PUBLISH repoKey to $artifactoryPublishRepo"
             } else {
                 repoKey = 'terasology-snapshot-local'
-                println "PUBLISH repoKey is terasology-snapshot-local"
+                //println "PUBLISH repoKey is terasology-snapshot-local"
             }
 
             // User and pass are overridden in Jenkins. You can supply your own for manual use in a local prop file, such as gradle.properties
@@ -53,16 +53,17 @@ artifactory {
         }
     }
 
-    // This is the source where we get dependencies
+    // This is the source where we get dependencies. Or it would be but it does not appear to work
+    // Only the main repositories {} seems to matter, and if commented out this still doesn't help
     resolve {
         repository {
             // The repoKey can be overridden in Jenkins and via local gradle.properties if desired for testing
             if (rootProject.hasProperty("artifactoryResolveRepo")) {
                 repoKey = artifactoryResolveRepo
-                println "setting RESOLVE repoKey to $artifactoryResolveRepo"
+                //println "setting RESOLVE repoKey to $artifactoryResolveRepo"
             } else {
-                repoKey = 'repo'
-                println "RESOLVE repoKey is repo"
+                repoKey = 'virtual-repo-live'
+                //println "RESOLVE repoKey is repo"
             }
         }
     }

config/gradle/common.gradle

@@ -12,7 +12,13 @@ apply plugin: 'findbugs'
 repositories {
     mavenCentral()
     maven {
-        url "http://artifactory.terasology.org/artifactory/repo"
+        if (rootProject.hasProperty("alternativeResolutionRepo")) {
+            // If the user supplies an alternative repo via gradle.properties then use that
+            url alternativeResolutionRepo
+        } else {
+            // Our default is the main virtual repo containing everything except repos for testing Artifactory itself
+            url "http://artifactory.terasology.org/artifactory/virtual-repo-live"
+        }
     }
 }
 

config/pmd/pmd.xml

@@ -1,10 +1,10 @@
 <?xml version="1.0"?>
-<ruleset name="TerasologyLauncher PMD ruleset"
+<ruleset name="Terasology PMD ruleset"
          xmlns="http://pmd.sourceforge.net/ruleset/2.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://pmd.sourceforge.net/ruleset/2.0.0 http://pmd.sourceforge.net/ruleset_2_0_0.xsd">
   <description>
-    TerasologyLauncher PMD ruleset
+    Terasology PMD ruleset
   </description>
   <rule ref="rulesets/java/basic.xml"/>
   <rule ref="rulesets/java/braces.xml"/>

engine-tests/src/test/resources/module.txt

@@ -1,6 +1,6 @@
 {
     "id" : "unittest",
-    "version" : "0.45.1",
+    "version" : "0.44.1",
     "displayName" : "Terasology Engine Test",
     "description" : "Engine unit test content"
 }

engine/src/main/resources/engine-module.txt

@@ -1,6 +1,6 @@
 {
     "id" : "engine",
-    "version" : "0.45.1",
+    "version" : "0.44.1",
     "displayName" : "Terasology Engine",
     "description" : "Core engine content"
 }

modules/Core/module.txt

@@ -1,6 +1,6 @@
 {
     "id" : "Core",
-    "version" : "0.45.1",
+    "version" : "0.44.1",
     "displayName" : "Core Gameplay",
     "description" : "This mandatory module introduces the core Terasology mechanics",
     "isGameplay" : "true",

templates/gradle.properties

@@ -1,13 +1,16 @@
+# Alternative resolution repo to use in general (not an Artifactory setting, but a more general Maven repo definition)
+# alternativeResolutionRepo=http://artifactory.terasology.org/artifactory/virtual-nanoware-and-remote
+
 # Credentials for publishing to Artifactory. Good for local testing
 # artifactoryUser=
 # artifactoryPass=
 
-# Where to publish artifacts, if not to the default snapshop/release repos
+# Where to publish artifacts, if not to the default snapshot/release repos
 # Publishing a snapshot to a release-only repo will get an intended but quirky HTTP 409 Conflict error as of Nov 2014
 # artifactoryPublishRepo=nanoware-snapshot-local
 
-# Where to resolve dependencies, default is a release repo where no snapshot builds are allowed.
-# Uncomment this and set it to a repo (like the default snapshot repo) to allow use of dependencies from there
+# Where to resolve dependencies, default is a virtual repo covering everything except the nanoware test repos
+# Varying this doesn't seem to do anything (nor in Jenkins) as the regular repositories {} only appears to matter
 # artifactoryResolveRepo=nanoware-snapshot-local
 
 # Details for code signing. Naturally these are secret and not committed :-)