From 61ec380b8429d2ece5122ea1ac0f780765b6f971 Mon Sep 17 00:00:00 2001
From: David Diederich <d.diederich@opengroup.org>
Date: Wed, 27 May 2020 19:36:54 -0400
Subject: [PATCH 1/2] Updated .gitlab-ci.yml to use individual includes instead
 of an aggregate include

The aggregate include style is deprecated, and I'd like to move away from it.
---
 .gitlab-ci.yml | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a4899595..4f02b1c0 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,4 +1,20 @@
 include:
   - project: 'osdu/platform/ci-cd-pipelines'
     ref: 'master'
-    file: 'library.gitlab-ci.yml'
+    file: 'standard-setup.yml'
+
+  - project: 'osdu/platform/ci-cd-pipelines'
+    ref: 'master'
+    file: 'build/maven.yml'
+
+  - project: 'osdu/platform/ci-cd-pipelines'
+    ref: 'master'
+    file: 'scanners/gitlab-ultimate.yml'
+
+  - project: 'osdu/platform/ci-cd-pipelines'
+    ref: 'master'
+    file: 'scanners/fossa.yml'
+
+  - project: 'osdu/platform/ci-cd-pipelines'
+    ref: 'master'
+    file: 'publishing/pages.yml'
-- 
GitLab


From 276a849e5e3b9b83d943006d7ed6aff396a4b6f3 Mon Sep 17 00:00:00 2001
From: David Diederich <d.diederich@opengroup.org>
Date: Wed, 27 May 2020 19:37:07 -0400
Subject: [PATCH 2/2] Updating NOTICE

---
 NOTICE | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/NOTICE b/NOTICE
index 7558a234..fe34699f 100644
--- a/NOTICE
+++ b/NOTICE
@@ -182,7 +182,6 @@ The following software have components provided under the terms of this license:
 
 - ASM Core (from )
 - Apache Commons Codec (from http://commons.apache.org/proper/commons-codec/)
-- Byte Buddy (without dependencies) (from )
 - JavaBeans Activation Framework API jar (from )
 - Lucene Common Analyzers (from )
 - Lucene Core (from )
@@ -444,6 +443,7 @@ unknown
 ========================================================================
 The following software have components provided under the terms of this license:
 
+- Byte Buddy (without dependencies) (from )
 - JUnit Jupiter (Aggregator) (from https://junit.org/junit5/)
 - JavaBeans Activation Framework API jar (from )
 - JavaMail API (from )
-- 
GitLab