Updating NOTICE file

NOTICE

@@ -287,12 +287,6 @@ CC-BY-2.5
 The following software have components provided under the terms of this license:
 
 - Checker Qual (from https://checkerframework.org)
-
-========================================================================
-CC-BY-3.0
-========================================================================
-The following software have components provided under the terms of this license:
-
 - FindBugs-jsr305 (from http://findbugs.sourceforge.net/)
 
 ========================================================================
@@ -311,7 +305,6 @@ The following software have components provided under the terms of this license:
 - HK2 core module (from )
 - HK2 module of HK2 itself (from )
 - JavaBeans Activation Framework API jar (from )
-- JavaBeans(TM) Activation Framework (from http://java.sun.com/javase/technologies/desktop/javabeans/jaf/index.jsp)
 - Run Level Service (from )
 - ServiceLocator Default Implementation (from git://java.net/hk2~git/hk2-locator)
 - aopalliance-repackaged (from )
@@ -335,6 +328,7 @@ The following software have components provided under the terms of this license:
 
 - Java Architecture For XML Binding (from )
 - Java Servlet API (from http://servlet-spec.java.net)
+- JavaBeans(TM) Activation Framework (from http://java.sun.com/javase/technologies/desktop/javabeans/jaf/index.jsp)
 - JavaMail API (from )
 - JavaMail API jar (from )
 - OSGi resource locator (from )
@@ -343,6 +337,13 @@ The following software have components provided under the terms of this license:
 - tomcat-embed-core (from http://tomcat.apache.org/)
 - tomcat-embed-core (from http://tomcat.apache.org/)
 
+========================================================================
+CPL-1.0
+========================================================================
+The following software have components provided under the terms of this license:
+
+- JUnit (from http://junit.org)
+
 ========================================================================
 EPL-1.0
 ========================================================================
@@ -351,7 +352,6 @@ The following software have components provided under the terms of this license:
 - Eclipse Xbase Runtime Library (from )
 - Eclipse Xtend Active Annotations Library (from https://www.eclipse.org/Xtext/)
 - Eclipse Xtend Runtime Library (from https://www.eclipse.org/Xtext/)
-- JUnit (from http://junit.org)
 - Logback Classic Module (from )
 - Logback Core Module (from )
 - SnakeYAML (from http://www.snakeyaml.org)
@@ -569,6 +569,7 @@ unknown
 The following software have components provided under the terms of this license:
 
 - Byte Buddy (without dependencies) (from )
+- JUnit (from http://junit.org)
 - jersey-container-servlet (from git://java.net/jersey~code/project/jersey-container-servlet)
 - jersey-container-servlet-core (from git://java.net/jersey~code/project/jersey-container-servlet-core)
 - jersey-core-client (from git://java.net/jersey~code/jersey-client)