From 83b4725abad87ac84037926257634d03c1a061d5 Mon Sep 17 00:00:00 2001
From: nemonik <github.com@nemonik.com>
Date: Tue, 5 May 2015 14:19:46 -0400
Subject: [PATCH 01/43] remove resource from wrong path

---
 .../java/org/mitre/stix/examples/sample.xml   | 49 -------------------
 1 file changed, 49 deletions(-)
 delete mode 100755 src/main/java/org/mitre/stix/examples/sample.xml

diff --git a/src/main/java/org/mitre/stix/examples/sample.xml b/src/main/java/org/mitre/stix/examples/sample.xml
deleted file mode 100755
index 0e6f46a..0000000
--- a/src/main/java/org/mitre/stix/examples/sample.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<!--
-STIX IP Watchlist Example
-
-Copyright (c) 2015, The MITRE Corporation. All rights reserved.
-The contents of this file are subject to the terms of the STIX License located at http://stix.mitre.org/about/termsofuse.html.
-
-This example demonstrates a simple usage of STIX to represent a list of IP address indicators (watchlist of IP addresses). Cyber operations and malware analysis centers often share a list of suspected malicious IP addresses with information about what those IPs might indicate. This STIX package represents a list of three IP addresses with a short dummy description of what they represent.
-
-It demonstrates the use of:
-
-* STIX Indicators
-* CybOX within STIX
-* The CybOX Address Object (IP)
-* CybOX Patterns (apply_condition="ANY")
-* Controlled vocabularies
-
-Created by Mark Davidson
--->
-<stix:STIX_Package
-xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-xmlns:stix="http://stix.mitre.org/stix-1"
-xmlns:indicator="http://stix.mitre.org/Indicator-2"
-xmlns:cybox="http://cybox.mitre.org/cybox-2"
-xmlns:AddressObject="http://cybox.mitre.org/objects#AddressObject-2"
-xmlns:cyboxVocabs="http://cybox.mitre.org/default_vocabularies-2"
-xmlns:stixVocabs="http://stix.mitre.org/default_vocabularies-1"
-xmlns:example="http://example.com/"
-id="example:STIXPackage-33fe3b22-0201-47cf-85d0-97c02164528d"
-timestamp="2014-05-08T09:00:00.000000Z"
-version="1.1.1">
-	<stix:STIX_Header>
-		<stix:Title>Example watchlist that contains IP information.</stix:Title>
-		<stix:Package_Intent xsi:type="stixVocabs:PackageIntentVocab-1.0">Indicators - Watchlist</stix:Package_Intent>
-	</stix:STIX_Header>
-	<stix:Indicators>
-		<stix:Indicator xsi:type="indicator:IndicatorType" id="example:Indicator-33fe3b22-0201-47cf-85d0-97c02164528d" timestamp="2014-05-08T09:00:00.000000Z">
-			<indicator:Type xsi:type="stixVocabs:IndicatorTypeVocab-1.1">IP Watchlist</indicator:Type>
-			<indicator:Description>Sample IP Address Indicator for this watchlist. This contains one indicator with a set of three IP addresses in the watchlist.</indicator:Description>
-			<indicator:Observable  id="example:Observable-1c798262-a4cd-434d-a958-884d6980c459">
-				<cybox:Object id="example:Object-1980ce43-8e03-490b-863a-ea404d12242e">
-					<cybox:Properties xsi:type="AddressObject:AddressObjectType" category="ipv4-addr">
-						<AddressObject:Address_Value condition="Equals" apply_condition="ANY">10.0.0.0##comma##10.0.0.1##comma##10.0.0.2</AddressObject:Address_Value>
-					</cybox:Properties>
-				</cybox:Object>
-			</indicator:Observable>
-		</stix:Indicator>
-	</stix:Indicators>
-</stix:STIX_Package>
-

From 8ff5115ce871716145c7ea17677c2e79c42210cf Mon Sep 17 00:00:00 2001
From: nemonik <github.com@nemonik.com>
Date: Tue, 5 May 2015 14:39:58 -0400
Subject: [PATCH 02/43] DOC: Switched to Travis CI and CircleCi and badges for
 v1.1.1

---
 README.MD | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.MD b/README.MD
