publiser inntektsmelding-v1 for javax.xml.bind, og inntektsmelding-v1-jakarta for jakarta.xml.bind

Author: frode-carlsen

.devcontainer/Dockerfile

@@ -0,0 +1,11 @@
+# See here for image contents: https://github.com/microsoft/vscode-dev-containers/tree/v0.192.0/containers/java/.devcontainer/base.Dockerfile
+
+# [Choice] Java version: 11, 16
+ARG VARIANT="16"
+FROM mcr.microsoft.com/vscode/devcontainers/java:0-${VARIANT}
+
+# [Option] Install Maven
+ARG INSTALL_MAVEN="true"
+ARG MAVEN_VERSION="3.8.3"
+
+RUN if [ "${INSTALL_MAVEN}" = "true" ]; then su vscode -c "umask 0002 && . /usr/local/sdkman/bin/sdkman-init.sh && sdk install maven \"${MAVEN_VERSION}\""; fi

.devcontainer/devcontainer.json

@@ -0,0 +1,26 @@
+// For format details, see https://aka.ms/devcontainer.json. For config options, see the README at:
+// https://github.com/microsoft/vscode-dev-containers/tree/v0.192.0/containers/java
+{
+	"name": "Java",
+	"build": {
+		"dockerfile": "Dockerfile"
+	},
+
+	// Set *default* container specific settings.json values on container create.
+	"settings": { 
+		"java.home": "/docker-java-home"
+	},
+	
+	// Add the IDs of extensions you want installed when the container is created.
+	"extensions": [
+		"vscjava.vscode-java-pack"
+	],
+
+	// Use 'forwardPorts' to make a list of ports inside the container available locally.
+	// "forwardPorts": [],
+
+	"postAttachCommand" : "postAttachCommand.sh",
+	
+	// Comment out connect as root instead. More info: https://aka.ms/vscode-remote/containers/non-root.
+	"remoteUser": "vscode"
+}

.devcontainer/postAttachComman.sh

@@ -0,0 +1,2 @@
+mkdir -p  ~/.m2
+cp /workspace/.github/settings.xml ~/.m2/

.github/settings.xml

@@ -41,8 +41,8 @@
     <servers>
         <server>
             <id>github</id>
-            <username>${env.GITHUB_USERNAME}</username>
-            <password>${env.GITHUB_PASSWORD}</password>
+            <username>x-access-token</username>
+            <password>${env.GITHUB_TOKEN}</password>
         </server>
     </servers>
 </settings>

.github/workflows/build-pr.yml

@@ -22,5 +22,4 @@ jobs:
       - name: Build
         run: mvn verify --settings .github/settings.xml -DtrimStackTrace=false
         env:
-          GITHUB_USERNAME: x-access-token
-          GITHUB_PASSWORD: ${{ secrets.GITHUB_TOKEN }}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/build.yml

@@ -25,6 +25,5 @@ jobs:
         run: |
              mvn install -e --batch-mode --settings .github/settings.xml --file pom.xml -DtrimStackTrace=false
         env:
-          GITHUB_USERNAME: x-access-token
-          GITHUB_PASSWORD: ${{ secrets.GITHUB_TOKEN }}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 

.github/workflows/release-kontrakt.yml

@@ -22,5 +22,4 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_ACCESS_TOKEN }}
           NEW_VERSION: ${{ github.event.release.tag_name }}
-          GITHUB_USERNAME: x-access-token
-          GITHUB_PASSWORD: ${{ secrets.GITHUB_TOKEN }}
+

inntektsmelding/pom.xml

@@ -13,7 +13,7 @@
 
 	<properties>
 		<xsd.packagename></xsd.packagename>
-		<jaxb.version>3.0.1</jaxb.version>
+		<jaxb.version>2.4.0-b180830.0438</jaxb.version>
 	</properties>
 
 	<dependencies>
@@ -56,9 +56,9 @@
 						<version>${jaxb.version}</version>
 					</dependency>
 					<dependency>
-						<groupId>jakarta.xml.bind</groupId>
-						<artifactId>jakarta.xml.bind-api</artifactId>
-						<version>${jaxb.version}</version>
+						<groupId>javax.xml.bind</groupId>
+						<artifactId>jaxb-api</artifactId>
+						<version>2.4.0-b180830.0359</version>
 					</dependency>
 					<dependency>
 						<groupId>com.sun.xml.bind</groupId>

inntektsmelding/src/main/java/no/seres/xsd/nav/inntektsmelding_m/DateAdapter.java

@@ -5,7 +5,7 @@
 import java.time.format.DateTimeParseException;
 import java.util.Objects;
 
-import jakarta.xml.bind.annotation.adapters.XmlAdapter;
+import javax.xml.bind.annotation.adapters.XmlAdapter;
 
 public class DateAdapter extends XmlAdapter<String, LocalDate> {
 

inntektsmelding/src/main/java/no/seres/xsd/nav/inntektsmelding_m/DateTimeAdapter.java

@@ -5,7 +5,7 @@
 import java.time.format.DateTimeParseException;
 import java.util.Objects;
 
-import jakarta.xml.bind.annotation.adapters.XmlAdapter;
+import javax.xml.bind.annotation.adapters.XmlAdapter;
 
 public class DateTimeAdapter extends XmlAdapter<String, LocalDateTime> {