From 988ba2e897a5256defac18b32d1cde4ce2721116 Mon Sep 17 00:00:00 2001
From: Robin Sommer <robin@icir.org>
Date: Thu, 24 Apr 2014 17:08:45 -0700
Subject: [PATCH] Add Java version to software framework

BIT-1168 #merged
---
 CHANGES                                   | 4 ++++
 VERSION                                   | 2 +-
 scripts/base/frameworks/software/main.bro | 7 +++++++
 3 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/CHANGES b/CHANGES
index 37cfb13a64..b8f537e914 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,8 @@
 
+2.2-381 | 2014-04-24 17:08:45 -0700
+
+  * Add Java version to software framework. (Brian Little)
+    
 2.2-379 | 2014-04-24 17:06:21 -0700
 
   * Remove unused Val::attribs member. (Jon Siwek)
diff --git a/VERSION b/VERSION
index 523b625f56..ba398d78a0 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.2-379
+2.2-381
diff --git a/scripts/base/frameworks/software/main.bro b/scripts/base/frameworks/software/main.bro
index c8f413a8f2..f5c9927126 100644
--- a/scripts/base/frameworks/software/main.bro
+++ b/scripts/base/frameworks/software/main.bro
@@ -287,6 +287,13 @@ function parse_mozilla(unparsed_version: string): Description
 		if ( 2 in parts )
 			v = parse(parts[2])$version;
 		}
+	else if ( / Java\/[0-9]\./ in unparsed_version )
+		{
+		software_name = "Java";
+		parts = split_all(unparsed_version, /Java\/[0-9\._]*/);
+		if ( 2 in parts )
+			v = parse(parts[2])$version;
+		}
 
 	return [$version=v, $unparsed_version=unparsed_version, $name=software_name];
 	}