index b01b0d9..f362ef4 100644
--- a/README.MD
+++ b/README.MD
@@ -7,7 +7,7 @@ java-stix is being developed under the official [STIXProject][stix project]
 
 For more information, see [http://stix.mitre.org/][stix].
 
-[![Circle CI](https://circleci.com/gh/STIXProject/java-stix.svg?style=svg)](https://circleci.com/gh/STIXProject/java-stix) [![Build Status](https://travis-ci.org/STIXProject/java-stix.svg)](https://travis-ci.org/STIXProject/java-stix)
+[![Circle CI](https://circleci.com/gh/STIXProject/java-stix/tree/v1.1.1.svg?style=svg)](https://circleci.com/gh/STIXProject/java-stix/tree/v1.1.1) [![Build Status](https://travis-ci.org/STIXProject/java-stix.svg?branch=v1.1.1)](https://travis-ci.org/STIXProject/java-stix)
 
 ## <a name="overview"></a>Overview
 

From 0809793522de9a8a9bba381cdf102dfc19cb024c Mon Sep 17 00:00:00 2001
From: nemonik <github.com@nemonik.com>
Date: Thu, 7 May 2015 00:24:22 -0400
Subject: [PATCH 03/43] refactoring to allow signing to actually work correctly

---
 build.gradle                                  | 163 ++++++++++--------
 .../org/mitre/stix/DocumentUtilities.java     |   2 +-
 2 files changed, 93 insertions(+), 72 deletions(-)

diff --git a/build.gradle b/build.gradle
index 7fb0e90..31c8271 100644
--- a/build.gradle
+++ b/build.gradle
@@ -8,13 +8,34 @@
  *
  * Run
  *
- *	gradle
+ *	./gradlew
  *
  * from the commnand-line and the build task will execute by default.
  *
  * The Jar will be built to 
  *
  * 	build/libs/stix-${version}.jar
+ * 
+ *
+ * Publishing archives:
+ *
+ * signingKeyId, signingPassword, secretKeyFile, ossrhUsername, and ossrhPassword properties
+ * should be defined outside of the repository either on the command-line via
+ * 
+ * ./gradlew -PsigningKeyId=value -PsigningPassword=value -PsecretKeyFile=value -PossrhUsername=value -PossrhPassword=value
+ *
+ * or via ~/.gradle/gradle.properties as 
+ *
+ * signingKeyId=value
+ * signingPassword=value
+ * secretKeyFile=value
+ * ossrhUsername=value
+ * ossrhPassword=value
+ *
+ * Check settings via:
+ *
+ * ./gradle checkProperties
+ *
  */
 
 import org.gradle.plugins.signing.Sign
@@ -73,7 +94,7 @@ task calcChecksum(type: CalcChecksumTask) {
 compileJava.dependsOn createPackageInfo
 
 task wrapper(type: Wrapper) {
-	gradleVersion = '2.3'
+	gradleVersion = '2.4'
 }
 
 task javadocJar(type: Jar) {
@@ -89,6 +110,31 @@ task sourcesJar(type: Jar, dependsOn: javadoc) {
 	from sourceSets.main.allSource
 }
 
+gradle.taskGraph.whenReady { taskGraph ->
+	if (taskGraph.allTasks.any { it instanceof Sign}) {
+		allprojects {
+			ext."signing.keyId" = signingKeyId ?: ""
+			ext."signing.password" = signingPassword ?: ""
+			ext."signing.secretKeyRingFile" = secretKeyFile ?: ""
+		}
+	}
+}
+
+task checkProperties() {
+	println "signingKeyId ${signingKeyId ? '= ' + signingKeyId : 'is not set.'}" 
+	println "signingPassword ${signingPassword ? '= ' + signingPassword : 'is not set.'}"
+	println "secretKeyFile ${secretKeyFile ? '= ' + secretKeyFile : 'is not set.'}"
+	println "ossrhUsername ${ossrhUsername ? '= ' + ossrhUsername : 'is not set.'}"
+	println "ossrhPassword ${ossrhPassword ?'= ' +  ossrhPassword : 'is not set.'}"
+}
+
+signing {
+	required {
+		!version.contains("SNAPSHOT") && gradle.taskGraph.hasTask("uploadArchives")
+	}
+	sign configurations.archives
+}
+
 clean {
 	delete("src/generated/java")
 	delete("src/main/resources/namespace-prefix.xjb")
@@ -141,74 +187,48 @@ jar {
 	from 'LICENSE'
 }
 
-gradle.taskGraph.whenReady { taskGraph ->
-	if (taskGraph.allTasks.any { it instanceof Upload }) {
-		allprojects {
-			// signingKeyId, signingPassword, secretKeyFile, ossrhUsername, ossrhPassword
-			// should be define out of the repository either on the command-line via
-			//
-			// gradle -DsigningKeyId=value -DsigningPassword=value -DsecretKeyFile=value -DossrhUsername=value -DossrhPassword=value
-			//
-			// or via ~/.gradle/gradle.properties as 
-			//
-			// systemProp.signingKeyId=value
-			// systemProp.signingPassword=value
-			// systemProp.secretKeyFile=value
-			// systemProp.ossrhUsername=value
-			// systemProp.ossrhPassword=value
-			
-			ext."signing.keyId" = System.properties["signingKeyId"]
-			ext."signing.password" = System.properties["signingPassword"]
-			ext."signing.secretKeyRingFile" = System.properties["secretKeyFile"]
-			
-			ext."ossrhUsername" = System.properties["ossrhUsername"]
-			ext."ossrhPassword" = System.properties["ossrhPassword"]
-			
-			signing {
-				sign configurations.archives
-			}
-			
-			uploadArchives {
-				repositories {
-					mavenDeployer {
-						beforeDeployment { MavenDeployment deployment -> signing.signPom(deployment) }
-						
-						repository(url: "https://oss.sonatype.org/service/local/staging/deploy/maven2/") {
-							authentication(userName: ossrhUsername, password: ossrhPassword)
-						}
-						
-						snapshotRepository(url: "https://oss.sonatype.org/content/repositories/snapshots/") {
-							authentication(userName: ossrhUsername, password: ossrhPassword)
+afterEvaluate { project -> 
+	uploadArchives {
+		repositories {
+			mavenDeployer {
+				beforeDeployment { MavenDeployment deployment -> 
+					signing.signPom(deployment)
+				}
+	
+				repository(url: "https://oss.sonatype.org/service/local/staging/deploy/maven2/") {
+					authentication(userName: ossrhUsername ?: "", password: ossrhPassword ?: "")
+				}
+				
+				snapshotRepository(url: "https://oss.sonatype.org/content/repositories/snapshots/") {
+					authentication(userName: ossrhUsername ?: "", password: ossrhPassword ?: "")
+				}
+				
+				pom.project {
+					name "${archivesBaseName}"
+					packaging 'jar'
+					version "${project.version}"
+					// optionally artifactId can be defined here 
+					description "The JAXB Bindings for STIX v." + version
+					url "https://github.com/nemonik/java_stix"
+					
+					scm {
+						connection "https://github.com/nemonik/java_stix.git"
+						developerConnection "https://github.com/nemonik/java_stix.git"
+						url "https://github.com/nemonik/java_stix"
+					}
+					
+					licenses {
+						license {
+							name "The BSD 3-Clause License"
+							url "https://raw.githubusercontent.com/nemonik/java_stix/master/LICENSE"
 						}
-						
-						pom.project {
-							name 'stix'
-							packaging 'jar'
-							version "${project.version}"
-							// optionally artifactId can be defined here 
-							description "The JAXB Bindings for STIX v." + version
-							url "https://github.com/nemonik/java_stix"
-							
-							scm {
-								connection "https://github.com/nemonik/java_stix.git"
-								developerConnection "https://github.com/nemonik/java_stix.git"
-								url "https://github.com/nemonik/java_stix"
-							}
-							
-							licenses {
-								license {
-									name "The BSD 3-Clause License"
-									url "https://raw.githubusercontent.com/nemonik/java_stix/master/LICENSE"
-								}
-							}
-							
-							developers {
-								developer {
-									id 'nemonik'
-									name 'Michael Joseph Walsh'
-									email 'java-stix-pom[ASCII character number 64]nemonik.com'
-								}
-							}
+					}
+					
+					developers {
+						developer {
+							id 'nemonik'
+							name 'Michael Joseph Walsh'
+							email 'java-stix-pom[ASCII character number 64]nemonik.com'
 						}
 					}
 				}
@@ -251,7 +271,9 @@ if (JavaVersion.current().isJava8Compatible()) {
 }
 
 artifacts {
-	archives javadocJar, sourcesJar
+	archives jar
+	archives sourcesJar
+	archives javadocJar
 }
 
 buildscript {
@@ -264,7 +286,6 @@ buildscript {
 	}
 
 	dependencies {
-		
 		// Needed for GeneratedSourceTransformationTask
 		classpath name: "org.eclipse.core.runtime_3.10.0.v20140318-2214"
 		classpath name: "org.eclipse.osgi_3.10.0.v20140606-1445"
diff --git a/src/main/java/org/mitre/stix/DocumentUtilities.java b/src/main/java/org/mitre/stix/DocumentUtilities.java
index 9481be9..2393dc7 100644
--- a/src/main/java/org/mitre/stix/DocumentUtilities.java
+++ b/src/main/java/org/mitre/stix/DocumentUtilities.java
@@ -76,7 +76,7 @@ public static Document toDocument(JAXBElement<?> jaxbElement) {
 	 *            JAXB representation of an XML Element
 	 * @param prettyPrint
 	 *            True for pretty print, otherwise false
-	 * @return
+	 * @return The Document representation
 	 */
 	public static Document toDocument(JAXBElement<?> jaxbElement,
 			boolean prettyPrint) {

From 85cb3a9a6c37818af44aea9a6d1b22c9eb317a21 Mon Sep 17 00:00:00 2001
From: nemonik <github.com@nemonik.com>
Date: Thu, 7 May 2015 14:40:24 -0400
Subject: [PATCH 04/43] fixed CI issues and signing

---
 .travis.yml  |  3 +++
 README.MD    | 32 +++++++++++++++++---------------
 build.gradle | 43 ++++++++++++++++++++++++++-----------------
 circle.yml   |  4 ++++
 4 files changed, 50 insertions(+), 32 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 709b707..39e3908 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,3 +8,6 @@ before_install:
 
 env: GRADLE_OPTS=-Dorg.gradle.daemon=true
 env: CI_OPTS=--stacktrace
+
+install: /bin/true
+script: "./gradlew build -x signArchives"
\ No newline at end of file
diff --git a/README.MD b/README.MD
index f362ef4..42fab23 100644
--- a/README.MD
+++ b/README.MD
@@ -7,7 +7,7 @@ java-stix is being developed under the official [STIXProject][stix project]
 
 For more information, see [http://stix.mitre.org/][stix].
 
-[![Circle CI](https://circleci.com/gh/STIXProject/java-stix/tree/v1.1.1.svg?style=svg)](https://circleci.com/gh/STIXProject/java-stix/tree/v1.1.1) [![Build Status](https://travis-ci.org/STIXProject/java-stix.svg?branch=v1.1.1)](https://travis-ci.org/STIXProject/java-stix)
+[![Circle CI](https://circleci.com/gh/STIXProject/java-stix.svg?style=svg)](https://circleci.com/gh/STIXProject/java-stix) [![Build Status](https://travis-ci.org/STIXProject/java-stix.svg)](https://travis-ci.org/STIXProject/java-stix)
 
 ## <a name="overview"></a>Overview
 
@@ -157,27 +157,30 @@ First change directories into the project and enter on the command-line:
 
 	./gradlew
 
-as `build` is the default Gradle task.
+as `jar` is the default Gradle task.  To run the `build` and skip signing jars,
+do the following
+
+	./gradlew build -x signArchives
 
 After the Gradle wrapper shell script has downloaded and cached the Gradle 
 binary distribution, a successful build will look like something like this 
 on UNIX:
 
-	➜  java_stix git:(master) ./gradlew
+	➜  java_stix git:(master) ✗ gradle build -x signArchives
 	:buildSrc:compileJava UP-TO-DATE
-	:buildSrc:compileGroovy
+	:buildSrc:compileGroovy UP-TO-DATE
 	:buildSrc:processResources UP-TO-DATE
-	:buildSrc:classes
-	:buildSrc:jar
-	:buildSrc:assemble
+	:buildSrc:classes UP-TO-DATE
+	:buildSrc:jar UP-TO-DATE
+	:buildSrc:assemble UP-TO-DATE
 	:buildSrc:compileTestJava UP-TO-DATE
 	:buildSrc:compileTestGroovy UP-TO-DATE
 	:buildSrc:processTestResources UP-TO-DATE
 	:buildSrc:testClasses UP-TO-DATE
 	:buildSrc:test UP-TO-DATE
 	:buildSrc:check UP-TO-DATE
-	:buildSrc:build
-	:clean UP-TO-DATE
+	:buildSrc:build UP-TO-DATE
+	:clean
 	:retrieveSchemas
 	    Schemas are present. Retrieval is not needed.
 	    /Users/walsh/Development/workspace/java_stix/src/main/resources/schemas/v1.1.1/cybox/objects/Archive_File_Object.xsd already patched.
@@ -195,14 +198,13 @@ on UNIX:
 	:classes
 	:jar
 	:javadoc
-	/Users/walsh/Development/workspace/java_stix/src/main/java/org/mitre/stix/DocumentUtilities.java:81: warning - @return tag has no arguments.
 	/Users/walsh/Development/workspace/java_stix/src/generated/java/org/w3/_2000/_09/xmldsig/ObjectFactory.java:277: warning - Tag @link: reference not found: byte[]
-	/Users/walsh/Development/workspace/java_stix/src/generated/java/org/w3/_2000/_09/xmldsig/ObjectFactory.java:299: warning - Tag @link: reference not found: byte[]
+	/Users/walsh/Development/workspace/java_stix/src/generated/java/org/w3/_2000/_09/xmldsig/ObjectFactory.java:287: warning - Tag @link: reference not found: byte[]
 	/Users/walsh/Development/workspace/java_stix/src/generated/java/org/w3/_2000/_09/xmldsig/ObjectFactory.java:361: warning - Tag @link: reference not found: byte[]
 	/Users/walsh/Development/workspace/java_stix/src/generated/java/org/w3/_2000/_09/xmldsig/ObjectFactory.java:331: warning - Tag @link: reference not found: byte[]
 	/Users/walsh/Development/workspace/java_stix/src/generated/java/org/w3/_2000/_09/xmldsig/ObjectFactory.java:351: warning - Tag @link: reference not found: byte[]
 	/Users/walsh/Development/workspace/java_stix/src/generated/java/org/w3/_2000/_09/xmldsig/ObjectFactory.java:277: warning - Tag @link: reference not found: byte[]
-	/Users/walsh/Development/workspace/java_stix/src/generated/java/org/w3/_2000/_09/xmldsig/ObjectFactory.java:299: warning - Tag @link: reference not found: byte[]
+	/Users/walsh/Development/workspace/java_stix/src/generated/java/org/w3/_2000/_09/xmldsig/ObjectFactory.java:287: warning - Tag @link: reference not found: byte[]
 	/Users/walsh/Development/workspace/java_stix/src/generated/java/org/w3/_2000/_09/xmldsig/ObjectFactory.java:331: warning - Tag @link: reference not found: byte[]
 	/Users/walsh/Development/workspace/java_stix/src/generated/java/org/w3/_2000/_09/xmldsig/ObjectFactory.java:351: warning - Tag @link: reference not found: byte[]
 	/Users/walsh/Development/workspace/java_stix/src/generated/java/org/w3/_2000/_09/xmldsig/ObjectFactory.java:361: warning - Tag @link: reference not found: byte[]
@@ -211,11 +213,11 @@ on UNIX:
 	/Users/walsh/Development/workspace/java_stix/src/generated/java/org/w3/_2000/_09/xmldsig/X509Data.java:132: warning - Tag @link: reference not found: byte[]
 	/Users/walsh/Development/workspace/java_stix/src/generated/java/org/w3/_2000/_09/xmldsig/X509Data.java:132: warning - Tag @link: reference not found: byte[]
 	/Users/walsh/Development/workspace/java_stix/src/generated/java/org/w3/_2000/_09/xmldsig/ObjectFactory.java:277: warning - Tag @link: reference not found: byte[]
-	/Users/walsh/Development/workspace/java_stix/src/generated/java/org/w3/_2000/_09/xmldsig/ObjectFactory.java:299: warning - Tag @link: reference not found: byte[]
+	/Users/walsh/Development/workspace/java_stix/src/generated/java/org/w3/_2000/_09/xmldsig/ObjectFactory.java:287: warning - Tag @link: reference not found: byte[]
 	/Users/walsh/Development/workspace/java_stix/src/generated/java/org/w3/_2000/_09/xmldsig/ObjectFactory.java:361: warning - Tag @link: reference not found: byte[]
 	/Users/walsh/Development/workspace/java_stix/src/generated/java/org/w3/_2000/_09/xmldsig/ObjectFactory.java:331: warning - Tag @link: reference not found: byte[]
 	/Users/walsh/Development/workspace/java_stix/src/generated/java/org/w3/_2000/_09/xmldsig/ObjectFactory.java:351: warning - Tag @link: reference not found: byte[]
-	20 warnings
+	19 warnings
 	:javadocJar
 	:sourcesJar
 	:assemble
@@ -229,7 +231,7 @@ on UNIX:
 	
 	BUILD SUCCESSFUL
 	
-	Total time: 2 mins 58.614 secs
+	Total time: 3 mins 7.702 secs
 
 Ignore the javadoc tag warnings they have no impact on the build. Also, ignore 
 the warning about unchecked or unsafe operations as they are an artifact of 
diff --git a/build.gradle b/build.gradle
index 31c8271..e74d0cb 100644
--- a/build.gradle
+++ b/build.gradle
@@ -34,6 +34,12 @@
  *
  * Check settings via:
  *
+ * To publish a snapshot execute the "uploadArchives" task with "snapshot" property like so:
+ *
+ * ./gradlew uploadArchives -Psnaphot
+ *
+ * Otherwise you will deploy to staging.
+ *
  * ./gradle checkProperties
  *
  */
@@ -54,7 +60,7 @@ apply plugin: "eclipse"
 apply plugin: "maven"
 apply plugin: "signing"
 
-defaultTasks "build"
+defaultTasks "jar"
 
 version = "1.1.1"
 group = "org.mitre"
@@ -110,28 +116,31 @@ task sourcesJar(type: Jar, dependsOn: javadoc) {
 	from sourceSets.main.allSource
 }
 
+task checkProperties() {
+	doFirst {
+		println "signingKeyId ${hasProperty("signingKeyId") ? '= ' + signingKeyId : 'is not set.'}" 
+		println "signingPassword ${hasProperty("signingPassword") ? '= ' + signingPassword : 'is not set.'}"
+		println "secretKeyFile ${hasProperty("secretKeyFile") ? '= ' + secretKeyFile : 'is not set.'}"
+		println "ossrhUsername ${hasProperty("ossrhUsername") ? '= ' + ossrhUsername : 'is not set.'}"
+		println "ossrhPassword ${hasProperty("ossrhPassword") ?'= ' +  ossrhPassword : 'is not set.'}"
+	}
+}
+
 gradle.taskGraph.whenReady { taskGraph ->
+
+	println ">>>${taskGraph.allTasks}"
+
 	if (taskGraph.allTasks.any { it instanceof Sign}) {
 		allprojects {
-			ext."signing.keyId" = signingKeyId ?: ""
-			ext."signing.password" = signingPassword ?: ""
-			ext."signing.secretKeyRingFile" = secretKeyFile ?: ""
+			ext."signing.keyId" = hasProperty("signingKeyId") ? signingKeyId : ""
+			ext."signing.password" = hasProperty("signingPassword") ? signingPassword: ""
+			ext."signing.secretKeyRingFile" = hasProperty("secretKeyFile") ? secretKeyFile: ""
 		}
 	}
 }
 
-task checkProperties() {
-	println "signingKeyId ${signingKeyId ? '= ' + signingKeyId : 'is not set.'}" 
-	println "signingPassword ${signingPassword ? '= ' + signingPassword : 'is not set.'}"
-	println "secretKeyFile ${secretKeyFile ? '= ' + secretKeyFile : 'is not set.'}"
-	println "ossrhUsername ${ossrhUsername ? '= ' + ossrhUsername : 'is not set.'}"
-	println "ossrhPassword ${ossrhPassword ?'= ' +  ossrhPassword : 'is not set.'}"
-}
-
 signing {
-	required {
-		!version.contains("SNAPSHOT") && gradle.taskGraph.hasTask("uploadArchives")
-	}
+	required {!version.endsWith("SNAPSHOT") && gradle.taskGraph.hasTask("uploadArchives") }
 	sign configurations.archives
 }
 
@@ -196,11 +205,11 @@ afterEvaluate { project ->
 				}
 	
 				repository(url: "https://oss.sonatype.org/service/local/staging/deploy/maven2/") {
-					authentication(userName: ossrhUsername ?: "", password: ossrhPassword ?: "")
+					authentication(userName: hasProperty("ossrhUsername") ? ossrhUsername : "", password: hasProperty("ossrhPassword") ? ossrhPassword: "")
 				}
 				
 				snapshotRepository(url: "https://oss.sonatype.org/content/repositories/snapshots/") {
-					authentication(userName: ossrhUsername ?: "", password: ossrhPassword ?: "")
+					authentication(userName: hasProperty("ossrhUsername") ? ossrhUsername : "", password: hasProperty("ossrhPassword") ? ossrhPassword: "")
 				}
 				
 				pom.project {
diff --git a/circle.yml b/circle.yml
index 9169a61..75a9973 100644
--- a/circle.yml
+++ b/circle.yml
@@ -4,3 +4,7 @@ machine:
   environment:
     GRADLE_OPTS: -Dorg.gradle.daemon=true
     CI_OPTS: --stacktrace --debug
+
+test:
+  override:
+    - ./gradlew build -x signArchives
\ No newline at end of file

From 728646687847fa0d4f870656d71ab18ac69d81e2 Mon Sep 17 00:00:00 2001
From: nemonik <github.com@nemonik.com>
Date: Fri, 8 May 2015 01:25:09 -0400
Subject: [PATCH 05/43] refactoring for signing

---
 .travis.yml  |   2 +-
 README.MD    |  18 +++---
 build.gradle | 159 +++++++++++++++++++++++++++++----------------------
 circle.yml   |   2 +-
 4 files changed, 100 insertions(+), 81 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 39e3908..6f988d3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,4 +10,4 @@ env: GRADLE_OPTS=-Dorg.gradle.daemon=true
 env: CI_OPTS=--stacktrace
 
 install: /bin/true
-script: "./gradlew build -x signArchives"
\ No newline at end of file
+script: "./gradlew -x signArchives"
\ No newline at end of file
diff --git a/README.MD b/README.MD
index 42fab23..7f8d2e0 100644
--- a/README.MD
+++ b/README.MD
@@ -75,12 +75,12 @@ including OS X thereby removing the need to have Gradle installed.
 
 For a UNIX platform, you can run Gradle from the project root via:
 
-	./gradlew 
+	./gradlew -x signArchives
 
 This documentation centers on UNIX-centric Gradle command-line execution  for 
 brevity, but if you are on Windows you can run Gradle via:
 
-	.\gradlew.bat
+	.\gradlew.bat -x signArchives
 	
 
 Executing the `tasks` Gradle task will inform you of all the tasks runnable 
@@ -153,14 +153,10 @@ It is really unnecessary to build by hand, if your intention is to use the
 java-stix in your project as [snapshot](#importing_into_eclipse) exist in the 
 Maven Central Snapshot repository, and soon releases will exist too. 
 
-First change directories into the project and enter on the command-line:
+If you have not set up the signing properties you can instruct Gradle to skip 
+signing jars by doing the following:
 
-	./gradlew
-
-as `jar` is the default Gradle task.  To run the `build` and skip signing jars,
-do the following
-
-	./gradlew build -x signArchives
+	./gradlew -x signArchives
 
 After the Gradle wrapper shell script has downloaded and cached the Gradle 
 binary distribution, a successful build will look like something like this 
@@ -240,7 +236,7 @@ XJC being used to autogenerate the document object model.
 If you want more detail about the build you can pass `--stacktrace --debug` on 
 the command line like so:
 
-	./gradlew --stacktrace --debug
+	./gradlew -x signArchives --stacktrace --debug
 
 for a more detailed build.  I set an environment `CI_OPTS` variable with this 
 value for CircleCi builds to be bettered informed as to why the buiid is 
@@ -314,7 +310,7 @@ After running the Gradle build script, if you are using the Eclipse IDE you may
 want to run the following from the command-line to set up the Ecipse 
 environment:
 
-	./gradlew build cleanEclipse eclipse
+	./gradlew build cleanEclipse eclipse -x signArchives
 
 It entirely depends on how smart yoour Eclipse Gradle plugin is and how you 
 imported the project.  The above command will change your prject to essentially 
diff --git a/build.gradle b/build.gradle
index e74d0cb..434dc0e 100644
--- a/build.gradle
+++ b/build.gradle
@@ -8,7 +8,7 @@
  *
  * Run
  *
- *	./gradlew
+ *	./gradlew -x signArchives
  *
  * from the commnand-line and the build task will execute by default.
  *
@@ -34,11 +34,14 @@
  *
  * Check settings via:
  *
- * To publish a snapshot execute the "uploadArchives" task with "snapshot" property like so:
+ * To publish a snapshot execute the "uploadArchives" task like so:
  *
- * ./gradlew uploadArchives -Psnaphot
+ * ./gradlew uploadArchives
  *
- * Otherwise you will deploy to staging.
+ * Otherwise you can publish a release to staging by executing the "uploadArchives" task 
+ * with "release" property like so:
+ *
+ * ./gradlew uploadArchives -Prelease
  *
  * ./gradle checkProperties
  *
@@ -60,7 +63,7 @@ apply plugin: "eclipse"
 apply plugin: "maven"
 apply plugin: "signing"
 
-defaultTasks "jar"
+defaultTasks "build"
 
 version = "1.1.1"
 group = "org.mitre"
@@ -68,7 +71,7 @@ archivesBaseName = "stix"
 
 project.ext.set("schemaVersion", version)
 
-if (project.hasProperty("snapshot")) {
+if (!has("release")) {
 	version = "${version}-SNAPSHOT"
 }
 
@@ -118,29 +121,99 @@ task sourcesJar(type: Jar, dependsOn: javadoc) {
 
 task checkProperties() {
 	doFirst {
-		println "signingKeyId ${hasProperty("signingKeyId") ? '= ' + signingKeyId : 'is not set.'}" 
-		println "signingPassword ${hasProperty("signingPassword") ? '= ' + signingPassword : 'is not set.'}"
-		println "secretKeyFile ${hasProperty("secretKeyFile") ? '= ' + secretKeyFile : 'is not set.'}"
-		println "ossrhUsername ${hasProperty("ossrhUsername") ? '= ' + ossrhUsername : 'is not set.'}"
-		println "ossrhPassword ${hasProperty("ossrhPassword") ?'= ' +  ossrhPassword : 'is not set.'}"
+		println "${project.hasProperty("signingKeyId") ? 'signingKeyId = ' + signingKeyId : 'No value has been specified for property \'signingKeyId\'.'}" 
+		println "${project.hasProperty("signingPassword") ? 'signingPassword = ' + signingPassword : 'No value has been specified for property \'signingKeyId\'.'}"
+		println "${project.hasProperty("secretKeyFile") ? 'secretKeyFile = ' + secretKeyFile : 'No value has been specified for property \'secretKeyFile\'.'}"
+		println "${project.hasProperty("ossrhUsername") ? 'ossrhUsername = ' + ossrhUsername : 'No value has been specified for property \'ossrhUsername\'.'}"
+		println "${project.hasProperty("ossrhPassword") ?'ossrhPassword = ' +  ossrhPassword : 'No value has been specified for property \'ossrhPassword\'.'}"
 	}
 }
 
-gradle.taskGraph.whenReady { taskGraph ->
-
-	println ">>>${taskGraph.allTasks}"
+uploadArchives{
+	configuration = configurations.archives
+	repositories {
+		mavenDeployer {
+			beforeDeployment { MavenDeployment deployment ->
+				if (!project.hasProperty("ossrhUsername")) {
+					throw new GradleException("No value has been specified for property 'ossrhUsername'.")
+				}
+				
+				if (!project.hasProperty("ossrhPassword")) {
+					throw new GradleException("No value has been specified for property 'ossrhPassword'.")
+				}
+		
+				signing.signPom(deployment)
+			}
+			
+			repository(url: "https://oss.sonatype.org/service/local/staging/deploy/maven2/") {
+				authentication(userName: project.hasProperty("ossrhUsername") ? ossrhUsername : "", password: project.hasProperty("ossrhPassword") ? ossrhPassword: "")
+			}
+			
+			snapshotRepository(url: "https://oss.sonatype.org/content/repositories/snapshots/") {
+				authentication(userName: project.hasProperty("ossrhUsername") ? ossrhUsername : "", password: project.hasProperty("ossrhPassword") ? ossrhPassword: "")
+			}
+			
+			pom.project {
+				name "${archivesBaseName}"
+				packaging 'jar'
+				version "${project.version}"
+				// optionally artifactId can be defined here 
+				description "The JAXB Bindings for STIX v." + version
+				url "https://github.com/nemonik/java_stix"
+				
+				scm {
+					connection "https://github.com/nemonik/java_stix.git"
+					developerConnection "https://github.com/nemonik/java_stix.git"
+					url "https://github.com/nemonik/java_stix"
+				}
+				
+				licenses {
+					license {
+						name "The BSD 3-Clause License"
+						url "https://raw.githubusercontent.com/nemonik/java_stix/master/LICENSE"
+					}
+				}
+				
+				developers {
+					developer {
+						id 'nemonik'
+						name 'Michael Joseph Walsh'
+						email 'java-stix-pom[ASCII character number 64]nemonik.com'
+					}
+				}
+			}
+		}
+	}
+}
 
+gradle.taskGraph.whenReady { taskGraph ->
 	if (taskGraph.allTasks.any { it instanceof Sign}) {
 		allprojects {
-			ext."signing.keyId" = hasProperty("signingKeyId") ? signingKeyId : ""
-			ext."signing.password" = hasProperty("signingPassword") ? signingPassword: ""
-			ext."signing.secretKeyRingFile" = hasProperty("secretKeyFile") ? secretKeyFile: ""
+			ext."signing.keyId" = project.hasProperty("signingKeyId") ? signingKeyId : ""
+			ext."signing.password" = project.hasProperty("signingPassword") ? signingPassword: ""
+			ext."signing.secretKeyRingFile" = project.hasProperty("secretKeyFile") ? secretKeyFile: ""
+		}
+	}
+		
+	if (taskGraph.hasTask(tasks.uploadArchives)) {
+		if (has("release")) {
+			if (!project.hasProperty("signingKeyId")) {
+				throw new GradleException("No value has been specified for property 'signingKeyId'.")
+			}
+			
+			if (!project.hasProperty("signingPassword")) {
+				throw new GradleException("No value has been specified for property 'signingPassword'.")
+			}
+			
+			if (!project.hasProperty("secretKeyFile")) {
+				throw new GradleException("No value has been specified for property 'secretKeyFile'.")
+			}
 		}
 	}
 }
 
 signing {
-	required {!version.endsWith("SNAPSHOT") && gradle.taskGraph.hasTask("uploadArchives") }
+	required {has("release") && gradle.taskGraph.hasTask(tasks.uploadArchives) }
 	sign configurations.archives
 }
 
@@ -196,56 +269,6 @@ jar {
 	from 'LICENSE'
 }
 
-afterEvaluate { project -> 
-	uploadArchives {
-		repositories {
-			mavenDeployer {
-				beforeDeployment { MavenDeployment deployment -> 
-					signing.signPom(deployment)
-				}
-	
-				repository(url: "https://oss.sonatype.org/service/local/staging/deploy/maven2/") {
-					authentication(userName: hasProperty("ossrhUsername") ? ossrhUsername : "", password: hasProperty("ossrhPassword") ? ossrhPassword: "")
-				}
-				
-				snapshotRepository(url: "https://oss.sonatype.org/content/repositories/snapshots/") {
-					authentication(userName: hasProperty("ossrhUsername") ? ossrhUsername : "", password: hasProperty("ossrhPassword") ? ossrhPassword: "")
-				}
-				
-				pom.project {
-					name "${archivesBaseName}"
-					packaging 'jar'
-					version "${project.version}"
-					// optionally artifactId can be defined here 
-					description "The JAXB Bindings for STIX v." + version
-					url "https://github.com/nemonik/java_stix"
-					
-					scm {
-						connection "https://github.com/nemonik/java_stix.git"
-						developerConnection "https://github.com/nemonik/java_stix.git"
-						url "https://github.com/nemonik/java_stix"
-					}
-					
-					licenses {
-						license {
-							name "The BSD 3-Clause License"
-							url "https://raw.githubusercontent.com/nemonik/java_stix/master/LICENSE"
-						}
-					}
-					
-					developers {
-						developer {
-							id 'nemonik'
-							name 'Michael Joseph Walsh'
-							email 'java-stix-pom[ASCII character number 64]nemonik.com'
-						}
-					}
-				}
-			}
-		}
-	}
-}
-
 javadoc {
 	include "**/org/mitre/stix/**/*"
 	include "**/com/mandiant/**/*"
diff --git a/circle.yml b/circle.yml
index 75a9973..694bb8d 100644
--- a/circle.yml
+++ b/circle.yml
@@ -7,4 +7,4 @@ machine:
 
 test:
   override:
-    - ./gradlew build -x signArchives
\ No newline at end of file
+    - ./gradlew -x signArchives
\ No newline at end of file

From 1def492b21adff06518a91159e2db7a1f019a2ea Mon Sep 17 00:00:00 2001
From: nemonik <github.com@nemonik.com>
Date: Fri, 8 May 2015 01:40:18 -0400
Subject: [PATCH 06/43] DOC: minor fixes

---
 README.MD | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.MD b/README.MD
index 7f8d2e0..0bd73ce 100644
--- a/README.MD
+++ b/README.MD
@@ -162,7 +162,7 @@ After the Gradle wrapper shell script has downloaded and cached the Gradle
 binary distribution, a successful build will look like something like this 
 on UNIX:
 
-	➜  java_stix git:(master) ✗ gradle build -x signArchives
+	➜  java_stix git:(master) ✗ ./gradlew -x signArchives
 	:buildSrc:compileJava UP-TO-DATE
 	:buildSrc:compileGroovy UP-TO-DATE
 	:buildSrc:processResources UP-TO-DATE
@@ -286,7 +286,7 @@ integration.
 
 To build on Windows use the gradlew batch script like so:
 
-	$ .\gradlew.bat
+	$ .\gradlew.bat -x signArchives
 
 If the build goes well you will find the jars: 
 

From a810c65b0956dceaa18df8fbdac39ec46407a0e2 Mon Sep 17 00:00:00 2001
From: nemonik <github.com@nemonik.com>
Date: Mon, 11 May 2015 10:25:26 -0400
Subject: [PATCH 07/43] changes to pom.xml key-value pairs

---
 build.gradle | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/build.gradle b/build.gradle
index 434dc0e..592ed11 100644
--- a/build.gradle
+++ b/build.gradle
@@ -159,18 +159,18 @@ uploadArchives{
 				version "${project.version}"
 				// optionally artifactId can be defined here 
 				description "The JAXB Bindings for STIX v." + version
-				url "https://github.com/nemonik/java_stix"
+				url "https://github.com/STIXProject/java-stix"
 				
 				scm {
-					connection "https://github.com/nemonik/java_stix.git"
-					developerConnection "https://github.com/nemonik/java_stix.git"
-					url "https://github.com/nemonik/java_stix"
+					connection "https://github.com/STIXProject/java-stix.git"
+					developerConnection "https://github.com/STIXProject/java-stix.git"
+					url "https://github.com/STIXProject/java-stix"
 				}
 				
 				licenses {
 					license {
 						name "The BSD 3-Clause License"
-						url "https://raw.githubusercontent.com/nemonik/java_stix/master/LICENSE"
+						url "https://raw.githubusercontent.com/STIXProject/java-stix/master/LICENSE"
 					}
 				}
 				

From e203c3e2d99279756d3d81f8c12c570a1c6d49a9 Mon Sep 17 00:00:00 2001
From: nemonik <github.com@nemonik.com>
Date: Tue, 12 May 2015 09:06:46 -0400
Subject: [PATCH 08/43] DOC: release info added

---
 README.MD | 26 +++++++++++++++++++++++---
 1 file changed, 23 insertions(+), 3 deletions(-)

diff --git a/README.MD b/README.MD
index 0bd73ce..f04d093 100644
--- a/README.MD
+++ b/README.MD
@@ -24,13 +24,33 @@ Releases of java-stix will comply with the Semantic Versioning specification at
 see TODO.txt for a tentative roadmap.  Releases will be announced on the [STIX 
 discussion list][list].
 
+## <a name="releases"></a>Releases
+
+Releases are distributed via the Maven Central Repository. 
+
+### <a name="maven_dependency_info"></a>Apache Maven:
+
+	<dependency>
+	  <groupId>org.mitre</groupId>
+	  <artifactId>stix</artifactId>
+	  <version>1.1.1</version>
+	</dependency>
+
+### <a name="gradle_dependency_info"></a>Gradle:
+
+	compile 'org.mitre:stix:1.1.1'
+
+### <a name="ivy__dependency_info"></a>Apache Ivy:
+
+	<dependency org="org.mitre" name="stix" rev="1.1.1" />
+
 ## <a name="snapshots"></a>Snapshots
 
 Snapshots are being pushed to 
 
-https://oss.sonatype.org/content/repositories/snapshots/org/mitre/stix/ 
+[https://oss.sonatype.org/content/repositories/snapshots/org/mitre/stix/](https://oss.sonatype.org/content/repositories/snapshots/org/mitre/stix/)
 
-So, users can simply retrieve java-stix directly via the Central Repository.
+Users using Apache Maven for example can simply retrieve java-stix directly via the Central Repository:
 
      <repositories>
        <repository>
@@ -49,7 +69,7 @@ So, users can simply retrieve java-stix directly via the Central Repository.
 		</dependency>
 	</dependencies>
 
-At a later date, release artifacts will appear in the Maven Central Repository.
+[Release](#releases) artifacts appear in the Maven Central Repository.
 
 # <a name="building"></a>Building
 

From 69b64ecb741ea6a0b7e8345b1a3938e8cfaee11d Mon Sep 17 00:00:00 2001
From: nemonik <github.com@nemonik.com>
Date: Tue, 12 May 2015 13:21:27 -0400
Subject: [PATCH 09/43] moved properties that may change between out of the
 gradle build script

---
 build.gradle      | 6 +-----
 gradle.properties | 3 +++
 2 files changed, 4 insertions(+), 5 deletions(-)
 create mode 100644 gradle.properties

diff --git a/build.gradle b/build.gradle
index 592ed11..cc2b865 100644
--- a/build.gradle
+++ b/build.gradle
@@ -65,10 +65,6 @@ apply plugin: "signing"
 
 defaultTasks "build"
 
-version = "1.1.1"
-group = "org.mitre"
-archivesBaseName = "stix"
-
 project.ext.set("schemaVersion", version)
 
 if (!has("release")) {
@@ -158,7 +154,7 @@ uploadArchives{
 				packaging 'jar'
 				version "${project.version}"
 				// optionally artifactId can be defined here 
-				description "The JAXB Bindings for STIX v." + version
+				description "The Java bindings for STIX v." + version
 				url "https://github.com/STIXProject/java-stix"
 				
 				scm {
diff --git a/gradle.properties b/gradle.properties
new file mode 100644
index 0000000..8ee9732
--- /dev/null
+++ b/gradle.properties
@@ -0,0 +1,3 @@
+version = 1.1.1
+group = org.mitre
+archivesBaseName = stix
\ No newline at end of file

From 35303b0dc21be0869452d4439c01c71ea3a96ec1 Mon Sep 17 00:00:00 2001
From: nemonik <github.com@nemonik.com>
Date: Sat, 16 May 2015 02:01:09 -0400
Subject: [PATCH 10/43] Pulled in some changes from master, and made further
 changes.

---
 README.MD                                     | 27 +++++++++++++++----
 build.gradle                                  | 15 ++++++++---
 .../org/mitre/stix/CalcChecksumTask.groovy    |  8 ++++--
 gradle.properties                             |  3 ++-
 retrieve_schemas.bat                          |  1 +
 retrieve_schemas.sh                           |  1 +
 src/main/java/org/mitre/stix/STIXSchema.java  |  8 +++---
 .../org/mitre/stix/examples/CIQIdentity.java  | 16 +++++------
 .../stix/examples/CreationToolMetadata.java   |  2 +-
 9 files changed, 55 insertions(+), 26 deletions(-)

diff --git a/README.MD b/README.MD
index f04d093..5a4a3c5 100644
--- a/README.MD
+++ b/README.MD
@@ -7,7 +7,7 @@ java-stix is being developed under the official [STIXProject][stix project]
 
 For more information, see [http://stix.mitre.org/][stix].
 
-[![Circle CI](https://circleci.com/gh/STIXProject/java-stix.svg?style=svg)](https://circleci.com/gh/STIXProject/java-stix) [![Build Status](https://travis-ci.org/STIXProject/java-stix.svg)](https://travis-ci.org/STIXProject/java-stix)
+[![Circle CI](https://circleci.com/gh/STIXProject/java-stix.svg?style=svg)](https://circleci.com/gh/STIXProject/java-stix) [![Build Status](https://travis-ci.org/STIXProject/java-stix.svg)](https://travis-ci.org/STIXProject/java-stix) [![Code Climate](https://codeclimate.com/github/STIXProject/java-stix/badges/gpa.svg)](https://codeclimate.com/github/STIXProject/java-stix) [![Test Coverage](https://codeclimate.com/github/STIXProject/java-stix/badges/coverage.svg)](https://codeclimate.com/github/STIXProject/java-stix/coverage)
 
 ## <a name="overview"></a>Overview
 
@@ -73,6 +73,8 @@ Users using Apache Maven for example can simply retrieve java-stix directly via
 
 # <a name="building"></a>Building
 
+java-stix builds under Java7, and Java8.
+
 ## <a name="cloning"></a>Clone the repository
 
 Clone the java-stix project via:
@@ -253,8 +255,8 @@ Ignore the javadoc tag warnings they have no impact on the build. Also, ignore
 the warning about unchecked or unsafe operations as they are an artifact of 
 XJC being used to autogenerate the document object model.
 
-If you want more detail about the build you can pass `--stacktrace --debug` on 
-the command line like so:
+If you want more detail consider passing `-d`/`--debug` or `-i`/`--info` along with
+`--stacktrace` on the command line like so:
 
 	./gradlew -x signArchives --stacktrace --debug
 
@@ -280,16 +282,31 @@ path.
 
 To execute the tests:
 
-	./gradlew test
+	/gradlew -x signArchives test
 
 Consider using `-d`/`--debug` or `-i`/`--info` for more details during test 
 execution like so:
 
-	./gradlew test -i
+	./gradlew -x signArchives -i
 
 The `test` task will generated a report that can be found at 
 `build/reports/tests/index.html`.
 
+### <a name="examples"></a>Examples
+
+Examples exist in src/main/java/org/mitre/stix/examples
+
+	src/main/java/org/mitre/stix/examples/
+	├── CIQIdentity.java
+	├── CreationToolMetadata.java
+	├── IndicatorHash.java
+	├── XML2Object.java
+	└── XMLParser.java
+
+To execute CIQIdentity on the command-line via Gradle, do the following:
+
+	./gradlew -PmainClass=org.mitre.stix.examples.CIQIdentity -x signArchives execute 
+
 ## <a name="addendum"></a>Addendum
 
 The author sees this section out of scope, but added it in hopes it will help 
diff --git a/build.gradle b/build.gradle
index cc2b865..a6bde77 100644
--- a/build.gradle
+++ b/build.gradle
@@ -94,9 +94,12 @@ task cleanSchema(type: CleanSchemaTask) {
 }
 
 task calcChecksum(type: CalcChecksumTask) {
+	schemaVersion = project.schemaVersion
 }
 
-compileJava.dependsOn createPackageInfo
+if (!has("skipPackageInfo")) {
+	compileJava.dependsOn createPackageInfo
+}
 
 task wrapper(type: Wrapper) {
 	gradleVersion = '2.4'
@@ -125,6 +128,11 @@ task checkProperties() {
 	}
 }
 
+task execute(type:JavaExec) {
+	main = project.mainClass
+	classpath = sourceSets.main.runtimeClasspath
+}
+
 uploadArchives{
 	configuration = configurations.archives
 	repositories {
@@ -150,7 +158,7 @@ uploadArchives{
 			}
 			
 			pom.project {
-				name "${archivesBaseName}"
+				name "${project.name}"
 				packaging 'jar'
 				version "${project.version}"
 				// optionally artifactId can be defined here 
@@ -223,7 +231,8 @@ sourceSets {
 		java { srcDirs("src/main/java", "src/generated/java") }
 		resources {
 			srcDir("src/main/resources")
-			exclude "*.xjb" // not needed in the jar
+			exclude "*.xjb"
+			exclude "**/v1.2-rc1"
 		}
 	}
 }
diff --git a/buildSrc/src/main/groovy/org/mitre/stix/CalcChecksumTask.groovy b/buildSrc/src/main/groovy/org/mitre/stix/CalcChecksumTask.groovy
index 98aec3c..60ca51d 100644
--- a/buildSrc/src/main/groovy/org/mitre/stix/CalcChecksumTask.groovy
+++ b/buildSrc/src/main/groovy/org/mitre/stix/CalcChecksumTask.groovy
@@ -5,12 +5,14 @@
 package org.mitre.stix
 
 import org.gradle.api.DefaultTask
+import org.gradle.api.tasks.Input
 import org.gradle.api.tasks.TaskAction
 
 import java.io.FileInputStream
 import java.security.MessageDigest
 
 public class Checksum {
+
 	def calc(File file) {
 		
 		def messageDigest = MessageDigest.getInstance("SHA1")
@@ -36,9 +38,11 @@ public class Checksum {
 }
 
 class CalcChecksumTask extends DefaultTask {
-
+	
+	@Input String schemaVersion
+	
 	CalcChecksumTask() {
-		description = "Calculates checksum for a file. For example: gradle -Pfilepath=src/main/resources/schemas/v1.1.1/cybox/objects/Archive_File_Object.xsd calcChecksum"
+		description = "Calculates checksum for a file. For example: gradle -Pfilepath=src/main/resources/schemas/v${schemaVersion}/cybox/objects/Archive_File_Object.xsd calcChecksum"
 	}
 	
 	@TaskAction
diff --git a/gradle.properties b/gradle.properties
index 8ee9732..891b2c6 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,3 +1,4 @@
 version = 1.1.1
 group = org.mitre
-archivesBaseName = stix
\ No newline at end of file
+name = stix
+mainClass = org.mitre.stix.STIXSchema
\ No newline at end of file
diff --git a/retrieve_schemas.bat b/retrieve_schemas.bat
index 08f6a75..43e2b8a 100644
--- a/retrieve_schemas.bat
+++ b/retrieve_schemas.bat
@@ -7,4 +7,5 @@ git checkout tags/v1.1.1
 echo     Retrieving CybOX schemas...
 git submodule init
 git submodule update --force
+cd cybox
 git checkout 3442ebe50385d3bd0b3305952b90d296e0a1242c
\ No newline at end of file
diff --git a/retrieve_schemas.sh b/retrieve_schemas.sh
index 4b1d0c7..4b72c33 100755
--- a/retrieve_schemas.sh
+++ b/retrieve_schemas.sh
@@ -9,5 +9,6 @@ git checkout tags/v1.1.1
 echo "    Retrieving CybOX schemas..."
 git submodule init
 git submodule update --force
+cd cybox
 git checkout 3442ebe50385d3bd0b3305952b90d296e0a1242c
 
diff --git a/src/main/java/org/mitre/stix/STIXSchema.java b/src/main/java/org/mitre/stix/STIXSchema.java
index c7db78a..55e1c22 100644
--- a/src/main/java/org/mitre/stix/STIXSchema.java
+++ b/src/main/java/org/mitre/stix/STIXSchema.java
@@ -10,16 +10,13 @@
 import java.net.URL;
 import java.nio.charset.StandardCharsets;
 import java.util.HashMap;
-import java.util.HashSet;
 import java.util.Map;
-import java.util.Set;
 import java.util.logging.Logger;
 
-import javax.xml.bind.annotation.XmlType;
-
 import javax.xml.XMLConstants;
 import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlSchema;
+import javax.xml.bind.annotation.XmlType;
 import javax.xml.namespace.QName;
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
@@ -43,7 +40,6 @@
 import org.w3c.dom.Element;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
 import org.xml.sax.SAXException;
 
 /**
@@ -273,6 +269,8 @@ public static void main(String[] args) throws ParserConfigurationException,
 				.println(schema
 						.validate(new URL(
 								"https://raw.githubusercontent.com/STIXProject/schemas/master/samples/STIX_Domain_Watchlist.xml")));
+		
+		System.out.println(schema.getVersion());
 	}
 
 	/**
diff --git a/src/main/java/org/mitre/stix/examples/CIQIdentity.java b/src/main/java/org/mitre/stix/examples/CIQIdentity.java
index 0633206..579d531 100644
--- a/src/main/java/org/mitre/stix/examples/CIQIdentity.java
+++ b/src/main/java/org/mitre/stix/examples/CIQIdentity.java
@@ -118,9 +118,8 @@ public static void main(String[] args) {
 
 			InformationSourceType producer = new InformationSourceType()
 					.withDescription(
-							new StructuredTextType(
-									"An indicator containing a File observable with an associated hash",
-									null))
+							new StructuredTextType()
+									.withValue("An indicator containing a File observable with an associated hash"))
 					.withTime(
 							new TimeType()
 									.withProducedTime(new DateTimeWithPrecisionType(
@@ -155,10 +154,9 @@ public static void main(String[] args) {
 					.withTimestamp(now)
 					.withTitle("File Hash Example")
 					.withDescription(
-							new StructuredTextType(
-									"An indicator containing a File observable with an associated hash",
-									null)).withProducer(producer)
-					.withObservable(observable);
+							new StructuredTextType()
+									.withValue("An indicator containing a File observable with an associated hash"))
+					.withProducer(producer).withObservable(observable);
 
 			IndicatorsType indicators = new IndicatorsType(
 					new ArrayList<IndicatorBaseType>() {
@@ -187,8 +185,8 @@ public static void main(String[] args) {
 
 			System.out.println(StringUtils.repeat("-", 120));
 
-			System.out.println(STIXPackage.fromXMLString(stixPackage
-					.toXMLString()).toXMLString(true));
+			System.out.println(STIXPackage.fromXMLString(
+					stixPackage.toXMLString()).toXMLString(true));
 
 		} catch (DatatypeConfigurationException e) {
 			throw new RuntimeException(e);
diff --git a/src/main/java/org/mitre/stix/examples/CreationToolMetadata.java b/src/main/java/org/mitre/stix/examples/CreationToolMetadata.java
index ac1a9fa..1f37ddb 100644
--- a/src/main/java/org/mitre/stix/examples/CreationToolMetadata.java
+++ b/src/main/java/org/mitre/stix/examples/CreationToolMetadata.java
@@ -46,7 +46,7 @@ public static void main(String[] args) {
 							new GregorianCalendar(TimeZone.getTimeZone("UTC")));
 
 			STIXHeaderType header = new STIXHeaderType()
-					.withDescription(new StructuredTextType("Example", null))
+					.withDescription(new StructuredTextType().withValue("Example"))
 					.withInformationSource(
 							new InformationSourceType().withTools(new ToolsInformationType()
 									.withTools(new ToolInformationType()

From 6bf8e6c2e6226ff3dad6688ebed1681dbaa5fe92 Mon Sep 17 00:00:00 2001
From: nemonik <github.com@nemonik.com>
Date: Sat, 16 May 2015 02:01:16 -0400
Subject: [PATCH 11/43] Pulled in some changes from master, and made further
 changes.

---
 .java-version | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 .java-version

diff --git a/.java-version b/.java-version
new file mode 100644
index 0000000..ad72959
--- /dev/null
+++ b/.java-version
@@ -0,0 +1 @@
+oracle64-1.8.0.20

From e80e83bd39ce5459d0ec52e0b002334faa9f1822 Mon Sep 17 00:00:00 2001
From: nemonik <github.com@nemonik.com>
Date: Sat, 16 May 2015 02:02:57 -0400
Subject: [PATCH 12/43] Pulled in some changes from master, and made further
 changes.

---
 .gitignore      | 1 -
 settings.gradle | 1 +
 2 files changed, 1 insertion(+), 1 deletion(-)
 create mode 100644 settings.gradle

diff --git a/.gitignore b/.gitignore
index 13970e1..27c4384 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,7 +3,6 @@ src/generated
 .classpath
 .project
 .settings/
-settings.gradle
 .gradle/2.1/taskArtifacts
 src/main/resources/namespace-prefix.xjb
 src/main/resource/schemas
diff --git a/settings.gradle b/settings.gradle
new file mode 100644
index 0000000..24c2c63
--- /dev/null
+++ b/settings.gradle
@@ -0,0 +1 @@
+rootProject.name = name
\ No newline at end of file

From 67be3ee37be7c583f457e27e53e0c83f810948d8 Mon Sep 17 00:00:00 2001
From: nemonik <github.com@nemonik.com>
Date: Sat, 16 May 2015 02:04:29 -0400
Subject: [PATCH 13/43] Pulled in some changes from master, and made further
 changes.

---
 .../org/mitre/stix/sitx_1/STIXPackageSpec.groovy    | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/src/test/groovy/org/mitre/stix/sitx_1/STIXPackageSpec.groovy b/src/test/groovy/org/mitre/stix/sitx_1/STIXPackageSpec.groovy
index 2c698d3..6f9d3bc 100644
--- a/src/test/groovy/org/mitre/stix/sitx_1/STIXPackageSpec.groovy
+++ b/src/test/groovy/org/mitre/stix/sitx_1/STIXPackageSpec.groovy
@@ -53,7 +53,7 @@ import spock.lang.*
 
 class STIXPackageSpec extends spock.lang.Specification{
 
-	def "A STIXPpackage when created creates the expected XML String"() {
+	def "A STIXPackage when created creates the expected XML String"() {
 		setup:
 			XMLUnit.setIgnoreWhitespace(true)
 			XMLUnit.setIgnoreAttributeOrder(true)
@@ -188,9 +188,8 @@ class STIXPackageSpec extends spock.lang.Specification{
 			
 			def producer = new InformationSourceType()
 					.withDescription(
-							new StructuredTextType(
-									"An indicator containing a File observable with an associated hash",
-									null))
+							new StructuredTextType().withValue(
+									"An indicator containing a File observable with an associated hash"))
 					.withTime(
 							new TimeType()
 									.withProducedTime(new DateTimeWithPrecisionType(
@@ -225,9 +224,9 @@ class STIXPackageSpec extends spock.lang.Specification{
 					.withTimestamp(epoch)
 					.withTitle("File Hash Example")
 					.withDescription(
-							new StructuredTextType(
-									"An indicator containing a File observable with an associated hash",
-									null)).withProducer(producer)
+							new StructuredTextType().withValue(
+									"An indicator containing a File observable with an associated hash"))
+					.withProducer(producer)
 					.withObservable(observable)
 
 			def indicators = new IndicatorsType(

From a58969b09278e7a970a3babd75c79b1b864188ff Mon Sep 17 00:00:00 2001
From: nemonik <github.com@nemonik.com>
Date: Sat, 16 May 2015 06:39:36 -0400
Subject: [PATCH 14/43] DOC: remove codeclimate badges

---
 README.MD | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.MD b/README.MD
index 5a4a3c5..858edc4 100644
--- a/README.MD
+++ b/README.MD
@@ -7,7 +7,7 @@ java-stix is being developed under the official [STIXProject][stix project]
 
 For more information, see [http://stix.mitre.org/][stix].
 
-[![Circle CI](https://circleci.com/gh/STIXProject/java-stix.svg?style=svg)](https://circleci.com/gh/STIXProject/java-stix) [![Build Status](https://travis-ci.org/STIXProject/java-stix.svg)](https://travis-ci.org/STIXProject/java-stix) [![Code Climate](https://codeclimate.com/github/STIXProject/java-stix/badges/gpa.svg)](https://codeclimate.com/github/STIXProject/java-stix) [![Test Coverage](https://codeclimate.com/github/STIXProject/java-stix/badges/coverage.svg)](https://codeclimate.com/github/STIXProject/java-stix/coverage)
+[![Circle CI](https://circleci.com/gh/STIXProject/java-stix.svg?style=svg)](https://circleci.com/gh/STIXProject/java-stix) [![Build Status](https://travis-ci.org/STIXProject/java-stix.svg)](https://travis-ci.org/STIXProject/java-stix)
 
 ## <a name="overview"></a>Overview
 

From b6563d592fd5fcf95ad2f156eadc020bfb3f4c4e Mon Sep 17 00:00:00 2001
From: nemonik <github.com@nemonik.com>
Date: Thu, 21 May 2015 19:20:07 -0400
Subject: [PATCH 15/43] was hitting wrong remote sample xml

---
 src/main/java/org/mitre/stix/STIXSchema.java | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/main/java/org/mitre/stix/STIXSchema.java b/src/main/java/org/mitre/stix/STIXSchema.java
index 55e1c22..81bd43a 100644
--- a/src/main/java/org/mitre/stix/STIXSchema.java
+++ b/src/main/java/org/mitre/stix/STIXSchema.java
@@ -267,8 +267,7 @@ public static void main(String[] args) throws ParserConfigurationException,
 
 		System.out
 				.println(schema
-						.validate(new URL(
-								"https://raw.githubusercontent.com/STIXProject/schemas/master/samples/STIX_Domain_Watchlist.xml")));
+						.validate(new URL("https://raw.githubusercontent.com/STIXProject/python-stix/v1.1.1.5/examples/sample.xml")));
 		
 		System.out.println(schema.getVersion());
 	}

From 3eb212a99372ab3e459e3d086d708674ca55f921 Mon Sep 17 00:00:00 2001
From: nemonik <github.com@nemonik.com>
Date: Thu, 21 May 2015 19:28:06 -0400
Subject: [PATCH 16/43] was hitting wrong remote sample xml

---
 build.gradle      | 2 --
 gradle.properties | 3 ++-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/build.gradle b/build.gradle
index a6bde77..93e2af5 100644
--- a/build.gradle
+++ b/build.gradle
@@ -65,8 +65,6 @@ apply plugin: "signing"
 
 defaultTasks "build"
 
-project.ext.set("schemaVersion", version)
-
 if (!has("release")) {
 	version = "${version}-SNAPSHOT"
 }
diff --git a/gradle.properties b/gradle.properties
index 891b2c6..5261bfb 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,4 +1,5 @@
-version = 1.1.1
+version = 1.1.1.1
+schemaVersion = 1.1.1
 group = org.mitre
 name = stix
 mainClass = org.mitre.stix.STIXSchema
\ No newline at end of file

From 6d03dc5137cfb430cf91b18e9d8ff466a6280bfb Mon Sep 17 00:00:00 2001
From: nemonik <github.com@nemonik.com>
Date: Thu, 21 May 2015 23:29:45 -0400
Subject: [PATCH 17/43] added task to gather up all dependencies

---
 README.MD    | 10 +++++-----
 build.gradle |  5 +++++
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/README.MD b/README.MD
index 858edc4..7fd9bb2 100644
--- a/README.MD
+++ b/README.MD
@@ -33,16 +33,16 @@ Releases are distributed via the Maven Central Repository.
 	<dependency>
 	  <groupId>org.mitre</groupId>
 	  <artifactId>stix</artifactId>
-	  <version>1.1.1</version>
+	  <version>1.1.1.1</version>
 	</dependency>
 
 ### <a name="gradle_dependency_info"></a>Gradle:
 
-	compile 'org.mitre:stix:1.1.1'
+	compile 'org.mitre:stix:1.1.1.1'
 
 ### <a name="ivy__dependency_info"></a>Apache Ivy:
 
-	<dependency org="org.mitre" name="stix" rev="1.1.1" />
+	<dependency org="org.mitre" name="stix" rev="1.1.1.1" />
 
 ## <a name="snapshots"></a>Snapshots
 
@@ -65,7 +65,7 @@ Users using Apache Maven for example can simply retrieve java-stix directly via
 		<dependency>
 			<groupId>org.mitre</groupId>
 			<artifactId>stix</artifactId>
-			<version>1.1.1-SNAPSHOT</version>
+			<version>1.1.1.1-SNAPSHOT</version>
 		</dependency>
 	</dependencies>
 
@@ -146,7 +146,7 @@ commands on the command line:
 
 	git submodule init
 	git submodule update --force
-	cd src/main/resources/schemas/v1.1.1
+	cd src/main/resources/schemas/v1.1.1.
 	git checkout tags/v1.1.1
     
 Your not done.  You'll also need to retrieve the CybOX schemas.
diff --git a/build.gradle b/build.gradle
index 93e2af5..bc0500c 100644
--- a/build.gradle
+++ b/build.gradle
@@ -131,6 +131,11 @@ task execute(type:JavaExec) {
 	classpath = sourceSets.main.runtimeClasspath
 }
 
+task gatherDependencies(type: Copy) {
+	into "${buildDir}/dependencies"
+	from configurations.runtime
+}
+
 uploadArchives{
 	configuration = configurations.archives
 	repositories {

From ccc8bce1739592994fc3eb2ef9ac29307f5c7355 Mon Sep 17 00:00:00 2001
From: nemonik <github.com@nemonik.com>
Date: Fri, 22 May 2015 14:18:44 -0400
Subject: [PATCH 18/43] changes so validation error msgs can be retrieved

---
 src/main/java/org/mitre/stix/STIXSchema.java | 26 ++++++++++++++------
 1 file changed, 19 insertions(+), 7 deletions(-)

diff --git a/src/main/java/org/mitre/stix/STIXSchema.java b/src/main/java/org/mitre/stix/STIXSchema.java
index 81bd43a..1aea288 100644
--- a/src/main/java/org/mitre/stix/STIXSchema.java
+++ b/src/main/java/org/mitre/stix/STIXSchema.java
@@ -40,6 +40,7 @@
 import org.w3c.dom.Element;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
+import org.xml.sax.ErrorHandler;
 import org.xml.sax.SAXException;
 
 /**
@@ -87,7 +88,8 @@ private STIXSchema() {
 		this.version = ((Version) this.getClass().getPackage()
 				.getAnnotation(Version.class)).schema();
 
-		ResourcePatternResolver patternResolver = new PathMatchingResourcePatternResolver();
+		ResourcePatternResolver patternResolver = new PathMatchingResourcePatternResolver(
+				this.getClass().getClassLoader());
 		Resource[] schemaResources;
 
 		try {
@@ -166,6 +168,16 @@ private STIXSchema() {
 		}
 	}
 
+	/**
+	 * Override the default ValidationErrorHandler with one of your own.
+	 * 
+	 * @param customErrorHandler
+	 *            The Handler to use instead.
+	 */
+	public void setValidationErrorHandler(ErrorHandler customErrorHandler) {
+		validator.setErrorHandler(customErrorHandler);
+	}
+
 	/**
 	 * Returns the schema version
 	 * 
@@ -243,6 +255,7 @@ public boolean validate(String xmlText) {
 		} catch (IOException e) {
 			throw new RuntimeException(e);
 		} catch (SAXException e) {
+			System.out.println("---------\n" + e + "--------\n");
 			return false;
 		}
 
@@ -267,8 +280,9 @@ public static void main(String[] args) throws ParserConfigurationException,
 
 		System.out
 				.println(schema
-						.validate(new URL("https://raw.githubusercontent.com/STIXProject/python-stix/v1.1.1.5/examples/sample.xml")));
-		
+						.validate(new URL(
+								"https://raw.githubusercontent.com/STIXProject/python-stix/v1.1.1.5/examples/sample.xml")));
+
 		System.out.println(schema.getVersion());
 	}
 
@@ -297,11 +311,9 @@ public static String getNamespaceURI(Object obj) {
 	 */
 	public static String getName(Object obj) {
 		try {
-			return obj.getClass().getAnnotation(
-					XmlRootElement.class).name();
+			return obj.getClass().getAnnotation(XmlRootElement.class).name();
 		} catch (NullPointerException e) {
-			return obj.getClass().getAnnotation(
-					XmlType.class).name();
+			return obj.getClass().getAnnotation(XmlType.class).name();
 		}
 	}
 

From 663ee11f7e759b23aeba7a5189bab6d74d239a2b Mon Sep 17 00:00:00 2001
From: nemonik <github.com@nemonik.com>
Date: Fri, 29 May 2015 11:08:17 -0400
Subject: [PATCH 19/43] changes to STIXSchema

---
 src/main/java/org/mitre/stix/STIXSchema.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/org/mitre/stix/STIXSchema.java b/src/main/java/org/mitre/stix/STIXSchema.java
index 1aea288..3cb1253 100644
--- a/src/main/java/org/mitre/stix/STIXSchema.java
+++ b/src/main/java/org/mitre/stix/STIXSchema.java
@@ -94,7 +94,7 @@ private STIXSchema() {
 
 		try {
 			schemaResources = patternResolver
-					.getResources("classpath*:schemas/v" + version
+					.getResources("classpath:schemas/v" + version
 							+ "/**/*.xsd");
 
 			prefixSchemaBindings = new HashMap<String, String>();

From a0da82a6c8a90467529e992cd05afe6ab7899d7a Mon Sep 17 00:00:00 2001
From: nemonik <github.com@nemonik.com>
Date: Fri, 29 May 2015 13:36:26 -0400
Subject: [PATCH 20/43] Added a Dockerfile to create java-stix build container

---
 Dockerfile | 79 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 79 insertions(+)
 create mode 100644 Dockerfile

diff --git a/Dockerfile b/Dockerfile
new file mode 100644
index 0000000..ebc67da
--- /dev/null
+++ b/Dockerfile
@@ -0,0 +1,79 @@
+############################################################
+# A Dockerfile used to create a java-stix build container
+# based on Ubunu.
+#
+# Copyright (c) 2015, The MITRE Corporation. All rights reserved.
+# See LICENSE for complete terms.
+#
+# @author nemonik (Michael Joseph Walsh <github.com@nemonik.com>)
+#
+# WHAT TO DO:
+# 
+# If you have Docker installed, from the root of the project run 
+# the following to create a container image for this Dockerfile via:
+#
+# docker build -t java_stix_img . 
+#
+# Then create a container using the image you just created via:
+#
+# docker run -t -i java_stix_img /bin/bash
+#
+# To retreive the jar archives from the running docker container use following 
+# from the command-line of your docker host, not the container:
+#
+# docker cp <container id>:/java-stix/build/libs/stix-1.1.1.1-SNAPSHOT-javadoc.jar .
+# docker cp <container id>:/java-stix/build/libs/stix-1.1.1.1-SNAPSHOT-sources.jar .
+# docker cp <container id>:/java-stix/build/libs/stix-1.1.1.1-SNAPSHOT.jar .
+#
+# If the containder ID is not obvious, but you can also retrieve it via:
+#
+# docker ps
+#
+# An example of retrieving the snapshot jar would be the following:
+#
+# ➜  /tmp  docker cp 83ad9afb6096:/java-stix/build/libs/stix-1.1.1.1-SNAPSHOT.jar . 
+#
+#
+############################################################
+
+# Set base image
+FROM ubuntu
+
+# File Maintainer
+MAINTAINER Michael Joseph Walsh
+
+# Add the application resources URL
+#RUN echo "deb http://archive.ubuntu.com/ubuntu/ $(lsb_release -sc) main universe" >> /etc/apt/sources.list
+
+# Update the sources list
+RUN apt-get update
+
+# Install cmd-line dev toolchain
+RUN apt-get install -y tar git curl nano wget dialog net-tools build-essential
+
+# To install the OpenJDK environment
+#RUN apt-get install default-jdk
+
+# To install the OpenJDK 7, comment out the above and uncomment the following.
+RUN apt-get install -y openjdk-7-jdk
+
+# Optionally to install the Oracle JDK, comment out the above, uncomment the 
+# the next 3 lines, and then uncommment the preferred JDK version.
+#RUN apt-get install python-software-properties
+#RUN add-apt-repository ppa:webupd8team/java
+#RUN apt-get update
+
+#RUN apt-get install oracle-java7-installer
+#RUN apt-get install oracle-java8-installer
+
+# Clone the java-stix repo
+RUN git clone https://github.com/STIXProject/java-stix.git
+
+# Open the java-stix project
+WORKDIR java-stix
+
+# Checkout the v1.1.1.1 branch
+RUN git checkout -b v1.1.1.1 origin/v1.1.1.1
+
+# Build unsigned jar archives in debug to /java-stix/build/libs
+RUN ./gradlew -x signArchives -d 

From bfa3776ec34f1ffc8bca58da5e28175f4e544a9f Mon Sep 17 00:00:00 2001
From: nemonik <github.com@nemonik.com>
Date: Fri, 29 May 2015 16:02:37 -0400
Subject: [PATCH 21/43] modified to use ubuntu:15.04 as a base

---
 Dockerfile | 21 +++++++++------------
 1 file changed, 9 insertions(+), 12 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index ebc67da..3a4eaff 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -16,7 +16,7 @@
 #
 # Then create a container using the image you just created via:
 #
-# docker run -t -i java_stix_img /bin/bash
+# docker run -t -i java_stix_img_v1_1_1_1 /bin/bash
 #
 # To retreive the jar archives from the running docker container use following 
 # from the command-line of your docker host, not the container:
@@ -37,31 +37,28 @@
 ############################################################
 
 # Set base image
-FROM ubuntu
+FROM ubuntu:15.04
 
 # File Maintainer
 MAINTAINER Michael Joseph Walsh
 
-# Add the application resources URL
-#RUN echo "deb http://archive.ubuntu.com/ubuntu/ $(lsb_release -sc) main universe" >> /etc/apt/sources.list
-
 # Update the sources list
 RUN apt-get update
 
 # Install cmd-line dev toolchain
 RUN apt-get install -y tar git curl nano wget dialog net-tools build-essential
 
-# To install the OpenJDK environment
-#RUN apt-get install default-jdk
+# To install the default OpenJDK environment
+RUN apt-get -y install openjdk-8-jdk
 
 # To install the OpenJDK 7, comment out the above and uncomment the following.
-RUN apt-get install -y openjdk-7-jdk
+#RUN apt-get install -y openjdk-7-jdk
 
 # Optionally to install the Oracle JDK, comment out the above, uncomment the 
 # the next 3 lines, and then uncommment the preferred JDK version.
-#RUN apt-get install python-software-properties
-#RUN add-apt-repository ppa:webupd8team/java
-#RUN apt-get update
+#RUN apt-get -y install python-software-properties
+#RUN add-apt-repository -y ppa:webupd8team/java
+#RUN apt-get -y update
 
 #RUN apt-get install oracle-java7-installer
 #RUN apt-get install oracle-java8-installer
@@ -76,4 +73,4 @@ WORKDIR java-stix
 RUN git checkout -b v1.1.1.1 origin/v1.1.1.1
 
 # Build unsigned jar archives in debug to /java-stix/build/libs
-RUN ./gradlew -x signArchives -d 
+RUN ./gradlew -x signArchives -d

From 141d0a1d4427dd98bffcce98a6c32495d635fe0e Mon Sep 17 00:00:00 2001
From: nemonik <github.com@nemonik.com>
Date: Fri, 29 May 2015 19:29:42 -0400
Subject: [PATCH 22/43] modified gradle to target Java v1.7

---
 README.MD    | 32 +++++++++++++++++++++++++++++++-
 build.gradle |  5 +++++
 2 files changed, 36 insertions(+), 1 deletion(-)

diff --git a/README.MD b/README.MD
index 7fd9bb2..907b492 100644
--- a/README.MD
+++ b/README.MD
@@ -319,7 +319,7 @@ this platform.  You will need additional dependencies normally found in UNIX,
 such as, GNU patch.  GNU Patch can be installed via either cygwin, Chocolatey, 
 or directly.  Then you'll need to work out permission elevation  issues so 
 Gradle can execute the command-line GNU patch command through Gradle's Ant 
-integration.
+integration. Alternatively, see the section on [building using the Dockerfil](#building_via_docker).
 
 To build on Windows use the gradlew batch script like so:
 
@@ -334,6 +334,36 @@ If the build goes well you will find the jars:
 where `${version}` is replaced with the `version` number in the Gradle build 
 script.  
 
+### <a name="building_via_docker"></a>Building via the Dockerfile
+
+If you have Docker installed, from the root of the project run 
+the following to create a container image for this Dockerfile via:
+
+	docker build -t java_stix_img_v1_2_0_1 . 
+
+Then create a container using the image you just created via:
+
+	docker run -t -i java_stix_img_v1_2_0_1 /bin/bash
+
+To retreive the jar archives from the running docker container use following 
+from the command-line of your docker host, not the container:
+
+	docker cp <container id>:/java-stix/build/libs/stix-1.2.0.1-SNAPSHOT-javadoc.jar .
+	docker cp <container id>:/java-stix/build/libs/stix-1.2.0.1-SNAPSHOT-sources.jar .
+	docker cp <container id>:/java-stix/build/libs/stix-1.2.0.1-SNAPSHOT.jar .
+
+If the containder ID is not obvious, but you can also retrieve it via:
+
+	docker ps
+
+An example of retrieving the snapshot jar would be the following:
+
+	docker cp 83ad9afb6096:/java-stix/build/libs/stix-1.2.0.1-SNAPSHOT.jar . 
+	
+By default the Docker container will build using OpenJdk 7.  You can modify
+the Dockerfile to other JVM's noted in the file.  Please, note Gradle targets 
+Java 1.7 compatibility regardless.
+
 ### <a name="importing_into_eclipse"></a>Importing the project into Eclipse
 
 As Eclipse's various Gradle plugins have varying degrees of usefulness, I 
diff --git a/build.gradle b/build.gradle
index bc0500c..4a748b8 100644
--- a/build.gradle
+++ b/build.gradle
@@ -316,6 +316,11 @@ artifacts {
 	archives javadocJar
 }
 
+tasks.withType(JavaCompile) {
+	sourceCompatibility = "1.7"
+	targetCompatibility = "1.7"
+}
+
 buildscript {
 	repositories {
 		jcenter()

From 05845d00f00fed1e3f8d2fc3e3d1c00232d04f61 Mon Sep 17 00:00:00 2001
From: nemonik <github.com@nemonik.com>
Date: Fri, 29 May 2015 20:17:06 -0400
Subject: [PATCH 23/43] don't include the v1.2.0 schema as a resource

---
 build.gradle | 1 +
 1 file changed, 1 insertion(+)

diff --git a/build.gradle b/build.gradle
index 4a748b8..a74224d 100644
--- a/build.gradle
+++ b/build.gradle
@@ -236,6 +236,7 @@ sourceSets {
 			srcDir("src/main/resources")
 			exclude "*.xjb"
 			exclude "**/v1.2-rc1"
+			exclude "**/v1.2.0"
 		}
 	}
 }

From 56605d4e078f62caeaac927fd85c4777e08085c2 Mon Sep 17 00:00:00 2001
From: nemonik <github.com@nemonik.com>
Date: Mon, 1 Jun 2015 14:38:18 -0400
Subject: [PATCH 24/43] DOC: sitx schema retrieval tweak

---
 README.MD | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/README.MD b/README.MD
index 907b492..3bc877b 100644
--- a/README.MD
+++ b/README.MD
@@ -146,8 +146,9 @@ commands on the command line:
 
 	git submodule init
 	git submodule update --force
-	cd src/main/resources/schemas/v1.1.1.
+	cd src/main/resources/schemas/v1.1.1
 	git checkout tags/v1.1.1
+
     
 Your not done.  You'll also need to retrieve the CybOX schemas.
 
@@ -155,8 +156,10 @@ Your not done.  You'll also need to retrieve the CybOX schemas.
 
 While in the project:
 
+	cd src/main/resources/schemas/v1.1.1
 	git submodule init
 	git submodule update --force
+	cd cybox
 	git checkout 3442ebe50385d3bd0b3305952b90d296e0a1242c
 
 When Gradle build script first runs it will also patch the CybOX schemas so 

From efb60c485ad98d5c8aac5a2bff1cb4a8d8c28659 Mon Sep 17 00:00:00 2001
From: nemonik <github.com@nemonik.com>
Date: Mon, 1 Jun 2015 15:02:47 -0400
Subject: [PATCH 25/43] DOC: typo correction

---
 README.MD | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.MD b/README.MD
index 3bc877b..9fcd248 100644
--- a/README.MD
+++ b/README.MD
@@ -322,7 +322,7 @@ this platform.  You will need additional dependencies normally found in UNIX,
 such as, GNU patch.  GNU Patch can be installed via either cygwin, Chocolatey, 
 or directly.  Then you'll need to work out permission elevation  issues so 
 Gradle can execute the command-line GNU patch command through Gradle's Ant 
-integration. Alternatively, see the section on [building using the Dockerfil](#building_via_docker).
+integration. Alternatively, see the section on [building using the Dockerfile](#building_via_docker).
 
 To build on Windows use the gradlew batch script like so:
 

From e13ecabe2a1a8ae66347f66206b3a5625a585a1f Mon Sep 17 00:00:00 2001
From: nemonik <github.com@nemonik.com>
Date: Wed, 17 Jun 2015 11:01:22 -0400
Subject: [PATCH 26/43] added repository to retrv openjdk-8-jdk

---
 Dockerfile | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 3a4eaff..e0649c3 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -46,9 +46,11 @@ MAINTAINER Michael Joseph Walsh
 RUN apt-get update
 
 # Install cmd-line dev toolchain
-RUN apt-get install -y tar git curl nano wget dialog net-tools build-essential
+RUN apt-get install -y tar git curl nano wget dialog net-tools build-essential software-properties-common
 
 # To install the default OpenJDK environment
+RUN add-apt-repository -y ppa:openjdk-r/ppa
+RUN apt-get -y update 
 RUN apt-get -y install openjdk-8-jdk
 
 # To install the OpenJDK 7, comment out the above and uncomment the following.

From 74537a191f470eb1a82086630e3aeb785f501662 Mon Sep 17 00:00:00 2001
From: nemonik <github.com@nemonik.com>
Date: Mon, 22 Jun 2015 13:25:27 -0400
Subject: [PATCH 27/43] modified Dockerfile and move to 2.4 gradle wrapper

---
 .travis.yml                              |   4 ++--
 Dockerfile                               |  12 ++++++------
 circle.yml                               |   4 ++--
 gradle/wrapper/gradle-wrapper.jar        | Bin 52141 -> 52266 bytes
 gradle/wrapper/gradle-wrapper.properties |   4 ++--
 gradlew                                  |   4 ++--
 gradlew.bat                              |   4 ++--
 7 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 6f988d3..39d388a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,8 +6,8 @@ jdk:
 before_install:
   - chmod +x gradlew
 
-env: GRADLE_OPTS=-Dorg.gradle.daemon=true
+env: GRADLE_OPTS=-Dorg.gradle.daemon=true -Xmx1024m -Xms256m
 env: CI_OPTS=--stacktrace
 
 install: /bin/true
-script: "./gradlew -x signArchives"
\ No newline at end of file
+script: "./gradlew -x signArchives"
diff --git a/Dockerfile b/Dockerfile
index e0649c3..1838bd2 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -43,7 +43,7 @@ FROM ubuntu:15.04
 MAINTAINER Michael Joseph Walsh
 
 # Update the sources list
-RUN apt-get update
+RUN apt-get -y update
 
 # Install cmd-line dev toolchain
 RUN apt-get install -y tar git curl nano wget dialog net-tools build-essential software-properties-common
@@ -65,14 +65,14 @@ RUN apt-get -y install openjdk-8-jdk
 #RUN apt-get install oracle-java7-installer
 #RUN apt-get install oracle-java8-installer
 
-# Clone the java-stix repo
-RUN git clone https://github.com/STIXProject/java-stix.git
+# Clone java-stix repo at the current branch into the container
+COPY . java-stix
 
 # Open the java-stix project
 WORKDIR java-stix
 
-# Checkout the v1.1.1.1 branch
-RUN git checkout -b v1.1.1.1 origin/v1.1.1.1
-
 # Build unsigned jar archives in debug to /java-stix/build/libs
 RUN ./gradlew -x signArchives -d
+
+# Clean up APT when done.
+RUN apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
diff --git a/circle.yml b/circle.yml
index 694bb8d..eb3efff 100644
--- a/circle.yml
+++ b/circle.yml
@@ -2,9 +2,9 @@ machine:
   java:
     version: oraclejdk7
   environment:
-    GRADLE_OPTS: -Dorg.gradle.daemon=true
+    GRADLE_OPTS: -Dorg.gradle.daemon=true  -Xmx1024m -Xms256m
     CI_OPTS: --stacktrace --debug
 
 test:
   override:
-    - ./gradlew -x signArchives
\ No newline at end of file
+    - ./gradlew -x signArchives
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index 085a1cdc27db1185342f15a00441734e74fe3735..b5166dad4d90021f6a0b45268c0755719f1d5cd4 100644
GIT binary patch
delta 8640
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
OP8h~Ugm3;c@_zu%56iCr

delta 8509
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

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 0fcaf33..6968be7 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Mon Apr 27 15:56:20 EDT 2015
+#Mon Jun 22 12:47:09 EDT 2015
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.4-bin.zip
diff --git a/gradlew b/gradlew
index 745c3a5..91a7e26 100755
--- a/gradlew
+++ b/gradlew
@@ -7,7 +7,7 @@
 ##############################################################################
 
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS="-Dorg.gradle.daemon=true -Xmx1024m -Xms256m -XX:+CMSClassUnloadingEnabled -XX:+HeapDumpOnOutOfMemoryError"
+DEFAULT_JVM_OPTS=""
 
 APP_NAME="Gradle"
 APP_BASE_NAME=`basename "$0"`
@@ -161,4 +161,4 @@ function splitJvmOpts() {
 eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
 JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
 
-exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain $CI_OPTS "$@" 
+exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
diff --git a/gradlew.bat b/gradlew.bat
index f4679dd..aec9973 100644
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -9,7 +9,7 @@
 if "%OS%"=="Windows_NT" setlocal
 
 @rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS="-Dorg.gradle.daemon=true -Xmx1024m -Xms256m -XX:+CMSClassUnloadingEnabled -XX:+HeapDumpOnOutOfMemoryError"
+set DEFAULT_JVM_OPTS=
 
 set DIRNAME=%~dp0
 if "%DIRNAME%" == "" set DIRNAME=.
@@ -72,7 +72,7 @@ set CMD_LINE_ARGS=%$
 set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
 @rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CI_OPTS% %CMD_LINE_ARGS%
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
 
 :end
 @rem End local scope for the variables with windows NT shell

From e6963a8dc475cd9ff02dab199f5d181624e203cb Mon Sep 17 00:00:00 2001
From: nemonik <github.com@nemonik.com>
Date: Mon, 22 Jun 2015 14:32:39 -0400
Subject: [PATCH 28/43] travisci env fix

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 39d388a..a5e140a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,7 +6,7 @@ jdk:
 before_install:
   - chmod +x gradlew
 
-env: GRADLE_OPTS=-Dorg.gradle.daemon=true -Xmx1024m -Xms256m
+env: GRADLE_OPTS="-Dorg.gradle.daemon=true -Xmx1024m -Xms256m"
 env: CI_OPTS=--stacktrace
 
 install: /bin/true

From 523c388a06c25d392d4d5461741ffbce93f5ab0f Mon Sep 17 00:00:00 2001
From: nemonik <github.com@nemonik.com>
Date: Mon, 22 Jun 2015 14:51:34 -0400
Subject: [PATCH 29/43] fixing ci pipeline

---
 .travis.yml  | 2 +-
 build.gradle | 7 +++++++
 circle.yml   | 2 +-
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index a5e140a..f887409 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,7 +6,7 @@ jdk:
 before_install:
   - chmod +x gradlew
 
-env: GRADLE_OPTS="-Dorg.gradle.daemon=true -Xmx1024m -Xms256m"
+env: GRADLE_OPTS=-Dorg.gradle.daemon=true
 env: CI_OPTS=--stacktrace
 
 install: /bin/true
diff --git a/build.gradle b/build.gradle
index a74224d..6bd1c20 100644
--- a/build.gradle
+++ b/build.gradle
@@ -101,6 +101,13 @@ if (!has("skipPackageInfo")) {
 
 task wrapper(type: Wrapper) {
 	gradleVersion = '2.4'
+	def jvmOpts='-Xmx1024m -Xms256m'
+	inputs.property("jvmOpts", jvmOpts)
+	doLast {
+		def optsEnvVar = "DEFAULT_JVM_OPTS"
+ 		scriptFile.write scriptFile.text.replace("$optsEnvVar=\"\"", "$optsEnvVar=\"$jvmOpts\"")
+		batchScript.write batchScript.text.replace("set $optsEnvVar=", "set $optsEnvVar=$jvmOpts")
+	}
 }
 
 task javadocJar(type: Jar) {
diff --git a/circle.yml b/circle.yml
index eb3efff..be88d48 100644
--- a/circle.yml
+++ b/circle.yml
@@ -2,7 +2,7 @@ machine:
   java:
     version: oraclejdk7
   environment:
-    GRADLE_OPTS: -Dorg.gradle.daemon=true  -Xmx1024m -Xms256m
+    GRADLE_OPTS: -Dorg.gradle.daemon=true
     CI_OPTS: --stacktrace --debug
 
 test:

From a381f57b7479af423f282b5190b226321b961d98 Mon Sep 17 00:00:00 2001
From: nemonik <github.com@nemonik.com>
Date: Mon, 22 Jun 2015 14:52:33 -0400
Subject: [PATCH 30/43] fixing ci pipeline

---
 gradle/wrapper/gradle-wrapper.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 6968be7..f01ac3f 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,4 +1,4 @@
-#Mon Jun 22 12:47:09 EDT 2015
+#Mon Jun 22 14:50:21 EDT 2015
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME

From 391250e452d59b6032df7a8ccd250752d4cecc9c Mon Sep 17 00:00:00 2001
From: nemonik <github.com@nemonik.com>
Date: Mon, 22 Jun 2015 14:53:27 -0400
Subject: [PATCH 31/43] fixing ci pipeline

---
 gradlew     | 2 +-
 gradlew.bat | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/gradlew b/gradlew
index 91a7e26..8c1075e 100755
--- a/gradlew
+++ b/gradlew
@@ -7,7 +7,7 @@
 ##############################################################################
 
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS=""
+DEFAULT_JVM_OPTS="-Xmx1024m -Xms256m"
 
 APP_NAME="Gradle"
 APP_BASE_NAME=`basename "$0"`
diff --git a/gradlew.bat b/gradlew.bat
index aec9973..c750a85 100644
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -9,7 +9,7 @@
 if "%OS%"=="Windows_NT" setlocal
 
 @rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS=
+set DEFAULT_JVM_OPTS=-Xmx1024m -Xms256m
 
 set DIRNAME=%~dp0
 if "%DIRNAME%" == "" set DIRNAME=.

From e7038e399994401496c83f1a11c7e51c0fed4e72 Mon Sep 17 00:00:00 2001
From: nemonik <github.com@nemonik.com>
Date: Mon, 22 Jun 2015 15:14:49 -0400
Subject: [PATCH 32/43] doc: updated in regards to versioning

---
 README.MD | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/README.MD b/README.MD
index 9fcd248..68d1165 100644
--- a/README.MD
+++ b/README.MD
@@ -22,7 +22,11 @@ replacement for the [python-stix][python stix] API.
 Releases of java-stix will comply with the Semantic Versioning specification at 
 [http://semver.org/][semver]. Java-stix is currently under active development; 
 see TODO.txt for a tentative roadmap.  Releases will be announced on the [STIX 
-discussion list][list].
+discussion list][list]. A java-stix for a particular shema release will match the 
+STIX schema version in Semantic Versioning form. Follow up patched releases of 
+java-stix for a particular schema release will add and increment a 4th digit. For
+example, the first patch release for java-stix `v1.1.1` would be `v1.1.1.1`. Patches 
+will be worked in a branch prior to being tagged and released.
 
 ## <a name="releases"></a>Releases
 

From b8c121b8bc09068a9d799a1961cc0f7d8d4c4516 Mon Sep 17 00:00:00 2001
From: nemonik <github.com@nemonik.com>
Date: Tue, 23 Jun 2015 11:07:05 -0400
Subject: [PATCH 33/43] doc: typo fix

---
 README.MD | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/README.MD b/README.MD
index 68d1165..d7f76cd 100644
--- a/README.MD
+++ b/README.MD
@@ -23,10 +23,10 @@ Releases of java-stix will comply with the Semantic Versioning specification at
 [http://semver.org/][semver]. Java-stix is currently under active development; 
 see TODO.txt for a tentative roadmap.  Releases will be announced on the [STIX 
 discussion list][list]. A java-stix for a particular shema release will match the 
-STIX schema version in Semantic Versioning form. Follow up patched releases of 
-java-stix for a particular schema release will add and increment a 4th digit. For
-example, the first patch release for java-stix `v1.1.1` would be `v1.1.1.1`. Patches 
-will be worked in a branch prior to being tagged and released.
+STIX schema version in Semantic Versioning form. Follow up patches of java-stix 
+for a particular schema release will increment a 4th digit. For example, the first 
+patch release for java-stix `v1.2.0` would be `v1.2.0.1`. Patches will be worked 
+in a branch prior to being tagged and released.
 
 ## <a name="releases"></a>Releases
 

From 23607c77879ba23fe33a2678716a7f59d9d460c2 Mon Sep 17 00:00:00 2001
From: nemonik <github.com@nemonik.com>
Date: Tue, 23 Jun 2015 11:07:42 -0400
Subject: [PATCH 34/43] doc: typo fix

---
 README.MD | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.MD b/README.MD
index d7f76cd..c164356 100644
--- a/README.MD
+++ b/README.MD
@@ -22,10 +22,10 @@ replacement for the [python-stix][python stix] API.
 Releases of java-stix will comply with the Semantic Versioning specification at 
 [http://semver.org/][semver]. Java-stix is currently under active development; 
 see TODO.txt for a tentative roadmap.  Releases will be announced on the [STIX 
-discussion list][list]. A java-stix for a particular shema release will match the 
+discussion list][list]. A java-stix for a particular schema release will match the 
 STIX schema version in Semantic Versioning form. Follow up patches of java-stix 
 for a particular schema release will increment a 4th digit. For example, the first 
-patch release for java-stix `v1.2.0` would be `v1.2.0.1`. Patches will be worked 
+patch release for java-stix `v1.1.1` would be `v1.1.1.1`. Patches will be worked 
 in a branch prior to being tagged and released.
 
 ## <a name="releases"></a>Releases

From 10f8ee16a6743da63a161d5a0530104e8e3b206c Mon Sep 17 00:00:00 2001
From: nemonik <github.com@nemonik.com>
Date: Sun, 28 Jun 2015 23:48:03 -0400
Subject: [PATCH 35/43] change to allow validation to thrown SAXException, when
 no ErrorHandler is set

---
 .../GeneratedSourceTransformationTask.groovy  |  8 +++++--
 src/main/java/org/mitre/stix/STIXSchema.java  | 24 +++++++++++++------
 .../org/mitre/stix/examples/CIQIdentity.java  |  3 +++
 .../stix/examples/CreationToolMetadata.java   |  3 +++
 .../mitre/stix/examples/IndicatorHash.java    |  3 +++
 5 files changed, 32 insertions(+), 9 deletions(-)

diff --git a/buildSrc/src/main/groovy/org/mitre/stix/GeneratedSourceTransformationTask.groovy b/buildSrc/src/main/groovy/org/mitre/stix/GeneratedSourceTransformationTask.groovy
index 8c90916..9e43f3a 100644
--- a/buildSrc/src/main/groovy/org/mitre/stix/GeneratedSourceTransformationTask.groovy
+++ b/buildSrc/src/main/groovy/org/mitre/stix/GeneratedSourceTransformationTask.groovy
@@ -304,6 +304,7 @@ class GeneratedSourceTransformationTask extends DefaultTask {
 						[
 							imports: 
 							[
+								"org.xml.sax.SAXException"
 							],
 							template:
 								"""\
@@ -311,9 +312,12 @@ class GeneratedSourceTransformationTask extends DefaultTask {
 	 * Validates the XML representation of this \${name} instance
 	 * Returning true indicating a successful validation, false if not.
 	 * 
-	 * @return boolean
+	 * @return boolean True If it validates against the schema
+	 * @throws SAXException
+	 *             If the a validation ErrorHandler has not been set, and
+	 *             validation throws a SAXException
 	 */
-	public boolean validate() {
+	public boolean validate() throws SAXException {
 		return STIXSchema.getInstance().validate(toXMLString());
 	}
 """
diff --git a/src/main/java/org/mitre/stix/STIXSchema.java b/src/main/java/org/mitre/stix/STIXSchema.java
index 3cb1253..b9212e2 100644
--- a/src/main/java/org/mitre/stix/STIXSchema.java
+++ b/src/main/java/org/mitre/stix/STIXSchema.java
@@ -94,8 +94,7 @@ private STIXSchema() {
 
 		try {
 			schemaResources = patternResolver
-					.getResources("classpath:schemas/v" + version
-							+ "/**/*.xsd");
+					.getResources("classpath:schemas/v" + version + "/**/*.xsd");
 
 			prefixSchemaBindings = new HashMap<String, String>();
 
@@ -192,8 +191,12 @@ public String getVersion() {
 	 * 
 	 * @param url
 	 *            The URL object for the XML to be validated.
+	 * @return boolean True If the xmlText validates against the schema
+	 * @throws SAXException
+	 *             If the a validation ErrorHandler has not been set, and
+	 *             validation throws a SAXException
 	 */
-	public boolean validate(URL url) {
+	public boolean validate(URL url) throws SAXException {
 
 		String xmlText = null;
 
@@ -211,8 +214,12 @@ public boolean validate(URL url) {
 	 * 
 	 * @param xmlText
 	 *            A string of XML text to be validated
+	 * @return boolean True If the xmlText validates against the schema
+	 * @throws SAXException
+	 *             If the a validation ErrorHandler has not been set, and
+	 *             validation throws a SAXException
 	 */
-	public boolean validate(String xmlText) {
+	public boolean validate(String xmlText) throws SAXException {
 
 		DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
 		factory.setNamespaceAware(true);
@@ -251,12 +258,15 @@ public boolean validate(String xmlText) {
 		try {
 			validator.validate(new StreamSource(new ByteArrayInputStream(
 					xmlText.getBytes(StandardCharsets.UTF_8))));
-
 		} catch (IOException e) {
 			throw new RuntimeException(e);
 		} catch (SAXException e) {
-			System.out.println("---------\n" + e + "--------\n");
-			return false;
+			if (this.validator.getErrorHandler() != null) {
+				return false;
+			} else {
+				//re-throw the SAXException
+				throw e;
+			}
 		}
 
 		return true;
diff --git a/src/main/java/org/mitre/stix/examples/CIQIdentity.java b/src/main/java/org/mitre/stix/examples/CIQIdentity.java
index 579d531..02f1316 100644
--- a/src/main/java/org/mitre/stix/examples/CIQIdentity.java
+++ b/src/main/java/org/mitre/stix/examples/CIQIdentity.java
@@ -43,6 +43,7 @@
 import org.mitre.stix.stix_1.IndicatorsType;
 import org.mitre.stix.stix_1.STIXHeaderType;
 import org.mitre.stix.stix_1.STIXPackage;
+import org.xml.sax.SAXException;
 
 /**
  * An example of how to add CIQ Identity information to a STIX Indicator.
@@ -190,6 +191,8 @@ public static void main(String[] args) {
 
 		} catch (DatatypeConfigurationException e) {
 			throw new RuntimeException(e);
+		} catch (SAXException e) {
+			e.printStackTrace();
 		}
 	}
 }
diff --git a/src/main/java/org/mitre/stix/examples/CreationToolMetadata.java b/src/main/java/org/mitre/stix/examples/CreationToolMetadata.java
index 1f37ddb..87b40c3 100644
--- a/src/main/java/org/mitre/stix/examples/CreationToolMetadata.java
+++ b/src/main/java/org/mitre/stix/examples/CreationToolMetadata.java
@@ -20,6 +20,7 @@
 import org.mitre.stix.common_1.StructuredTextType;
 import org.mitre.stix.stix_1.STIXHeaderType;
 import org.mitre.stix.stix_1.STIXPackage;
+import org.xml.sax.SAXException;
 
 /**
  * Build a STIX Document with Tool Information
@@ -69,6 +70,8 @@ public static void main(String[] args) {
 
 		} catch (DatatypeConfigurationException e) {
 			throw new RuntimeException(e);
+		} catch (SAXException e) {
+			e.printStackTrace();
 		}
 	}
 }
diff --git a/src/main/java/org/mitre/stix/examples/IndicatorHash.java b/src/main/java/org/mitre/stix/examples/IndicatorHash.java
index 7144b59..b9120ff 100644
--- a/src/main/java/org/mitre/stix/examples/IndicatorHash.java
+++ b/src/main/java/org/mitre/stix/examples/IndicatorHash.java
@@ -32,6 +32,7 @@
 import org.mitre.stix.stix_1.IndicatorsType;
 import org.mitre.stix.stix_1.STIXHeaderType;
 import org.mitre.stix.stix_1.STIXPackage;
+import org.xml.sax.SAXException;
 
 /**
  * Build a STIX Indicator document containing a File observable with an
@@ -129,6 +130,8 @@ public static void main(String[] args) {
 
 		} catch (DatatypeConfigurationException e) {
 			throw new RuntimeException(e);
+		} catch (SAXException e) {
+			e.printStackTrace();
 		}
 	}
 }

From 72cbf2f76f9aea01168f65c4f6f7aad33af88847 Mon Sep 17 00:00:00 2001
From: nemonik <github.com@nemonik.com>
Date: Mon, 29 Jun 2015 00:48:43 -0400
Subject: [PATCH 36/43] changed the version

---
 gradle.properties | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gradle.properties b/gradle.properties
index 5261bfb..f67f5d0 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,5 +1,5 @@
-version = 1.1.1.1
+version = 1.1.1.2
 schemaVersion = 1.1.1
 group = org.mitre
 name = stix
-mainClass = org.mitre.stix.STIXSchema
\ No newline at end of file
+mainClass = org.mitre.stix.STIXSchema

From 14e239c654b9727e1b37623e51838ffe69dc56c1 Mon Sep 17 00:00:00 2001
From: nemonik <github.com@nemonik.com>
Date: Mon, 29 Jun 2015 13:54:06 -0400
Subject: [PATCH 37/43] synchronized validation to avoid concurrency issues
 like FWK005

---
 src/main/java/org/mitre/stix/STIXSchema.java | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/mitre/stix/STIXSchema.java b/src/main/java/org/mitre/stix/STIXSchema.java
index b9212e2..ca16a2f 100644
--- a/src/main/java/org/mitre/stix/STIXSchema.java
+++ b/src/main/java/org/mitre/stix/STIXSchema.java
@@ -256,8 +256,12 @@ public boolean validate(String xmlText) throws SAXException {
 		}
 
 		try {
-			validator.validate(new StreamSource(new ByteArrayInputStream(
-					xmlText.getBytes(StandardCharsets.UTF_8))));
+			// synchronized to avoid org.xml.sax.SAXException: FWK005 parse may
+			// not be called while parsing.
+			synchronized (this) {
+				validator.validate(new StreamSource(new ByteArrayInputStream(
+						xmlText.getBytes(StandardCharsets.UTF_8))));
+			}
 		} catch (IOException e) {
 			throw new RuntimeException(e);
 		} catch (SAXException e) {

From ebc5628434d4399369102756749bebeefa19f20c Mon Sep 17 00:00:00 2001
From: nemonik <github.com@nemonik.com>
Date: Tue, 30 Jun 2015 02:06:36 -0400
Subject: [PATCH 38/43] doc: update Dockerfile and README.MD documentation

---
 Dockerfile | 12 +++++------
 README.MD  | 63 +++++++++++++++++++++++++++++++-----------------------
 2 files changed, 42 insertions(+), 33 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 1838bd2..4ec68c3 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -12,18 +12,18 @@
 # If you have Docker installed, from the root of the project run 
 # the following to create a container image for this Dockerfile via:
 #
-# docker build -t java_stix_img . 
+# docker build -t nemonik/java-stix . 
 #
 # Then create a container using the image you just created via:
 #
-# docker run -t -i java_stix_img_v1_1_1_1 /bin/bash
+# docker run -t -i nemonik/java-stix /bin/bash
 #
-# To retreive the jar archives from the running docker container use following 
+# To retrieve the jar archives from the running docker container use following 
 # from the command-line of your docker host, not the container:
 #
-# docker cp <container id>:/java-stix/build/libs/stix-1.1.1.1-SNAPSHOT-javadoc.jar .
-# docker cp <container id>:/java-stix/build/libs/stix-1.1.1.1-SNAPSHOT-sources.jar .
-# docker cp <container id>:/java-stix/build/libs/stix-1.1.1.1-SNAPSHOT.jar .
+# docker cp <container id>:/java-stix/build/libs/stix-1.2.0.2-SNAPSHOT-javadoc.jar .
+# docker cp <container id>:/java-stix/build/libs/stix-1.2.0.2-SNAPSHOT-sources.jar .
+# docker cp <container id>:/java-stix/build/libs/stix-1.2.0.2-SNAPSHOT.jar .
 #
 # If the containder ID is not obvious, but you can also retrieve it via:
 #
diff --git a/README.MD b/README.MD
index c164356..11d5bf3 100644
--- a/README.MD
+++ b/README.MD
@@ -1,6 +1,6 @@
 # <a name="intro"></a>java-stix 
 
-The Java bindings for STIX, the Structured Threat Information  eXpression 
+The Java bindings for STIX, the Structured Threat Information eXpression 
 language used for representing structured cyber threat information.
 
 java-stix is being developed under the official [STIXProject][stix project]
@@ -25,9 +25,17 @@ see TODO.txt for a tentative roadmap.  Releases will be announced on the [STIX
 discussion list][list]. A java-stix for a particular schema release will match the 
 STIX schema version in Semantic Versioning form. Follow up patches of java-stix 
 for a particular schema release will increment a 4th digit. For example, the first 
-patch release for java-stix `v1.1.1` would be `v1.1.1.1`. Patches will be worked 
+patch release for java-stix `v1.2.0` would be `v1.2.0.2`. Patches will be worked 
 in a branch prior to being tagged and released.
 
+## <a name="question"></a>Got a Question or Problem?
+
+If you have questions about how to use java-stix, please direct these to the [STIX discussion list][list].
+
+## <a name="contribute"></a>Contributing to java-stix?
+
+We'd welcome you contributing to java-stix. Read the [CONTRIBUTING.MD](CONTRIBUTING.MD) for guidlines.
+
 ## <a name="releases"></a>Releases
 
 Releases are distributed via the Maven Central Repository. 
@@ -37,16 +45,16 @@ Releases are distributed via the Maven Central Repository.
 	<dependency>
 	  <groupId>org.mitre</groupId>
 	  <artifactId>stix</artifactId>
-	  <version>1.1.1.1</version>
+	  <version>1.2.0.2</version>
 	</dependency>
 
 ### <a name="gradle_dependency_info"></a>Gradle:
 
-	compile 'org.mitre:stix:1.1.1.1'
+	compile 'org.mitre:stix:1.2.0.2'
 
 ### <a name="ivy__dependency_info"></a>Apache Ivy:
 
-	<dependency org="org.mitre" name="stix" rev="1.1.1.1" />
+	<dependency org="org.mitre" name="stix" rev="1.2.0.2" />
 
 ## <a name="snapshots"></a>Snapshots
 
@@ -69,7 +77,7 @@ Users using Apache Maven for example can simply retrieve java-stix directly via
 		<dependency>
 			<groupId>org.mitre</groupId>
 			<artifactId>stix</artifactId>
-			<version>1.1.1.1-SNAPSHOT</version>
+			<version>1.2.0.2-SNAPSHOT</version>
 		</dependency>
 	</dependencies>
 
@@ -150,21 +158,20 @@ commands on the command line:
 
 	git submodule init
 	git submodule update --force
-	cd src/main/resources/schemas/v1.1.1
-	git checkout tags/v1.1.1
+	cd src/main/resources/schemas/v1.2.0
+	git checkout tags/v1.2.0
 
-    
 Your not done.  You'll also need to retrieve the CybOX schemas.
 
 ### <a name="cybox_schemas"></a>The CybOX schemas
 
 While in the project:
 
-	cd src/main/resources/schemas/v1.1.1
+	cd src/main/resources/schemas/v1.2.0
 	git submodule init
 	git submodule update --force
 	cd cybox
-	git checkout 3442ebe50385d3bd0b3305952b90d296e0a1242c
+	git checkout 97beb32c376a9223e91b52cb3e4c8d2af6baf786
 
 When Gradle build script first runs it will also patch the CybOX schemas so 
 that the JAXB2 Simple Document Object Model can be generated. Once patched, it 
@@ -208,40 +215,42 @@ on UNIX:
 	:clean
 	:retrieveSchemas
 	    Schemas are present. Retrieval is not needed.
-	    /Users/walsh/Development/workspace/java_stix/src/main/resources/schemas/v1.1.1/cybox/objects/Archive_File_Object.xsd already patched.
+	    /Users/walsh/Development/workspace/java_stix/src/main/resources/schemas/v1.2.0/cybox/objects/Archive_File_Object.xsd already patched.
 	:createPrefixNamespaceBindings
-	    schemas/v1.1.1/external/open_ioc_2010/ioc.xsd claims the same prefix "tns" as schemas/v1.1.1/external/open_ioc_2010/ioc-TR.xsd
+	    schemas/v1.2.0/external/open_ioc_2010/ioc.xsd claims the same prefix "tns" as schemas/v1.2.0/external/open_ioc_2010/ioc-TR.xsd
 	:generateJAXB
-	    Generating JAXB model to /Users/walsh/Development/workspace/java_stix/src/generated/java for STIX Schema v1.1.1 found in /Users/walsh/Development/workspace/java_stix/src/main/resources/schemas/v1.1.1
+	    Generating JAXB model to /Users/walsh/Development/workspace/java_stix/src/generated/java for STIX Schema v1.2.0 found in /Users/walsh/Development/workspace/java_stix/src/main/resources/schemas/v1.2.0
 	:generatedSourceTransformation
 	:createPackageInfo
 	:compileJava
+	warning: [options] bootstrap class path not set in conjunction with -source 1.7
 	Note: Some input files use unchecked or unsafe operations.
 	Note: Recompile with -Xlint:unchecked for details.
+	1 warning
 	:compileGroovy UP-TO-DATE
 	:processResources
 	:classes
 	:jar
 	:javadoc
 	/Users/walsh/Development/workspace/java_stix/src/generated/java/org/w3/_2000/_09/xmldsig/ObjectFactory.java:277: warning - Tag @link: reference not found: byte[]
-	/Users/walsh/Development/workspace/java_stix/src/generated/java/org/w3/_2000/_09/xmldsig/ObjectFactory.java:287: warning - Tag @link: reference not found: byte[]
 	/Users/walsh/Development/workspace/java_stix/src/generated/java/org/w3/_2000/_09/xmldsig/ObjectFactory.java:361: warning - Tag @link: reference not found: byte[]
+	/Users/walsh/Development/workspace/java_stix/src/generated/java/org/w3/_2000/_09/xmldsig/ObjectFactory.java:341: warning - Tag @link: reference not found: byte[]
+	/Users/walsh/Development/workspace/java_stix/src/generated/java/org/w3/_2000/_09/xmldsig/ObjectFactory.java:311: warning - Tag @link: reference not found: byte[]
 	/Users/walsh/Development/workspace/java_stix/src/generated/java/org/w3/_2000/_09/xmldsig/ObjectFactory.java:331: warning - Tag @link: reference not found: byte[]
-	/Users/walsh/Development/workspace/java_stix/src/generated/java/org/w3/_2000/_09/xmldsig/ObjectFactory.java:351: warning - Tag @link: reference not found: byte[]
 	/Users/walsh/Development/workspace/java_stix/src/generated/java/org/w3/_2000/_09/xmldsig/ObjectFactory.java:277: warning - Tag @link: reference not found: byte[]
-	/Users/walsh/Development/workspace/java_stix/src/generated/java/org/w3/_2000/_09/xmldsig/ObjectFactory.java:287: warning - Tag @link: reference not found: byte[]
+	/Users/walsh/Development/workspace/java_stix/src/generated/java/org/w3/_2000/_09/xmldsig/ObjectFactory.java:311: warning - Tag @link: reference not found: byte[]
 	/Users/walsh/Development/workspace/java_stix/src/generated/java/org/w3/_2000/_09/xmldsig/ObjectFactory.java:331: warning - Tag @link: reference not found: byte[]
-	/Users/walsh/Development/workspace/java_stix/src/generated/java/org/w3/_2000/_09/xmldsig/ObjectFactory.java:351: warning - Tag @link: reference not found: byte[]
+	/Users/walsh/Development/workspace/java_stix/src/generated/java/org/w3/_2000/_09/xmldsig/ObjectFactory.java:341: warning - Tag @link: reference not found: byte[]
 	/Users/walsh/Development/workspace/java_stix/src/generated/java/org/w3/_2000/_09/xmldsig/ObjectFactory.java:361: warning - Tag @link: reference not found: byte[]
 	/Users/walsh/Development/workspace/java_stix/src/generated/java/org/w3/_2000/_09/xmldsig/SPKIData.java:115: warning - Tag @link: reference not found: byte[]
 	/Users/walsh/Development/workspace/java_stix/src/generated/java/org/w3/_2000/_09/xmldsig/X509Data.java:132: warning - Tag @link: reference not found: byte[]
 	/Users/walsh/Development/workspace/java_stix/src/generated/java/org/w3/_2000/_09/xmldsig/X509Data.java:132: warning - Tag @link: reference not found: byte[]
 	/Users/walsh/Development/workspace/java_stix/src/generated/java/org/w3/_2000/_09/xmldsig/X509Data.java:132: warning - Tag @link: reference not found: byte[]
 	/Users/walsh/Development/workspace/java_stix/src/generated/java/org/w3/_2000/_09/xmldsig/ObjectFactory.java:277: warning - Tag @link: reference not found: byte[]
-	/Users/walsh/Development/workspace/java_stix/src/generated/java/org/w3/_2000/_09/xmldsig/ObjectFactory.java:287: warning - Tag @link: reference not found: byte[]
 	/Users/walsh/Development/workspace/java_stix/src/generated/java/org/w3/_2000/_09/xmldsig/ObjectFactory.java:361: warning - Tag @link: reference not found: byte[]
+	/Users/walsh/Development/workspace/java_stix/src/generated/java/org/w3/_2000/_09/xmldsig/ObjectFactory.java:341: warning - Tag @link: reference not found: byte[]
+	/Users/walsh/Development/workspace/java_stix/src/generated/java/org/w3/_2000/_09/xmldsig/ObjectFactory.java:311: warning - Tag @link: reference not found: byte[]
 	/Users/walsh/Development/workspace/java_stix/src/generated/java/org/w3/_2000/_09/xmldsig/ObjectFactory.java:331: warning - Tag @link: reference not found: byte[]
-	/Users/walsh/Development/workspace/java_stix/src/generated/java/org/w3/_2000/_09/xmldsig/ObjectFactory.java:351: warning - Tag @link: reference not found: byte[]
 	19 warnings
 	:javadocJar
 	:sourcesJar
@@ -256,7 +265,7 @@ on UNIX:
 	
 	BUILD SUCCESSFUL
 	
-	Total time: 3 mins 7.702 secs
+	Total time: 3 mins 45.121 secs
 
 Ignore the javadoc tag warnings they have no impact on the build. Also, ignore 
 the warning about unchecked or unsafe operations as they are an artifact of 
@@ -346,18 +355,18 @@ script.
 If you have Docker installed, from the root of the project run 
 the following to create a container image for this Dockerfile via:
 
-	docker build -t java_stix_img_v1_2_0_1 . 
+	docker build -t nemonik/java-stix . 
 
 Then create a container using the image you just created via:
 
-	docker run -t -i java_stix_img_v1_2_0_1 /bin/bash
+	docker run -t -i nemonik/java-stix /bin/bash
 
 To retreive the jar archives from the running docker container use following 
 from the command-line of your docker host, not the container:
 
-	docker cp <container id>:/java-stix/build/libs/stix-1.2.0.1-SNAPSHOT-javadoc.jar .
-	docker cp <container id>:/java-stix/build/libs/stix-1.2.0.1-SNAPSHOT-sources.jar .
-	docker cp <container id>:/java-stix/build/libs/stix-1.2.0.1-SNAPSHOT.jar .
+	docker cp <container id>:/java-stix/build/libs/stix-1.2.0.2-SNAPSHOT-javadoc.jar .
+	docker cp <container id>:/java-stix/build/libs/stix-1.2.0.2-SNAPSHOT-sources.jar .
+	docker cp <container id>:/java-stix/build/libs/stix-1.2.0.2-SNAPSHOT.jar .
 
 If the containder ID is not obvious, but you can also retrieve it via:
 
@@ -365,7 +374,7 @@ If the containder ID is not obvious, but you can also retrieve it via:
 
 An example of retrieving the snapshot jar would be the following:
 
-	docker cp 83ad9afb6096:/java-stix/build/libs/stix-1.2.0.1-SNAPSHOT.jar . 
+	docker cp 83ad9afb6096:/java-stix/build/libs/stix-1.2.0.2-SNAPSHOT.jar . 
 	
 By default the Docker container will build using OpenJdk 7.  You can modify
 the Dockerfile to other JVM's noted in the file.  Please, note Gradle targets 

From 0b396cc0e3ff1a1a48fa23e1005d18d10c66d6aa Mon Sep 17 00:00:00 2001
From: nemonik <github.com@nemonik.com>
Date: Tue, 30 Jun 2015 02:18:40 -0400
Subject: [PATCH 39/43] doc: update Dockerfile and README.MD documentation

---
 Dockerfile |  8 ++++----
 README.MD  | 26 +++++++++++++-------------
 2 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 4ec68c3..b5cba3f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -21,9 +21,9 @@
 # To retrieve the jar archives from the running docker container use following 
 # from the command-line of your docker host, not the container:
 #
-# docker cp <container id>:/java-stix/build/libs/stix-1.2.0.2-SNAPSHOT-javadoc.jar .
-# docker cp <container id>:/java-stix/build/libs/stix-1.2.0.2-SNAPSHOT-sources.jar .
-# docker cp <container id>:/java-stix/build/libs/stix-1.2.0.2-SNAPSHOT.jar .
+# docker cp <container id>:/java-stix/build/libs/stix-1.1.1.2-SNAPSHOT-javadoc.jar .
+# docker cp <container id>:/java-stix/build/libs/stix-1.1.1.2-SNAPSHOT-sources.jar .
+# docker cp <container id>:/java-stix/build/libs/stix-1.1.1.2-SNAPSHOT.jar .
 #
 # If the containder ID is not obvious, but you can also retrieve it via:
 #
@@ -31,7 +31,7 @@
 #
 # An example of retrieving the snapshot jar would be the following:
 #
-# ➜  /tmp  docker cp 83ad9afb6096:/java-stix/build/libs/stix-1.1.1.1-SNAPSHOT.jar . 
+# ➜  /tmp  docker cp 83ad9afb6096:/java-stix/build/libs/stix-1.1.1.2-SNAPSHOT.jar . 
 #
 #
 ############################################################
diff --git a/README.MD b/README.MD
index 11d5bf3..f5c7edb 100644
--- a/README.MD
+++ b/README.MD
@@ -25,7 +25,7 @@ see TODO.txt for a tentative roadmap.  Releases will be announced on the [STIX
 discussion list][list]. A java-stix for a particular schema release will match the 
 STIX schema version in Semantic Versioning form. Follow up patches of java-stix 
 for a particular schema release will increment a 4th digit. For example, the first 
-patch release for java-stix `v1.2.0` would be `v1.2.0.2`. Patches will be worked 
+patch release for java-stix `v1.1.1` would be `v1.1.1.1`. Patches will be worked 
 in a branch prior to being tagged and released.
 
 ## <a name="question"></a>Got a Question or Problem?
@@ -45,16 +45,16 @@ Releases are distributed via the Maven Central Repository.
 	<dependency>
 	  <groupId>org.mitre</groupId>
 	  <artifactId>stix</artifactId>
-	  <version>1.2.0.2</version>
+	  <version>1.1.1.2</version>
 	</dependency>
 
 ### <a name="gradle_dependency_info"></a>Gradle:
 
-	compile 'org.mitre:stix:1.2.0.2'
+	compile 'org.mitre:stix:1.1.1.2'
 
 ### <a name="ivy__dependency_info"></a>Apache Ivy:
 
-	<dependency org="org.mitre" name="stix" rev="1.2.0.2" />
+	<dependency org="org.mitre" name="stix" rev="1.1.1.2" />
 
 ## <a name="snapshots"></a>Snapshots
 
@@ -77,7 +77,7 @@ Users using Apache Maven for example can simply retrieve java-stix directly via
 		<dependency>
 			<groupId>org.mitre</groupId>
 			<artifactId>stix</artifactId>
-			<version>1.2.0.2-SNAPSHOT</version>
+			<version>1.1.1.2-SNAPSHOT</version>
 		</dependency>
 	</dependencies>
 
@@ -158,8 +158,8 @@ commands on the command line:
 
 	git submodule init
 	git submodule update --force
-	cd src/main/resources/schemas/v1.2.0
-	git checkout tags/v1.2.0
+	cd src/main/resources/schemas/v1.1.1
+	git checkout tags/v1.1.1
 
 Your not done.  You'll also need to retrieve the CybOX schemas.
 
@@ -167,11 +167,11 @@ Your not done.  You'll also need to retrieve the CybOX schemas.
 
 While in the project:
 
-	cd src/main/resources/schemas/v1.2.0
+	cd src/main/resources/schemas/v1.1.1
 	git submodule init
 	git submodule update --force
 	cd cybox
-	git checkout 97beb32c376a9223e91b52cb3e4c8d2af6baf786
+	git checkout 3442ebe50385d3bd0b3305952b90d296e0a1242c
 
 When Gradle build script first runs it will also patch the CybOX schemas so 
 that the JAXB2 Simple Document Object Model can be generated. Once patched, it 
@@ -364,9 +364,9 @@ Then create a container using the image you just created via:
 To retreive the jar archives from the running docker container use following 
 from the command-line of your docker host, not the container:
 
-	docker cp <container id>:/java-stix/build/libs/stix-1.2.0.2-SNAPSHOT-javadoc.jar .
-	docker cp <container id>:/java-stix/build/libs/stix-1.2.0.2-SNAPSHOT-sources.jar .
-	docker cp <container id>:/java-stix/build/libs/stix-1.2.0.2-SNAPSHOT.jar .
+	docker cp <container id>:/java-stix/build/libs/stix-1.1.1.2-SNAPSHOT-javadoc.jar .
+	docker cp <container id>:/java-stix/build/libs/stix-1.1.1.2-SNAPSHOT-sources.jar .
+	docker cp <container id>:/java-stix/build/libs/stix-1.1.1.2-SNAPSHOT.jar .
 
 If the containder ID is not obvious, but you can also retrieve it via:
 
@@ -374,7 +374,7 @@ If the containder ID is not obvious, but you can also retrieve it via:
 
 An example of retrieving the snapshot jar would be the following:
 
-	docker cp 83ad9afb6096:/java-stix/build/libs/stix-1.2.0.2-SNAPSHOT.jar . 
+	docker cp 83ad9afb6096:/java-stix/build/libs/stix-1.1.1.2-SNAPSHOT.jar . 
 	
 By default the Docker container will build using OpenJdk 7.  You can modify
 the Dockerfile to other JVM's noted in the file.  Please, note Gradle targets 

From 7fef548a95a79d54fdd20c425aa6afceacf3405c Mon Sep 17 00:00:00 2001
From: nemonik <github.com@nemonik.com>
Date: Wed, 1 Jul 2015 14:48:14 -0400
Subject: [PATCH 40/43] changes for pom

---
 build.gradle | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/build.gradle b/build.gradle
index 6bd1c20..f4d52c4 100644
--- a/build.gradle
+++ b/build.gradle
@@ -189,6 +189,11 @@ uploadArchives{
 				}
 				
 				developers {
+					developer {
+						id 'stix'
+						name 'STIX Project, The MITRE Corporation'
+						email 'stix[ASCII character number 64]mitre.org'
+					},
 					developer {
 						id 'nemonik'
 						name 'Michael Joseph Walsh'

From 66c6074e1f1c80ec9ae6cdefe9480c2c2908f4ff Mon Sep 17 00:00:00 2001
From: nemonik <github.com@nemonik.com>
Date: Wed, 1 Jul 2015 14:56:39 -0400
Subject: [PATCH 41/43] changes for pom

---
 build.gradle | 56 ++++++++++++++++++++++++++--------------------------
 1 file changed, 28 insertions(+), 28 deletions(-)

diff --git a/build.gradle b/build.gradle
index f4d52c4..0e8c135 100644
--- a/build.gradle
+++ b/build.gradle
@@ -12,19 +12,19 @@
  *
  * from the commnand-line and the build task will execute by default.
  *
- * The Jar will be built to 
+ * The Jar will be built to
+ *
+ *      build/libs/stix-${version}.jar
  *
- * 	build/libs/stix-${version}.jar
- * 
  *
  * Publishing archives:
  *
  * signingKeyId, signingPassword, secretKeyFile, ossrhUsername, and ossrhPassword properties
  * should be defined outside of the repository either on the command-line via
- * 
+ *
  * ./gradlew -PsigningKeyId=value -PsigningPassword=value -PsecretKeyFile=value -PossrhUsername=value -PossrhPassword=value
  *
- * or via ~/.gradle/gradle.properties as 
+ * or via ~/.gradle/gradle.properties as
  *
  * signingKeyId=value
  * signingPassword=value
@@ -38,7 +38,7 @@
  *
  * ./gradlew uploadArchives
  *
- * Otherwise you can publish a release to staging by executing the "uploadArchives" task 
+ * Otherwise you can publish a release to staging by executing the "uploadArchives" task
  * with "release" property like so:
  *
  * ./gradlew uploadArchives -Prelease
@@ -105,7 +105,7 @@ task wrapper(type: Wrapper) {
 	inputs.property("jvmOpts", jvmOpts)
 	doLast {
 		def optsEnvVar = "DEFAULT_JVM_OPTS"
- 		scriptFile.write scriptFile.text.replace("$optsEnvVar=\"\"", "$optsEnvVar=\"$jvmOpts\"")
+		scriptFile.write scriptFile.text.replace("$optsEnvVar=\"\"", "$optsEnvVar=\"$jvmOpts\"")
 		batchScript.write batchScript.text.replace("set $optsEnvVar=", "set $optsEnvVar=$jvmOpts")
 	}
 }
@@ -151,43 +151,43 @@ uploadArchives{
 				if (!project.hasProperty("ossrhUsername")) {
 					throw new GradleException("No value has been specified for property 'ossrhUsername'.")
 				}
-				
+
 				if (!project.hasProperty("ossrhPassword")) {
 					throw new GradleException("No value has been specified for property 'ossrhPassword'.")
 				}
-		
+
 				signing.signPom(deployment)
 			}
-			
+
 			repository(url: "https://oss.sonatype.org/service/local/staging/deploy/maven2/") {
 				authentication(userName: project.hasProperty("ossrhUsername") ? ossrhUsername : "", password: project.hasProperty("ossrhPassword") ? ossrhPassword: "")
 			}
-			
+
 			snapshotRepository(url: "https://oss.sonatype.org/content/repositories/snapshots/") {
 				authentication(userName: project.hasProperty("ossrhUsername") ? ossrhUsername : "", password: project.hasProperty("ossrhPassword") ? ossrhPassword: "")
 			}
-			
+
 			pom.project {
 				name "${project.name}"
 				packaging 'jar'
 				version "${project.version}"
-				// optionally artifactId can be defined here 
+				// optionally artifactId can be defined here
 				description "The Java bindings for STIX v." + version
 				url "https://github.com/STIXProject/java-stix"
-				
+
 				scm {
 					connection "https://github.com/STIXProject/java-stix.git"
 					developerConnection "https://github.com/STIXProject/java-stix.git"
 					url "https://github.com/STIXProject/java-stix"
 				}
-				
+
 				licenses {
 					license {
 						name "The BSD 3-Clause License"
 						url "https://raw.githubusercontent.com/STIXProject/java-stix/master/LICENSE"
 					}
 				}
-				
+
 				developers {
 					developer {
 						id 'stix'
@@ -213,17 +213,17 @@ gradle.taskGraph.whenReady { taskGraph ->
 			ext."signing.secretKeyRingFile" = project.hasProperty("secretKeyFile") ? secretKeyFile: ""
 		}
 	}
-		
+
 	if (taskGraph.hasTask(tasks.uploadArchives)) {
 		if (has("release")) {
 			if (!project.hasProperty("signingKeyId")) {
 				throw new GradleException("No value has been specified for property 'signingKeyId'.")
 			}
-			
+
 			if (!project.hasProperty("signingPassword")) {
 				throw new GradleException("No value has been specified for property 'signingPassword'.")
 			}
-			
+
 			if (!project.hasProperty("secretKeyFile")) {
 				throw new GradleException("No value has been specified for property 'secretKeyFile'.")
 			}
@@ -266,13 +266,13 @@ dependencies {
 	compile "org.apache.httpcomponents:httpclient-cache:4.3.5"
 	compile "org.apache.httpcomponents:httpmime:4.3.5"
 	compile "org.apache.httpcomponents:fluent-hc:4.3.5"
-	
+
 	compile "org.springframework:spring-core:4.1.4.RELEASE"
-	
+
 	compile "commons-io:commons-io:2.4"
-	
+
 	compile "commons-lang:commons-lang:2.6"
-	
+
 	testCompile "org.codehaus.groovy:groovy:2.4.3"
 	testCompile "org.spockframework:spock-core:1.0-groovy-2.4"
 	testCompile "xmlunit:xmlunit:1.6"
@@ -299,7 +299,7 @@ javadoc {
 	include "**/org/mitre/**/*"
 	include "**/org/purl/**/*"
 	include "**/org/w3/**/*"
-	
+
 	options.overview = "src/main/javadoc/overview.html";
 	options.showAll()
 	options.encoding("UTF-8")
@@ -309,7 +309,7 @@ javadoc {
 	options.windowTitle("java-stix v." + version)
 	options.docTitle("java-stix v." + version)
 	options.footer("Copyright (c) 2015, The MITRE Corporation. All rights reserved.")
-	
+
 	doFirst {
 		javadoc.title = "java-stix v." + version
 		javadoc.options.docTitle = javadoc.title
@@ -339,7 +339,7 @@ buildscript {
 		jcenter()
 		mavenCentral()
 		mavenLocal()
-		
+
 		flatDir { dirs "libs" }
 	}
 
@@ -355,12 +355,12 @@ buildscript {
 		classpath name: "org.eclipse.core.resources_3.9.0.v20140514-1307"
 		classpath name: "org.eclipse.jdt.core_3.10.0.v20140604-1726"
 		classpath name: "org.eclipse.equinox.registry_3.5.400.v20140428-1507"
-		
+
 		// Needed for GenerateJAXBTask
 		classpath "com.sun.xml.bind:jaxb-xjc:2.2.5-2"
 		classpath "com.sun.xml.bind:jaxb-impl:2.2.5-2"
 		classpath "javax.xml.bind:jaxb-api:2.2.+"
-		
+
 		classpath "org.jvnet.jaxb2_commons:jaxb2-basics:0.6.5"
 		classpath "org.jvnet.jaxb2_commons:jaxb2-basics-ant:0.6.5"
 		classpath "org.jvnet.jaxb2_commons:jaxb2-fluent-api:3.0"

From 3d8874e8f0b5c156909916a624c3c0c40d63b9cb Mon Sep 17 00:00:00 2001
From: nemonik <github.com@nemonik.com>
Date: Wed, 1 Jul 2015 15:07:30 -0400
Subject: [PATCH 42/43] changed MAINTAINER

---
 Dockerfile | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index b5cba3f..6a8e74b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -8,17 +8,17 @@
 # @author nemonik (Michael Joseph Walsh <github.com@nemonik.com>)
 #
 # WHAT TO DO:
-# 
-# If you have Docker installed, from the root of the project run 
+#
+# If you have Docker installed, from the root of the project run
 # the following to create a container image for this Dockerfile via:
 #
-# docker build -t nemonik/java-stix . 
+# docker build -t stix/java-stix .
 #
 # Then create a container using the image you just created via:
 #
-# docker run -t -i nemonik/java-stix /bin/bash
+# docker run -t -i stix/java-stix /bin/bash
 #
-# To retrieve the jar archives from the running docker container use following 
+# To retrieve the jar archives from the running docker container use following
 # from the command-line of your docker host, not the container:
 #
 # docker cp <container id>:/java-stix/build/libs/stix-1.1.1.2-SNAPSHOT-javadoc.jar .
@@ -31,7 +31,7 @@
 #
 # An example of retrieving the snapshot jar would be the following:
 #
-# ➜  /tmp  docker cp 83ad9afb6096:/java-stix/build/libs/stix-1.1.1.2-SNAPSHOT.jar . 
+# ➜  /tmp  docker cp 83ad9afb6096:/java-stix/build/libs/stix-1.1.1.2-SNAPSHOT.jar .
 #
 #
 ############################################################
@@ -40,7 +40,7 @@
 FROM ubuntu:15.04
 
 # File Maintainer
-MAINTAINER Michael Joseph Walsh
+MAINTAINER STIX Project, The MITRE Corporation
 
 # Update the sources list
 RUN apt-get -y update
@@ -50,13 +50,13 @@ RUN apt-get install -y tar git curl nano wget dialog net-tools build-essential s
 
 # To install the default OpenJDK environment
 RUN add-apt-repository -y ppa:openjdk-r/ppa
-RUN apt-get -y update 
+RUN apt-get -y update
 RUN apt-get -y install openjdk-8-jdk
 
 # To install the OpenJDK 7, comment out the above and uncomment the following.
 #RUN apt-get install -y openjdk-7-jdk
 
-# Optionally to install the Oracle JDK, comment out the above, uncomment the 
+# Optionally to install the Oracle JDK, comment out the above, uncomment the
 # the next 3 lines, and then uncommment the preferred JDK version.
 #RUN apt-get -y install python-software-properties
 #RUN add-apt-repository -y ppa:webupd8team/java

From 949745db8fdc3bf85a883787061276fe40d53862 Mon Sep 17 00:00:00 2001
From: nemonik <github.com@nemonik.com>
Date: Wed, 1 Jul 2015 15:27:09 -0400
Subject: [PATCH 43/43] changes for pom

---
 build.gradle | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/build.gradle b/build.gradle
index 0e8c135..89228ad 100644
--- a/build.gradle
+++ b/build.gradle
@@ -193,11 +193,6 @@ uploadArchives{
 						id 'stix'
 						name 'STIX Project, The MITRE Corporation'
 						email 'stix[ASCII character number 64]mitre.org'
-					},
-					developer {
-						id 'nemonik'
-						name 'Michael Joseph Walsh'
-						email 'java-stix-pom[ASCII character number 64]nemonik.com'
 					}
 				}
 			}