From 25e0da00412704049f7c4cb8a3ec41a4d06b0658 Mon Sep 17 00:00:00 2001 From: nemonik Date: Sat, 16 May 2015 06:42:55 -0400 Subject: [PATCH 01/29] DOC: remove codeclimate badges --- README.MD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.MD b/README.MD index 0be8f16..8bc8d62 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) ## Overview From 28ad4429d74964d7ffc82ebd4c31b002010255f9 Mon Sep 17 00:00:00 2001 From: nemonik Date: Thu, 21 May 2015 23:54:29 -0400 Subject: [PATCH 02/29] added gatherDependencies task, got specific about sample.xml in main of STIXSchema, and updated to v1.2.0.1 --- README.MD | 8 ++++---- build.gradle | 7 +++++-- gradle.properties | 3 ++- src/main/java/org/mitre/stix/STIXSchema.java | 2 +- 4 files changed, 12 insertions(+), 8 deletions(-) diff --git a/README.MD b/README.MD index 8bc8d62..4076abd 100644 --- a/README.MD +++ b/README.MD @@ -33,16 +33,16 @@ Releases are distributed via the Maven Central Repository. org.mitre stix - 1.2.0 + 1.2.0.1 ### Gradle: - compile 'org.mitre:stix:1.2.0' + compile 'org.mitre:stix:1.2.0.1' ### Apache Ivy: - + ## Snapshots @@ -65,7 +65,7 @@ Users using Apache Maven for example can simply retrieve java-stix directly via org.mitre stix - 1.2.0-SNAPSHOT + 1.2.0.1-SNAPSHOT diff --git a/build.gradle b/build.gradle index c7afb70..39055f9 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" } @@ -133,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 { diff --git a/gradle.properties b/gradle.properties index dedf6ad..f6d4bb2 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,4 +1,5 @@ -version = 1.2.0 +version = 1.2.0.1 +schemaVersion = 1.2.0 group = org.mitre name = stix mainClass = org.mitre.stix.STIXSchema \ No newline at end of file diff --git a/src/main/java/org/mitre/stix/STIXSchema.java b/src/main/java/org/mitre/stix/STIXSchema.java index 55e1c22..a530450 100644 --- a/src/main/java/org/mitre/stix/STIXSchema.java +++ b/src/main/java/org/mitre/stix/STIXSchema.java @@ -268,7 +268,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"))); + "https://raw.githubusercontent.com/STIXProject/python-stix/v1.2.0.0/examples/sample.xml"))); System.out.println(schema.getVersion()); } From 67e079a68226de185aeba0e28e2057b4873bf881 Mon Sep 17 00:00:00 2001 From: nemonik Date: Fri, 29 May 2015 11:48:20 -0400 Subject: [PATCH 03/29] corrections to STIXShema --- 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 a530450..1901f76 100644 --- a/src/main/java/org/mitre/stix/STIXSchema.java +++ b/src/main/java/org/mitre/stix/STIXSchema.java @@ -92,7 +92,7 @@ private STIXSchema() { try { schemaResources = patternResolver - .getResources("classpath*:schemas/v" + version + .getResources("classpath:schemas/v" + version + "/**/*.xsd"); prefixSchemaBindings = new HashMap(); From 088f803b48b0dd535aa2af698e3aab0bfe7f3ed9 Mon Sep 17 00:00:00 2001 From: nemonik Date: Fri, 29 May 2015 15:34:14 -0400 Subject: [PATCH 04/29] modified to use ubuntu:15.04 as a base --- Dockerfile | 76 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 76 insertions(+) create mode 100644 Dockerfile diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 0000000..5e9c9e1 --- /dev/null +++ b/Dockerfile @@ -0,0 +1,76 @@ +############################################################ +# 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 ) +# +# 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_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 :/java-stix/build/libs/stix-1.2.0.1-SNAPSHOT-javadoc.jar . +# docker cp :/java-stix/build/libs/stix-1.2.0.1-SNAPSHOT-sources.jar . +# docker cp :/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: +# +# ➜ /tmp docker cp 83ad9afb6096:/java-stix/build/libs/stix-1.2.0.1-SNAPSHOT.jar . +# +# +############################################################ + +# Set base image +FROM ubuntu:15.04 + +# File Maintainer +MAINTAINER Michael Joseph Walsh + +# 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 default OpenJDK environment +RUN apt-get -y 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 -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 + +# 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.2.0.1 branch +RUN git checkout -b v1.2.0.1 origin/v1.2.0.1 + +# Build unsigned jar archives in debug to /java-stix/build/libs +RUN ./gradlew -x signArchives -d From ee5ae573f378d39ac60c486f851a735923faa2c9 Mon Sep 17 00:00:00 2001 From: nemonik Date: Fri, 29 May 2015 16:38:40 -0400 Subject: [PATCH 05/29] modified to use ubuntu:15.04 as a base --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 5e9c9e1..ce818ec 100644 --- a/Dockerfile +++ b/Dockerfile @@ -49,7 +49,7 @@ RUN apt-get update #RUN apt-get install -y tar git curl nano wget dialog net-tools build-essential # To install the default OpenJDK environment -RUN apt-get -y install default-jdk +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 From 2bfc542568f7be58b75558989d0e6f242fb59da4 Mon Sep 17 00:00:00 2001 From: nemonik Date: Fri, 29 May 2015 19:58:11 -0400 Subject: [PATCH 06/29] modified gradle to target Java v1.7 --- build.gradle | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 39055f9..4a748b8 100644 --- a/build.gradle +++ b/build.gradle @@ -235,7 +235,7 @@ sourceSets { resources { srcDir("src/main/resources") exclude "*.xjb" - exclude "**/v1.1.1" + exclude "**/v1.2-rc1" } } } @@ -316,6 +316,11 @@ artifacts { archives javadocJar } +tasks.withType(JavaCompile) { + sourceCompatibility = "1.7" + targetCompatibility = "1.7" +} + buildscript { repositories { jcenter() From 840c0646109d644233d14c4747c32fdae653709b Mon Sep 17 00:00:00 2001 From: nemonik Date: Fri, 29 May 2015 20:07:29 -0400 Subject: [PATCH 07/29] don't include the v1.1.1 as a resource --- build.gradle | 1 + 1 file changed, 1 insertion(+) diff --git a/build.gradle b/build.gradle index 4a748b8..4782bc5 100644 --- a/build.gradle +++ b/build.gradle @@ -236,6 +236,7 @@ sourceSets { srcDir("src/main/resources") exclude "*.xjb" exclude "**/v1.2-rc1" + exclude "**/v1.1.1" } } } From 8ec5272ba6e9393662dae9097abaf30ee19e3c16 Mon Sep 17 00:00:00 2001 From: nemonik Date: Mon, 1 Jun 2015 14:27:56 -0400 Subject: [PATCH 08/29] DOC: updated readme with Dockerfile build info, etc --- README.MD | 75 ++++++++++++++++++++++++++++++++++++++++--------------- 1 file changed, 55 insertions(+), 20 deletions(-) diff --git a/README.MD b/README.MD index 4076abd..46ea8ea 100644 --- a/README.MD +++ b/README.MD @@ -1,6 +1,6 @@ # 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] @@ -148,23 +148,26 @@ commands on the command line: git submodule update --force 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. ### The CybOX schemas While in the project: + cd src/main/resources/schemas/v1.2.0 git submodule init git submodule update --force - git checkout 3442ebe50385d3bd0b3305952b90d296e0a1242c + cd cybox + 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 will remained patched locally. If Gradle fails to retrieve the schemas, you will need to patch the schemas by hand from the command-line. The patch file, `cybox_object_archive_object_patch` is in the root of the project. NetBeans -can also apply patches via `Team` -> `Patches` -> `Apply Diff Patch`. +can also apply patches via +`Team` -> `Patches` -> `Apply Diff Patch`. ## Creating the JAXB2 Document Object Model @@ -208,32 +211,34 @@ on UNIX: :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:349: warning - Tag @link: reference not found: byte[] - /Users/walsh/Development/workspace/java_stix/src/generated/java/org/w3/_2000/_09/xmldsig/ObjectFactory.java:319: warning - Tag @link: reference not found: byte[] - /Users/walsh/Development/workspace/java_stix/src/generated/java/org/w3/_2000/_09/xmldsig/ObjectFactory.java:339: 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: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:319: warning - Tag @link: reference not found: byte[] - /Users/walsh/Development/workspace/java_stix/src/generated/java/org/w3/_2000/_09/xmldsig/ObjectFactory.java:339: warning - Tag @link: reference not found: byte[] - /Users/walsh/Development/workspace/java_stix/src/generated/java/org/w3/_2000/_09/xmldsig/ObjectFactory.java:349: 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: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:349: warning - Tag @link: reference not found: byte[] - /Users/walsh/Development/workspace/java_stix/src/generated/java/org/w3/_2000/_09/xmldsig/ObjectFactory.java:319: warning - Tag @link: reference not found: byte[] - /Users/walsh/Development/workspace/java_stix/src/generated/java/org/w3/_2000/_09/xmldsig/ObjectFactory.java:339: 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[] 19 warnings :javadocJar :sourcesJar @@ -248,7 +253,7 @@ on UNIX: BUILD SUCCESSFUL - Total time: 6 mins 23.329 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 @@ -281,7 +286,7 @@ path. To execute the tests: - ./gradlew -x signArchives test + /gradlew -x signArchives test Consider using `-d`/`--debug` or `-i`/`--info` for more details during test execution like so: @@ -318,11 +323,11 @@ 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: - .\gradlew.bat -x signArchives + $ .\gradlew.bat -x signArchives If the build goes well you will find the jars: @@ -333,6 +338,36 @@ If the build goes well you will find the jars: where `${version}` is replaced with the `version` number in the Gradle build script. +### 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 :/java-stix/build/libs/stix-1.2.0.1-SNAPSHOT-javadoc.jar . + docker cp :/java-stix/build/libs/stix-1.2.0.1-SNAPSHOT-sources.jar . + docker cp :/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. + ### Importing the project into Eclipse As Eclipse's various Gradle plugins have varying degrees of usefulness, I From 7450e735c914c07406fd208753af570765cfdf8d Mon Sep 17 00:00:00 2001 From: nemonik Date: Mon, 1 Jun 2015 14:51:23 -0400 Subject: [PATCH 09/29] DOC: typo correction --- README.MD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.MD b/README.MD index 46ea8ea..f7752c0 100644 --- a/README.MD +++ b/README.MD @@ -323,7 +323,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 baa921f28c740958d6d84bb3cc5f91504cdbc859 Mon Sep 17 00:00:00 2001 From: nemonik Date: Fri, 5 Jun 2015 12:29:59 -0400 Subject: [PATCH 10/29] fixed examples and unit tests to use the appropriate schema version --- build.gradle | 1 + src/main/java/org/mitre/stix/examples/CIQIdentity.java | 2 +- .../java/org/mitre/stix/examples/CreationToolMetadata.java | 2 +- src/main/java/org/mitre/stix/examples/IndicatorHash.java | 2 +- src/test/groovy/org/mitre/stix/DocumentUtilitiesSpec.groovy | 2 +- src/test/groovy/org/mitre/stix/STIXSchemaSpec.groovy | 3 ++- src/test/groovy/org/mitre/stix/sitx_1/STIXPackageSpec.groovy | 4 ++-- 7 files changed, 9 insertions(+), 7 deletions(-) diff --git a/build.gradle b/build.gradle index 4782bc5..d8bc8b0 100644 --- a/build.gradle +++ b/build.gradle @@ -264,6 +264,7 @@ dependencies { testCompile "org.codehaus.groovy:groovy:2.4.3" testCompile "org.spockframework:spock-core:1.0-groovy-2.4" testCompile "xmlunit:xmlunit:1.6" + testCompile "com.github.zafarkhaja:java-semver:0.9.0" } jar { diff --git a/src/main/java/org/mitre/stix/examples/CIQIdentity.java b/src/main/java/org/mitre/stix/examples/CIQIdentity.java index 307c779..a9979cf 100644 --- a/src/main/java/org/mitre/stix/examples/CIQIdentity.java +++ b/src/main/java/org/mitre/stix/examples/CIQIdentity.java @@ -172,7 +172,7 @@ public static void main(String[] args) { STIXPackage stixPackage = new STIXPackage() .withSTIXHeader(header) .withIndicators(indicators) - .withVersion("1.1.1") + .withVersion("1.2.0") .withTimestamp(now) .withId(new QName("http://example.com/", "package-" + UUID.randomUUID().toString(), "example")); diff --git a/src/main/java/org/mitre/stix/examples/CreationToolMetadata.java b/src/main/java/org/mitre/stix/examples/CreationToolMetadata.java index 93473a7..3580af5 100644 --- a/src/main/java/org/mitre/stix/examples/CreationToolMetadata.java +++ b/src/main/java/org/mitre/stix/examples/CreationToolMetadata.java @@ -56,7 +56,7 @@ public static void main(String[] args) { STIXPackage stixPackage = new STIXPackage() .withSTIXHeader(header) - .withVersion("1.1.1") + .withVersion("1.2.0") .withTimestamp(now) .withId(new QName("http://example.com/", "package-" + UUID.randomUUID().toString(), "example")); diff --git a/src/main/java/org/mitre/stix/examples/IndicatorHash.java b/src/main/java/org/mitre/stix/examples/IndicatorHash.java index d24b974..139f40e 100644 --- a/src/main/java/org/mitre/stix/examples/IndicatorHash.java +++ b/src/main/java/org/mitre/stix/examples/IndicatorHash.java @@ -116,7 +116,7 @@ public static void main(String[] args) { STIXPackage stixPackage = new STIXPackage() .withSTIXHeader(stixHeader) .withIndicators(indicators) - .withVersion("1.1.1") + .withVersion("1.2.0") .withTimestamp(now) .withId(new QName("http://example.com/", "package-" + UUID.randomUUID().toString(), "example")); diff --git a/src/test/groovy/org/mitre/stix/DocumentUtilitiesSpec.groovy b/src/test/groovy/org/mitre/stix/DocumentUtilitiesSpec.groovy index 154a2e8..4a3463d 100644 --- a/src/test/groovy/org/mitre/stix/DocumentUtilitiesSpec.groovy +++ b/src/test/groovy/org/mitre/stix/DocumentUtilitiesSpec.groovy @@ -28,7 +28,7 @@ import spock.lang.* class DocumentUtilitiesSpec extends spock.lang.Specification{ - @Shared def version = "1.1.1" + @Shared def version = "1.2.0" @Shared def controlXML = """ """ when: "A STIXPackage is created, converted to Document representation, and then serialize to an XML String" - def version = "1.1.1" + def version = "1.2.0" def c = new GregorianCalendar(TimeZone.getTimeZone("UTC")) c.setTimeInMillis(0) From 809730a0b16f56a0237e0f9d812aeaf11281e540 Mon Sep 17 00:00:00 2001 From: nemonik Date: Fri, 5 Jun 2015 14:11:50 -0400 Subject: [PATCH 11/29] the schema limits to version 1.0, 1.0.1, 1.1, 1.1.1, 1.2 --- src/main/java/org/mitre/stix/examples/CIQIdentity.java | 2 +- src/main/java/org/mitre/stix/examples/CreationToolMetadata.java | 2 +- src/test/groovy/org/mitre/stix/DocumentUtilitiesSpec.groovy | 2 +- src/test/groovy/org/mitre/stix/sitx_1/STIXPackageSpec.groovy | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/org/mitre/stix/examples/CIQIdentity.java b/src/main/java/org/mitre/stix/examples/CIQIdentity.java index a9979cf..702312a 100644 --- a/src/main/java/org/mitre/stix/examples/CIQIdentity.java +++ b/src/main/java/org/mitre/stix/examples/CIQIdentity.java @@ -172,7 +172,7 @@ public static void main(String[] args) { STIXPackage stixPackage = new STIXPackage() .withSTIXHeader(header) .withIndicators(indicators) - .withVersion("1.2.0") + .withVersion("1.2") .withTimestamp(now) .withId(new QName("http://example.com/", "package-" + UUID.randomUUID().toString(), "example")); diff --git a/src/main/java/org/mitre/stix/examples/CreationToolMetadata.java b/src/main/java/org/mitre/stix/examples/CreationToolMetadata.java index 3580af5..da3a5e6 100644 --- a/src/main/java/org/mitre/stix/examples/CreationToolMetadata.java +++ b/src/main/java/org/mitre/stix/examples/CreationToolMetadata.java @@ -56,7 +56,7 @@ public static void main(String[] args) { STIXPackage stixPackage = new STIXPackage() .withSTIXHeader(header) - .withVersion("1.2.0") + .withVersion("1.2") .withTimestamp(now) .withId(new QName("http://example.com/", "package-" + UUID.randomUUID().toString(), "example")); diff --git a/src/test/groovy/org/mitre/stix/DocumentUtilitiesSpec.groovy b/src/test/groovy/org/mitre/stix/DocumentUtilitiesSpec.groovy index 4a3463d..ca80d35 100644 --- a/src/test/groovy/org/mitre/stix/DocumentUtilitiesSpec.groovy +++ b/src/test/groovy/org/mitre/stix/DocumentUtilitiesSpec.groovy @@ -28,7 +28,7 @@ import spock.lang.* class DocumentUtilitiesSpec extends spock.lang.Specification{ - @Shared def version = "1.2.0" + @Shared def version = "1.2" @Shared def controlXML = """ Date: Fri, 5 Jun 2015 14:30:36 -0400 Subject: [PATCH 12/29] fixing those version issues --- src/main/java/org/mitre/stix/examples/IndicatorHash.java | 2 +- src/test/groovy/org/mitre/stix/sitx_1/STIXPackageSpec.groovy | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/mitre/stix/examples/IndicatorHash.java b/src/main/java/org/mitre/stix/examples/IndicatorHash.java index 139f40e..1a04ed9 100644 --- a/src/main/java/org/mitre/stix/examples/IndicatorHash.java +++ b/src/main/java/org/mitre/stix/examples/IndicatorHash.java @@ -116,7 +116,7 @@ public static void main(String[] args) { STIXPackage stixPackage = new STIXPackage() .withSTIXHeader(stixHeader) .withIndicators(indicators) - .withVersion("1.2.0") + .withVersion("1.2") .withTimestamp(now) .withId(new QName("http://example.com/", "package-" + UUID.randomUUID().toString(), "example")); 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 d713223..f018f20 100644 --- a/src/test/groovy/org/mitre/stix/sitx_1/STIXPackageSpec.groovy +++ b/src/test/groovy/org/mitre/stix/sitx_1/STIXPackageSpec.groovy @@ -138,7 +138,7 @@ class STIXPackageSpec extends spock.lang.Specification{ """ when: "A STIXPackage is created, converted to Document representation, and then serialize to an XML String" - def version = "1.2.0" + def version = "1.2" def c = new GregorianCalendar(TimeZone.getTimeZone("UTC")) c.setTimeInMillis(0) From ca8d620716e2ef31dafbf7241153ef662f194905 Mon Sep 17 00:00:00 2001 From: nemonik Date: Fri, 5 Jun 2015 16:23:41 -0400 Subject: [PATCH 13/29] fixed url resource issue that only surfaces when you run from jar --- src/main/java/org/mitre/stix/STIXSchema.java | 23 +++++++++++++++----- 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/src/main/java/org/mitre/stix/STIXSchema.java b/src/main/java/org/mitre/stix/STIXSchema.java index 1901f76..f3b926e 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; } @@ -269,7 +282,7 @@ public static void main(String[] args) throws ParserConfigurationException, .println(schema .validate(new URL( "https://raw.githubusercontent.com/STIXProject/python-stix/v1.2.0.0/examples/sample.xml"))); - + System.out.println(schema.getVersion()); } @@ -298,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 756242a552ef3b6c3fc5021be05cba85159b3d44 Mon Sep 17 00:00:00 2001 From: nemonik Date: Wed, 17 Jun 2015 10:15:47 -0400 Subject: [PATCH 14/29] uncommented build tools install --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index ce818ec..adfb679 100644 --- a/Dockerfile +++ b/Dockerfile @@ -46,7 +46,7 @@ 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 # To install the default OpenJDK environment RUN apt-get -y install openjdk-8-jdk From 2a7fba0f1b3708a237b8bf422b49f6a7e218a4a9 Mon Sep 17 00:00:00 2001 From: nemonik Date: Wed, 17 Jun 2015 10:59:49 -0400 Subject: [PATCH 15/29] added reposiotry to retrv openjdk-8-jdk --- Dockerfile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index adfb679..8466151 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 9532979b0abb1e7a7e235b6a974ce7e874b4943c Mon Sep 17 00:00:00 2001 From: nemonik Date: Mon, 22 Jun 2015 13:54:21 -0400 Subject: [PATCH 16/29] modified Dockerfile and move to 2.4 gradle wrapper --- .travis.yml | 4 ++-- Dockerfile | 24 +++++++++++------------ 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, 22 insertions(+), 22 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 8466151..1838bd2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -16,14 +16,14 @@ # # 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 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: # -# docker cp :/java-stix/build/libs/stix-1.2.0.1-SNAPSHOT-javadoc.jar . -# docker cp :/java-stix/build/libs/stix-1.2.0.1-SNAPSHOT-sources.jar . -# docker cp :/java-stix/build/libs/stix-1.2.0.1-SNAPSHOT.jar . +# docker cp :/java-stix/build/libs/stix-1.1.1.1-SNAPSHOT-javadoc.jar . +# docker cp :/java-stix/build/libs/stix-1.1.1.1-SNAPSHOT-sources.jar . +# docker cp :/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: # @@ -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.2.0.1-SNAPSHOT.jar . +# ➜ /tmp docker cp 83ad9afb6096:/java-stix/build/libs/stix-1.1.1.1-SNAPSHOT.jar . # # ############################################################ @@ -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.2.0.1 branch -RUN git checkout -b v1.2.0.1 origin/v1.2.0.1 - # Build unsigned jar archives in debug to /java-stix/build/libs -RUN ./gradlew -x signArchives -d +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 zcmZv>1yEc|7cD%vySsY`?(Q;32(B?SxH}U(Xn;xZ!QI{6Ew}{t0KqS=d1Sc%{rP$y$xGRs;@vnIPE4qb`=_I^QCTFt$`8SbuE{irD@ ztvZT@`&{I78!jRIU7bNu_R`ghD7)1yen}SiH>(h_xXe5zb`*lWYUy7p`RcYj%(H4F zLYCaNG7i98d2}0!a^*;pX$FRY4k=hrAwvTzdn!0+ z5aA^991OZnAwZdQ?^_t$KkYR1uuJ@k1OW8o004{tFisyc=$r05h)kE@QGRh?QnpgN zKYE!_drC0gOelnY+@mmJlTnp?k;PHT!2lJ{npQo=;_Jjfn4vN-b38aV7a=*`mnXtM zhZluWB3|J7bd=1#bS1LmW6?M%@p#uS0e8*0qMm^lg3jZQ z9Z9&Q5%0(X@-Jwv=*gz-R?FyJE@Z3>8dfsutnv`0+tepX2WAk+!!Dj0;imVSk&H2& z!nR@eM{u_#u2pg{j7KM!`Uv^k5j*EupamzZmAclJR5ftWG5?8!ibP9$Y3T^k@pefW&rhI4i;riF4j z@@^}Ltd74kI_g)5-4~_Zky)113O=CNn@RcGQN_|8fEIFn8+H0@*OxYLUg3TP zYERAfMRnyAqGbhwsa&{qPGih;3y_bB-5NgvcRva{m)^_1w>{;d7b zWO)+Jc>U02g%Enmk7CTU*I=N(7M%4K1h`8PcQ|2dvBzQ-41&Ww(*G@Nr~j*pTCY># zM1w?^pe4}V%tyEL>ckg8q63S;^ysGmPaU5Q{ynlp{3#xPkNlC@y;kSgi8BgPtD|7* zUf~u`6j5yRoQGjpD`JP{4o6iC!N}Uz0D}7f-7!YZKzBLu?6rhzf>8PL02UQCP$J;w zfltTmUcQrwD}Sy2nnJ;IIr42j{>U;^$(bNhNTNwM)}T?QU|ft<)k-&N~_c3LHD>Io*!L7$QMR zDY#PQHaXqH=w$;S`(tT!h%!fGph#N`G7M`ShA6?QJBK=w7Eh+}z#j-x23lcU_~Uiz zew+ih-?QR}lQs0He4+wv&Waht?Mds3B6i*3d#I6Zu#$7oTbOr$5VjYn(oF_kTPnVqlSMKgqbMP~MJ3V~&G4#8 zd2(*LF3t3jsT{o+5XsKql#2A{-TqT}E3`SB7d4~T@aefdQU^Fb0V1?gwvCS|1E~ZD z+_y;5dKXqIf~Z{(1@eC3CAc;`+mS2cb^6phzz+}31NwLBD+rfLqTAcQRND~XeBl>0 z=V+E|F|E=ED|ske!Yxf*pU$DX*bh}$F{>co?sa7-{XuRysP$YgaTKQ}1rsGO%Z$fw z`SRxId|k8T>b8kMB>mFr0iD6b&E%dSD=0YHQbxF0Kz7F<{|wYUy11JJJdO~YS>iyw zB=q_n_ojTI2JfA}YMw@$Boh%i6VJ=H5Sf<}EOjN8t=QXViC2lFE{SkiSxWqMvV~;~ zS(F)Ma{lU3Ao*ox%8RN3WNi6ZvkRlum=12>-D_i5f>kL5xqc~5z_JW)3;dDYnwk7p z!UtX??Bl{r~1C>dk^AQjIqmCAX~TF z3vg*MRTFnbh|%Xo7L9tN^UxmnhaIn7J1((qnwuBPoSxD39cQU`9M?yO8_d2xSn}Y# z+jUfA+J8o2;td_R zH4GVq=AkuHYr=LW2nNH^#{vRHX|V=B!~vu~op8%)eTC;l4hi*8REzT;R7p$%XcS~k zvtDQvXT9~+EiBcMQ~In?QhNN}w%B)B+~)Z3V#RRL+unQ8%i3_S{W2+OLbzI*UPz@JN-5)2Fw=DPNzuJ{}hk zDrdwNZWPe9=>4T*QqA^1CD|s-ni;1?5JKnLzB3nt zp))>{496(7VUJ9;+7`vngw`#x`DeYTK-Z>M=7eXBq;tPqDmjh%oPCU#bcEE+dk-kY)*!Rf&vd?D+iaBD%XHmOTdgEHSswee@|*(?#BNHKK04 z*a-i04omvx=O*L)93sTPGy9zX#-mzq#|ct@LLi*dGSmM(3*~+ytGc&T+zveG78R({ zV_Je7T54%L5ZPNoJe8;oIekmNMEnJ@+txKUT8-ypADu>2J(p@3&xhG?hY{3%P{8S$ z8e7U|mQ@o-o1Ms11F(CsJJ$G}w^J=il>S6t14%tErqo7ne$xJ1RtI8C9)cO94_u$? zEUdF_KcadU+C~{_c=P5t23ggR3P})0^^!H$Nta{tEWsiUm&__o50TC_@R)sCFgBka ziir>%7$)xUi*m8%f>eIISRg1S1=aCR&vL9*HMt!wY$xz?-ssx#xF>5HpS~?%{aCBt zT&$DgXh~o)z{~oct+_;G@PihqYwJ8p@>1Vh!yl3Ea+TfNN!1Yt=`=h`I%Yh24cxf4 z#UCS**=dT4gz!t04{XgiZRUqw8o{O^m^0(gYf~-R*3ysk_K;P;@ujVEjDYa#^dK6= z^IC16@R_m57ODbcS@~+jNqac;(z#TnS&HJ*h$52=We8s!8RMfPZ2}XG7;^U$mt12B zf&6H-q)ozg1{1Z?$Qo>P-_0!{Bp5@-JsBb^ltHAL;_vM1EM$F@l*@yZX*ndkV+N;K zfQdi9*^t}xPTFXMgMi7B4xj;R%4?KPOd9}X*j>PI@KX=v&x9O}(oc+4-RogIU%OC1 zT;EA1Nv9Cauo^r{9niQDk4*f>!|6A5UmRz&eF`$i``)#nC|x&CRu(?sZemPbI0k*BCh1RT4)g%O$)_Z6fsWV7(j)A=7s zL|A{^So~rPtgX$OIH|}~SQFhy9hz3dP_hv$27(u` zq=9-p+!Lh};U7AMlIS8rLf?4hza7oxs>V<|&-c!&tH#5zvmn4-{cK8ozN=W%8_ozG zpd_dT*q06w494E`*6M%|KV%hJH_u@F_+b^&L_Pf>cvIu1b;&M*JJvIqG+sNltN}hF zJ7hpIRfgi1;DD*4pA#`J9naSgr!?#m|Jj*$N9M`Nwo?5kkoelnsTg*bg^($(%?7Wd z@qX~8@Kv26Hcnjuy{)e?J$_a4w|qeOop>B)KxA|`erTDBdRYMRR67`H`SmU8EgQvb(fhT!-hygM&`{$0elpxroD z!*E7-3m%o%EAcA;HWI%_CW&=FqvM9iE;E|DRm>FG78RP2z%rA09Uw-?tH0yO7Y^zO}zSvAvfIwBHc{STX=V@Brm{(9$CuKN$LUDSnJL~*Mr#=~at)eu~ zr7IR_aLxNh929s=BqQ44PJB--VS3W-GqA=nC59-`_2r{a&ssThy$urP5Pu-mW;r7q zEnYi=UmIk7tyW_=ATY@sqxutBgIbttJ7ao3hF?H?+L8tAboXLuyq3c#8ROXjFtt26v=WKyr!eP?aEilCU)InBDAI8-i=him$hc)v*clzQw z9_>}`tw(lLb1kgxTq6eF-FPA=m9?D1!m{WXy+A`3r?C?3BZ=bk)7WkIr)4OWhg+yi zqQP%ArVuRA3>N&z;l1C>lh<#KkMyC}92t3h(s(I=mfEIPE1ZxcEUDeJo&T?QU5J9F&a2eR;u(5mt z@wd9nZ&$!T3Rgdq=W_RO5Z)bp-*A)q;LwSG&6|+BzUKQgTj6GJkK#4QL(5)tZ)vm? z7Rse#i$g}qm~er%zJ%8}J1DT}r$r{=kXShh-a#Cy<>p#bg^NRy1T9=sha|!M8gE(7 zxeF*a`!{cJ@hC`va~qCB);EG4_zg>T zeWWGJju#n$O%oJ467mUOg$Y(~D9o>P8e0`M2Nz8>!esQDrB;~ST#_>N2&E>Csr9%9 zKK^b|u;q&GLKN1GL)tRon|K}QeTovN$oe24aX`UXk5Q0 zF!}QUa5L9Ko(~#Lv-FQjhYHKI0c7;g#@%6(-bP?B^O)Or?0S z91}N=^Cb^0xAJZfp8__e6&VdeK*z8Z#n~t>X}Fwy=5g56th9IEMrqrHYrhne{__42`L^n?eC>DlIdNl9;Xd{G7#x|q#J0eN zrj+J<_13R!={ytR>;(C_D@_ee{ZHOjDl(o_QN1($hwfJsf_XANuf6>8>_Ow#r0T(| zQ!*Bm8%+0UT_|F_r`X$9Q#p+K!j0?5s}buPl*0SiQAoL~a2qUQytRG%SC`|w*atA3 zE^@E-uC_RiGOLSQ`OR>c&5=ug&fQ;cw@H_>cV?kg6lk#v11FlqP+nJDc(<@L4Js5K za1!`8kxz%Rl&8aq$}7Htk4jdlANHFmt8DHK{TehjoDDjJ6&Nn2bi9AzIO0BcLgo>j8l$N7FQ znBdX>g%a--zP%Lk(CD)@J*;5K;xeeDE5HQ`%EQV{z}_1&J0p$u5d~Feh5kgMPcvdo zi+&AQjpB{wpU~>@U^iAHnjka)>c)hD7OmJ^HF=Cx*^4YBmtQvROSPmd^GT>iq&T(l(R-x_K1YyikMYfWUzW5w+8gNFtZC0kJK=>Bd#}q)1T77X>0n<430|(VV03P39Bv%zIjB}5QC${ zpK7*yjBHI{!X59P55@7Vx10h!2(Q?v;~(5xLdzvB$*J{priyO9438v}&L8h3%dSUq z1?elD@mh;2ra}im7%O8+o1A8Kj}TM|YQd}d*F68K;c z_PzF6Lc;OeE+?E4v(iUH_g)q_>M~nT1G;f91zB2yq+0k>(1O3CR%j@Gj%;Th+;^Rn@A2|mGf5-3^olKS1B5Up3+>g^RatL5x@`>cpbHzckv*E7k=|1Mmwf z41TmJdxl?u-c6#;z3n(0yV&=22?Oq0&{A(@Sbi0Ya5F(c%w4A6W2l)57Y$IK>9?}2 zMOvo;zNBc$;i)x+=w*JHE#6kXPV(;>UgCJA35KEp@~sv0(HDTN{8zAcLy>Qc z{F3}+CFF6hZ}e|bcpWBe+K?7jVd6bfcEN#U=@snpe0Byrr4o>qk54zq> zv7FqO9K&I^I|-JVNXFCZx*bX8t=>vE)?4f#qw1=XFLilDjJ#qRiPIj8lzB^l(fgkl zFhU0gIXkdb_sD6rh#k4FCw0#K8EKvAa|p-FVJLrNW_VIbo~1J*{6_n>Xm2Uxo6%AU zzX1Qr?t$%r?DD6A1k9}o6{>mDJ{Xc zt;M*r#p<0euN7ZRO~|Zwqa-WxfA_YE(h<5zq-k5|=0hSVZ>ipW?)?pHch@@@dN~Op`rWDFGAG-Y;a4|0=O7|Uv< zJd?AO2)#tC5omJW1uTpOJ~Gw_5Cz&%jGt53A4&Xe=~dIGo<3Vx#OZ6#!Cht@Jk+PE z$%A`#u9^x@o`*_HjGsStVU$Td=V(-oKQr_-TF*J&bznG*Ki|PHc((H8p3FiyFjF1E zp(xVvtQ*ns0eXMhp@Q+35eruCl%@L9jlZqar?&k2tMSJImv%B4{mJ=5!T!r*{fhtq zHsC=D#|Qwhce3EHaC&EIW5)5p#){(=@PGaJQyepJ9xwV-t%(2taQ#;d0Mz(Pf;qb+ zssH3~zcKrg_cXTqbTR*xGi(Bu>Zb))b>aUxdhlQu8EpLL!P3q;-?Q=9)bXk%O1ah`>kP=urCMi59VdR*3enK&8p8 z2`j%pNiQM-00MtW8{7XUUDop~`@M$@7UTq_(RA5~iw-@7za7{AO;zI`1IF&-gRUk*iqFR9$>2tV0|12om-5s|%V01`uqe1<@OdW{ zePpnrq0l*w`?#U{e|`J?tM(UIvj18C4VL(1_S0@zo}6EvzjD5%Ld7_S5y7qfB+z}# z_mjbfrT@E+KmA1qvkg2?FFZg7Ym)`$>LLL<3~)l14u-T4v^+^uKb_HwzoZ%RpX_B? z@c-AIho@S$qW@%N25F)7Oz?{6f4qH*Kg;{8p0e~QnH(Hhh4tU|+Xu;D{mP&kkAuw6 z)v^qc!FE-F-&TqImlg9weXD_HjSW#kvre9)nmC{dOx;8S OP8h~Ugm3;c@_zu%56iCr delta 8509 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 Date: Mon, 22 Jun 2015 14:31:31 -0400 Subject: [PATCH 17/29] 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 0aa226c1b32a852126b2981fc6adb39f9ac26a1c Mon Sep 17 00:00:00 2001 From: nemonik Date: Mon, 22 Jun 2015 14:57:14 -0400 Subject: [PATCH 18/29] fixing ci pipeline --- .travis.yml | 2 +- build.gradle | 7 +++++++ circle.yml | 2 +- gradle/wrapper/gradle-wrapper.properties | 2 +- gradlew | 2 +- gradlew.bat | 2 +- 6 files changed, 12 insertions(+), 5 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 d8bc8b0..bcb5c09 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: diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 689b7a7..dbc7d44 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,4 +1,4 @@ -#Mon Jun 22 13:29:56 EDT 2015 +#Mon Jun 22 14:56:06 EDT 2015 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME 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 551a442a3dd8a9cf329905f74eaad0d9d64c5c5e Mon Sep 17 00:00:00 2001 From: nemonik Date: Mon, 22 Jun 2015 15:12:01 -0400 Subject: [PATCH 19/29] 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 f7752c0..a919d29 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.2.0` would be `v1.2.0.1`. Patches +will be worked in a branch prior to being tagged and released. ## Releases From 43af481f70769bfad94337c5949b793414e8ba66 Mon Sep 17 00:00:00 2001 From: nemonik Date: Tue, 23 Jun 2015 10:43:14 -0400 Subject: [PATCH 20/29] doc: typo fix --- README.MD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.MD b/README.MD index a919d29..69d1f6b 100644 --- a/README.MD +++ b/README.MD @@ -22,7 +22,7 @@ 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 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.2.0` would be `v1.2.0.1`. Patches From a7147c396071d12c800b664d27c69efcb7bde379 Mon Sep 17 00:00:00 2001 From: nemonik Date: Tue, 23 Jun 2015 10:51:32 -0400 Subject: [PATCH 21/29] doc: typo fix --- README.MD | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/README.MD b/README.MD index 69d1f6b..03fc749 100644 --- a/README.MD +++ b/README.MD @@ -24,9 +24,10 @@ 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 java-stix for a particular schema 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.2.0` would be `v1.2.0.1`. Patches -will be worked in a branch prior to being tagged and released. +java-stix for a particular schema release will add, and follow on patches 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. ## Releases From 8eaadd72ceb379b8bab94a02b23220c470a9562b Mon Sep 17 00:00:00 2001 From: nemonik Date: Tue, 23 Jun 2015 11:05:53 -0400 Subject: [PATCH 22/29] doc: typo fix --- README.MD | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/README.MD b/README.MD index 03fc749..ccdf716 100644 --- a/README.MD +++ b/README.MD @@ -23,11 +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 schema 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 follow on patches 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. +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. ## Releases From 2edc3fae17abef0e82b886b28480209f6782af9f Mon Sep 17 00:00:00 2001 From: nemonik Date: Sun, 28 Jun 2015 23:00:02 -0400 Subject: [PATCH 23/29] change to allow validation to thrown SAXException, when no ErrorHandler is set --- README.MD | 18 +++++++------- .../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 +++ 6 files changed, 41 insertions(+), 18 deletions(-) diff --git a/README.MD b/README.MD index ccdf716..93c8cb5 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.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. ## Releases @@ -37,16 +37,16 @@ Releases are distributed via the Maven Central Repository. org.mitre stix - 1.2.0.1 + 1.2.0.2 ### Gradle: - compile 'org.mitre:stix:1.2.0.1' + compile 'org.mitre:stix:1.2.0.2' ### Apache Ivy: - + ## Snapshots @@ -69,7 +69,7 @@ Users using Apache Maven for example can simply retrieve java-stix directly via org.mitre stix - 1.2.0.1-SNAPSHOT + 1.2.0.2-SNAPSHOT @@ -356,9 +356,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 :/java-stix/build/libs/stix-1.2.0.1-SNAPSHOT-javadoc.jar . - docker cp :/java-stix/build/libs/stix-1.2.0.1-SNAPSHOT-sources.jar . - docker cp :/java-stix/build/libs/stix-1.2.0.1-SNAPSHOT.jar . + docker cp :/java-stix/build/libs/stix-1.2.0.2-SNAPSHOT-javadoc.jar . + docker cp :/java-stix/build/libs/stix-1.2.0.2-SNAPSHOT-sources.jar . + docker cp :/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: @@ -366,7 +366,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 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 f3b926e..41231b9 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(); @@ -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 702312a..64c6e39 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 da3a5e6..6179f71 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 1a04ed9..8e156ea 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 4f70bda59a6b28f140c4064329f983acbbd0fa9e Mon Sep 17 00:00:00 2001 From: nemonik Date: Mon, 29 Jun 2015 00:28:45 -0400 Subject: [PATCH 24/29] changed the version --- gradle.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gradle.properties b/gradle.properties index f6d4bb2..e64a1f2 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,5 +1,5 @@ -version = 1.2.0.1 +version = 1.2.0.2 schemaVersion = 1.2.0 group = org.mitre name = stix -mainClass = org.mitre.stix.STIXSchema \ No newline at end of file +mainClass = org.mitre.stix.STIXSchema From acbb1c00e7ab3e130483941818b6d44d7f2798f4 Mon Sep 17 00:00:00 2001 From: nemonik Date: Mon, 29 Jun 2015 13:48:31 -0400 Subject: [PATCH 25/29] 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 41231b9..e7736d7 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 4d8b0b3e6db281de4789ce75194753a54687dd42 Mon Sep 17 00:00:00 2001 From: nemonik Date: Tue, 30 Jun 2015 02:27:54 -0400 Subject: [PATCH 26/29] doc: update Dockerfile and README.MD documentation --- Dockerfile | 12 ++++++------ README.MD | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Dockerfile b/Dockerfile index 1838bd2..51e022b 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 # from the command-line of your docker host, not the container: # -# docker cp :/java-stix/build/libs/stix-1.1.1.1-SNAPSHOT-javadoc.jar . -# docker cp :/java-stix/build/libs/stix-1.1.1.1-SNAPSHOT-sources.jar . -# docker cp :/java-stix/build/libs/stix-1.1.1.1-SNAPSHOT.jar . +# docker cp :/java-stix/build/libs/stix-1.2.0.2-SNAPSHOT-javadoc.jar . +# docker cp :/java-stix/build/libs/stix-1.2.0.2-SNAPSHOT-sources.jar . +# docker cp :/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: # @@ -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.2.0.2-SNAPSHOT.jar . # # ############################################################ diff --git a/README.MD b/README.MD index 93c8cb5..ed1fe55 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.2.0` would be `v1.2.0.1`. Patches will be worked in a branch prior to being tagged and released. ## Releases From 83f48bc5b4908fddaa01dfa5eecd725ddfac2f31 Mon Sep 17 00:00:00 2001 From: nemonik Date: Wed, 1 Jul 2015 14:53:07 -0400 Subject: [PATCH 27/29] changes for pom --- build.gradle | 58 ++++++++++++++++++++++++++++------------------------ 1 file changed, 31 insertions(+), 27 deletions(-) diff --git a/build.gradle b/build.gradle index bcb5c09..725affa 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 @@ -151,22 +151,21 @@ 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' @@ -174,21 +173,26 @@ uploadArchives{ // 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' + name 'STIX Project, The MITRE Corporation' + email 'stix[ASCII character number 64]mitre.org' + }, developer { id 'nemonik' name 'Michael Joseph Walsh' @@ -208,17 +212,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'.") } @@ -261,13 +265,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" @@ -295,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") @@ -305,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 @@ -335,7 +339,7 @@ buildscript { jcenter() mavenCentral() mavenLocal() - + flatDir { dirs "libs" } } @@ -351,16 +355,16 @@ 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" - classpath "org.jvnet.jaxb2_commons:jaxb2-value-constructor:3.0" + classpath "org.jvnet.jaxb2_commons:jaxb2-value-constructor:3.0" classpath "org.jvnet.jaxb2_commons:jaxb2-default-value:1.1" classpath "org.jvnet.jaxb2_commons:jaxb2-namespace-prefix:1.1" } From f80ccdc742204e1b54fdfa432db8a0527e75b219 Mon Sep 17 00:00:00 2001 From: nemonik Date: Wed, 1 Jul 2015 15:09:15 -0400 Subject: [PATCH 28/29] changed MAINTAINER --- Dockerfile | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/Dockerfile b/Dockerfile index 51e022b..2a556ef 100644 --- a/Dockerfile +++ b/Dockerfile @@ -8,17 +8,17 @@ # @author nemonik (Michael Joseph Walsh ) # # 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 # -# To retreive the jar archives from the running docker container use following +# 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 :/java-stix/build/libs/stix-1.2.0.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.2.0.2-SNAPSHOT.jar . +# ➜ /tmp docker cp 83ad9afb6096:/java-stix/build/libs/stix-1.2.0.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 8793af62173cc946b58232d2162ef318d6bbc372 Mon Sep 17 00:00:00 2001 From: nemonik Date: Wed, 1 Jul 2015 15:19:09 -0400 Subject: [PATCH 29/29] changes for pom --- build.gradle | 5 ----- 1 file changed, 5 deletions(-) diff --git a/build.gradle b/build.gradle index 725affa..0f9966a 100644 --- a/build.gradle +++ b/build.gradle @@ -192,11 +192,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' } } }