From c2cb1cd161e554fc73d1d0ca61b5f6c71dfd74af Mon Sep 17 00:00:00 2001
From: Per Christian Moen <per.christian.moen@nav.no>
Date: Sat, 27 Apr 2024 18:54:09 +0200
Subject: [PATCH] =?UTF-8?q?Legger=20til=20endringer=20gjort=20p=C3=A5=20bu?=
 =?UTF-8?q?ssen=20i=202023?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../lib/pen/gbo/GBOBeregningsResultat2016.xsd | 12 ++++++-
 .../lib/pen/gbo/GBOBeregningsResultat2025.xsd | 31 +++++++++++++++++--
 .../main/resources/lib/pen/gbo/GBOVedtak.xsd  |  5 +++
 .../GBOVilkarsprovAlderspensjonResultat.xsd   |  8 +++++
 4 files changed, 52 insertions(+), 4 deletions(-)

diff --git a/nav-bsrv-sah-brevbestilling-legacy/src/main/resources/lib/pen/gbo/GBOBeregningsResultat2016.xsd b/nav-bsrv-sah-brevbestilling-legacy/src/main/resources/lib/pen/gbo/GBOBeregningsResultat2016.xsd
index c616b1f..2f069da 100644
--- a/nav-bsrv-sah-brevbestilling-legacy/src/main/resources/lib/pen/gbo/GBOBeregningsResultat2016.xsd
+++ b/nav-bsrv-sah-brevbestilling-legacy/src/main/resources/lib/pen/gbo/GBOBeregningsResultat2016.xsd
@@ -1,7 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema targetNamespace="http://nav-lib-pen/no/nav/lib/pen/gbo"
 	xmlns:bons0="http://nav-lib-pen/no/nav/lib/pen/gbo"
-	xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+	xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+	xmlns:bons1="http://stelvio-commons-lib/no/nav/gbo">
+	<xsd:import schemaLocation="../../../gbo/GBOEndringsInfo.xsd"
+		namespace="http://stelvio-commons-lib/no/nav/gbo">
+	</xsd:import>
 	<xsd:include schemaLocation="GBOBeregningsResultat2025.xsd" />
 	<xsd:include schemaLocation="GBOBeregningsResultat.xsd" />
 	<xsd:include schemaLocation="GBOPensjonUnderUtbetaling.xsd" />
@@ -29,6 +33,12 @@
 				name="beregningsResultat2025"
 				type="bons0:GBOBeregningsResultat2025">
 			</xsd:element>
+			<xsd:element minOccurs="0" name="benyttetSivilstand"
+				type="xsd:string">
+			</xsd:element>
+			<xsd:element minOccurs="0" name="endringsInfo"
+				type="bons1:GBOEndringsInfo">
+			</xsd:element>
 		</xsd:sequence>
 	</xsd:complexType>
 </xsd:schema>
\ No newline at end of file
diff --git a/nav-bsrv-sah-brevbestilling-legacy/src/main/resources/lib/pen/gbo/GBOBeregningsResultat2025.xsd b/nav-bsrv-sah-brevbestilling-legacy/src/main/resources/lib/pen/gbo/GBOBeregningsResultat2025.xsd
index 09853aa..fee0343 100644
--- a/nav-bsrv-sah-brevbestilling-legacy/src/main/resources/lib/pen/gbo/GBOBeregningsResultat2025.xsd
+++ b/nav-bsrv-sah-brevbestilling-legacy/src/main/resources/lib/pen/gbo/GBOBeregningsResultat2025.xsd
@@ -1,8 +1,33 @@
-<?xml version="1.0" encoding="UTF-8"?><xsd:schema targetNamespace="http://nav-lib-pen/no/nav/lib/pen/gbo" xmlns:bons0="http://nav-lib-pen/no/nav/lib/pen/gbo" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-	<xsd:include schemaLocation="GBOBeregningsinformasjon2025.xsd"/>
+<?xml version="1.0" encoding="UTF-8"?>
+<xsd:schema targetNamespace="http://nav-lib-pen/no/nav/lib/pen/gbo"
+	xmlns:bons0="http://nav-lib-pen/no/nav/lib/pen/gbo"
+	xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+	xmlns:bons1="http://stelvio-commons-lib/no/nav/gbo">
+	<xsd:import schemaLocation="../../../gbo/GBOEndringsInfo.xsd"
+		namespace="http://stelvio-commons-lib/no/nav/gbo">
+	</xsd:import>
+	<xsd:include schemaLocation="GBOPensjonUnderUtbetaling.xsd"></xsd:include>
+	<xsd:include schemaLocation="GBOBeregningsinformasjon2025.xsd" />
 	<xsd:complexType name="GBOBeregningsResultat2025">
 		<xsd:sequence>
