Skip to content

Commit

Permalink
Refactor devcontainer and update JAXB unmarshalling in tests (#7095)
Browse files Browse the repository at this point in the history
* refactor: clean up devcontainer and vscode configurations; update JAXB unmarshalling in tests

* feat: implement LenientValidationEventHandler and update JAXB unmarshalling to ignore namespaces
  • Loading branch information
pethers authored Jan 24, 2025
1 parent 546ab79 commit 3b6de96
Show file tree
Hide file tree
Showing 10 changed files with 336 additions and 788 deletions.
81 changes: 0 additions & 81 deletions .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
Expand Up @@ -51,87 +51,6 @@
"java.debug.settings.hotCodeReplace": "auto",
"sonarlint.rules": {
"java:S106": "off"
},
"tasks": {
"version": "2.0.0",
"tasks": [
{
"label": "Run CIA Server",
"type": "shell",
"command": "mvn",
"args": [
"exec:java",
"-Dexec.classpathScope=test",
"-Dexec.mainClass=com.hack23.cia.systemintegrationtest.CitizenIntelligenceAgencyServer",
"-Djava.awt.headless=true"
],
"options": {
"cwd": "${workspaceFolder}/citizen-intelligence-agency",
"env": {
"MAVEN_OPTS": "-server -Xmx8192m -Xms2048m"
}
},
"group": {
"kind": "run",
"isDefault": true
},
"presentation": {
"reveal": "always",
"panel": "new"
}
},
{
"label": "Unit Tests",
"type": "shell",
"command": "xvfb-run",
"args": [
"mvn",
"-B",
"--file",
"pom.xml",
"clean",
"install",
"-pl",
"!com.hack23.cia:cia-dist-deb",
"-DforkMode=once",
"-Dtest=!**ITest*,!**DocumentationTest*",
"-Dmaven.test.failure.ignore=true",
"-DfailIfNoTests=false",
"-Dsurefire.failIfNoSpecifiedTests=false",
"-Dsurefire.reportNameSuffix=UNIT",
"-Dspdx.skip"
],
"options": {
"cwd": "${workspaceFolder}/parent-pom",
"env": {
"MAVEN_OPTS": "-server -Xmx8192m -Xms2048m"
}
},
"group": "test"
},
{
"label": "Clean Install (No Tests)",
"type": "shell",
"command": "mvn",
"args": [
"clean",
"install",
"-pl",
"!com.hack23.cia:cia-dist-deb,!com.hack23.cia:cia-dist-cloudformation",
"-DskipTests",
"-DfailIfNoTests=false",
"-Dsurefire.failIfNoSpecifiedTests=false",
"-Dspdx.skip"
],
"options": {
"cwd": "${workspaceFolder}/parent-pom",
"env": {
"MAVEN_OPTS": "-Xmx8192m -Xms2048m"
}
},
"group": "build"
}
]
}
},
"features": {
Expand Down
4 changes: 3 additions & 1 deletion .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -57,5 +57,7 @@
"**/node_modules/**",
"**/.metadata/**"
],
"maven.pomfile.autoUpdateEffectivePOM": true
"maven.pomfile.autoUpdateEffectivePOM": true,
"java.jdt.ls.java.home": "/usr/local/sdkman/candidates/java/current",
"maven.executable.path": "/usr/local/sdkman/candidates/maven/current/bin/mvn"
}
81 changes: 81 additions & 0 deletions .vscode/tasks.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,81 @@
{
"version": "2.0.0",
"tasks": [
{
"label": "Run CIA Server",
"type": "shell",
"command": "mvn",
"args": [
"exec:java",
"-Dexec.classpathScope=test",
"-Dexec.mainClass=com.hack23.cia.systemintegrationtest.CitizenIntelligenceAgencyServer",
"-Djava.awt.headless=true"
],
"options": {
"cwd": "${workspaceFolder}/citizen-intelligence-agency",
"env": {
"MAVEN_OPTS": "-server -Xmx8192m -Xms2048m"
}
},
"group": {
"kind": "run",
"isDefault": true
},
"presentation": {
"reveal": "always",
"panel": "new"
}
},
{
"label": "Unit Tests",
"type": "shell",
"command": "xvfb-run",
"args": [
"mvn",
"-B",
"--file",
"pom.xml",
"clean",
"install",
"-pl",
"!com.hack23.cia:cia-dist-deb",
"-DforkMode=once",
"-Dtest=!**ITest*,!**DocumentationTest*",
"-Dmaven.test.failure.ignore=true",
"-DfailIfNoTests=false",
"-Dsurefire.failIfNoSpecifiedTests=false",
"-Dsurefire.reportNameSuffix=UNIT",
"-Dspdx.skip"
],
"options": {
"cwd": "${workspaceFolder}/parent-pom",
"env": {
"MAVEN_OPTS": "-server -Xmx8192m -Xms2048m"
}
},
"group": "test"
},
{
"label": "Clean Install (No Tests)",
"type": "shell",
"command": "mvn",
"args": [
"clean",
"install",
"-pl",
"!com.hack23.cia:cia-dist-deb,!com.hack23.cia:cia-dist-cloudformation",
"-DskipTests",
"-DfailIfNoTests=false",
"-Dsurefire.failIfNoSpecifiedTests=false",
"-Dspdx.skip"
],
"options": {
"cwd": "${workspaceFolder}/parent-pom",
"env": {
"MAVEN_OPTS": "-Xmx8192m -Xms2048m"
}
},
"group": "build"
}
]
}
Loading

0 comments on commit 3b6de96

Please sign in to comment.