-			<xsd:element minOccurs="0" name="beregningsinformasjonKapittel20" type="bons0:GBOBeregningsinformasjon2025">
+			<xsd:element minOccurs="0"
+				name="beregningsinformasjonKapittel20"
+				type="bons0:GBOBeregningsinformasjon2025">
+			</xsd:element>
+			<xsd:element minOccurs="0" name="virkFom"
+				type="xsd:string">
+			</xsd:element>
+			<xsd:element minOccurs="0" name="virkTom"
+				type="xsd:string">
+			</xsd:element>
+			<xsd:element minOccurs="0" name="pensjonUnderUtbetaling"
+				type="bons0:GBOPensjonUnderUtbetaling">
+			</xsd:element>
+			<xsd:element minOccurs="0" name="endringsInfo"
+				type="bons1:GBOEndringsInfo">
+			</xsd:element>
+			<xsd:element minOccurs="0" name="benyttetSivilstand"
+				type="xsd:string">
 			</xsd:element>
 		</xsd:sequence>
 	</xsd:complexType>
diff --git a/nav-bsrv-sah-brevbestilling-legacy/src/main/resources/lib/pen/gbo/GBOVedtak.xsd b/nav-bsrv-sah-brevbestilling-legacy/src/main/resources/lib/pen/gbo/GBOVedtak.xsd
index b02d12f..59227f5 100644
--- a/nav-bsrv-sah-brevbestilling-legacy/src/main/resources/lib/pen/gbo/GBOVedtak.xsd
+++ b/nav-bsrv-sah-brevbestilling-legacy/src/main/resources/lib/pen/gbo/GBOVedtak.xsd
@@ -3,6 +3,7 @@
 	xmlns:bons0="http://nav-lib-pen/no/nav/lib/pen/gbo"
 	xmlns:bons1="http://stelvio-commons-lib/no/nav/gbo"
 	xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+	<xsd:include schemaLocation="GBOBeregningsResultat2025.xsd"></xsd:include>
 	<xsd:include schemaLocation="GBOBeregningsResultat2016.xsd" />
 	<xsd:include schemaLocation="GBOBeregningsResultatUforetrygd.xsd" />
 	<xsd:include schemaLocation="GBOSammenstotstilfelle.xsd" />
@@ -129,6 +130,10 @@
 				type="bons0:GBOBeregningsResultatUforetrygd"
 				maxOccurs="unbounded">
 			</xsd:element>
+			<xsd:element minOccurs="0"
+				name="beregningsResultat2025Liste"
+				type="bons0:GBOBeregningsResultat2025" maxOccurs="unbounded">
+			</xsd:element>
 		</xsd:sequence>
 	</xsd:complexType>
 </xsd:schema>
\ No newline at end of file
diff --git a/nav-bsrv-sah-brevbestilling-legacy/src/main/resources/lib/pen/gbo/GBOVilkarsprovAlderspensjonResultat.xsd b/nav-bsrv-sah-brevbestilling-legacy/src/main/resources/lib/pen/gbo/GBOVilkarsprovAlderspensjonResultat.xsd
index e374c8f..0eddf99 100644
--- a/nav-bsrv-sah-brevbestilling-legacy/src/main/resources/lib/pen/gbo/GBOVilkarsprovAlderspensjonResultat.xsd
+++ b/nav-bsrv-sah-brevbestilling-legacy/src/main/resources/lib/pen/gbo/GBOVilkarsprovAlderspensjonResultat.xsd
@@ -3,6 +3,8 @@
 	targetNamespace="http://nav-lib-pen/no/nav/lib/pen/gbo"
 	xmlns:bons0="http://nav-lib-pen/no/nav/lib/pen/gbo"
 	xmlns:bons1="http://stelvio-commons-lib/no/nav/gbo">
+	<xsd:include schemaLocation="GBOVilkarsprovInformasjon2025.xsd"></xsd:include>
+	<xsd:include schemaLocation="GBOBeregningsResultat2025.xsd"></xsd:include>
 	<xsd:include schemaLocation="GBOVilkarsprovInformasjon2016.xsd"></xsd:include>
 	<xsd:include schemaLocation="GBOBeregningsResultat2016.xsd"></xsd:include>
 	<xsd:import schemaLocation="../../../gbo/GBOEndringsInfo.xsd"
@@ -33,6 +35,12 @@
 			<xsd:element minOccurs="0" name="endringsInfo"
 				type="bons1:GBOEndringsInfo">
 			</xsd:element>
+			<xsd:element minOccurs="0" name="beregningVedUttak2025"
+				type="bons0:GBOBeregningsResultat2025">
+			</xsd:element>
+			<xsd:element minOccurs="0" name="vilkarsprovInformasjon2025"
+				type="bons0:GBOVilkarsprovInformasjon2025">
+			</xsd:element>
 		</xsd:sequence>
 	</xsd:complexType>
 </xsd:schema>