Skip to content

Commit 3b6de96

Browse files
authored
Refactor devcontainer and update JAXB unmarshalling in tests (#7095)
* refactor: clean up devcontainer and vscode configurations; update JAXB unmarshalling in tests * feat: implement LenientValidationEventHandler and update JAXB unmarshalling to ignore namespaces
1 parent 546ab79 commit 3b6de96

File tree

10 files changed

+336
-788
lines changed

10 files changed

+336
-788
lines changed

.devcontainer/devcontainer.json

Lines changed: 0 additions & 81 deletions
Original file line numberDiff line numberDiff line change
@@ -51,87 +51,6 @@
5151
"java.debug.settings.hotCodeReplace": "auto",
5252
"sonarlint.rules": {
5353
"java:S106": "off"
54-
},
55-
"tasks": {
56-
"version": "2.0.0",
57-
"tasks": [
58-
{
59-
"label": "Run CIA Server",
60-
"type": "shell",
61-
"command": "mvn",
62-
"args": [
63-
"exec:java",
64-
"-Dexec.classpathScope=test",
65-
"-Dexec.mainClass=com.hack23.cia.systemintegrationtest.CitizenIntelligenceAgencyServer",
66-
"-Djava.awt.headless=true"
67-
],
68-
"options": {
69-
"cwd": "${workspaceFolder}/citizen-intelligence-agency",
70-
"env": {
71-
"MAVEN_OPTS": "-server -Xmx8192m -Xms2048m"
72-
}
73-
},
74-
"group": {
75-
"kind": "run",
76-
"isDefault": true
77-
},
78-
"presentation": {
79-
"reveal": "always",
80-
"panel": "new"
81-
}
82-
},
83-
{
84-
"label": "Unit Tests",
85-
"type": "shell",
86-
"command": "xvfb-run",
87-
"args": [
88-
"mvn",
89-
"-B",
90-
"--file",
91-
"pom.xml",
92-
"clean",
93-
"install",
94-
"-pl",
95-
"!com.hack23.cia:cia-dist-deb",
96-
"-DforkMode=once",
97-
"-Dtest=!**ITest*,!**DocumentationTest*",
98-
"-Dmaven.test.failure.ignore=true",
99-
"-DfailIfNoTests=false",
100-
"-Dsurefire.failIfNoSpecifiedTests=false",
101-
"-Dsurefire.reportNameSuffix=UNIT",
102-
"-Dspdx.skip"
103-
],
104-
"options": {
105-
"cwd": "${workspaceFolder}/parent-pom",
106-
"env": {
107-
"MAVEN_OPTS": "-server -Xmx8192m -Xms2048m"
108-
}
109-
},
110-
"group": "test"
111-
},
112-
{
113-
"label": "Clean Install (No Tests)",
114-
"type": "shell",
115-
"command": "mvn",
116-
"args": [
117-
"clean",
118-
"install",
119-
"-pl",
120-
"!com.hack23.cia:cia-dist-deb,!com.hack23.cia:cia-dist-cloudformation",
121-
"-DskipTests",
122-
"-DfailIfNoTests=false",
123-
"-Dsurefire.failIfNoSpecifiedTests=false",
124-
"-Dspdx.skip"
125-
],
126-
"options": {
127-
"cwd": "${workspaceFolder}/parent-pom",
128-
"env": {
129-
"MAVEN_OPTS": "-Xmx8192m -Xms2048m"
130-
}
131-
},
132-
"group": "build"
133-
}
134-
]
13554
}
13655
},
13756
"features": {

.vscode/settings.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,5 +57,7 @@
5757
"**/node_modules/**",
5858
"**/.metadata/**"
5959
],
60-
"maven.pomfile.autoUpdateEffectivePOM": true
60+
"maven.pomfile.autoUpdateEffectivePOM": true,
61+
"java.jdt.ls.java.home": "/usr/local/sdkman/candidates/java/current",
62+
"maven.executable.path": "/usr/local/sdkman/candidates/maven/current/bin/mvn"
6163
}

.vscode/tasks.json

Lines changed: 81 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,81 @@
1+
{
2+
"version": "2.0.0",
3+
"tasks": [
4+
{
5+
"label": "Run CIA Server",
6+
"type": "shell",
7+
"command": "mvn",
8+
"args": [
9+
"exec:java",
10+
"-Dexec.classpathScope=test",
11+
"-Dexec.mainClass=com.hack23.cia.systemintegrationtest.CitizenIntelligenceAgencyServer",
12+
"-Djava.awt.headless=true"
13+
],
14+
"options": {
15+
"cwd": "${workspaceFolder}/citizen-intelligence-agency",
16+
"env": {
17+
"MAVEN_OPTS": "-server -Xmx8192m -Xms2048m"
18+
}
19+
},
20+
"group": {
21+
"kind": "run",
22+
"isDefault": true
23+
},
24+
"presentation": {
25+
"reveal": "always",
26+
"panel": "new"
27+
}
28+
},
29+
{
30+
"label": "Unit Tests",
31+
"type": "shell",
32+
"command": "xvfb-run",
33+
"args": [
34+
"mvn",
35+
"-B",
36+
"--file",
37+
"pom.xml",
38+
"clean",
39+
"install",
40+
"-pl",
41+
"!com.hack23.cia:cia-dist-deb",
42+
"-DforkMode=once",
43+
"-Dtest=!**ITest*,!**DocumentationTest*",
44+
"-Dmaven.test.failure.ignore=true",
45+
"-DfailIfNoTests=false",
46+
"-Dsurefire.failIfNoSpecifiedTests=false",
47+
"-Dsurefire.reportNameSuffix=UNIT",
48+
"-Dspdx.skip"
49+
],
50+
"options": {
51+
"cwd": "${workspaceFolder}/parent-pom",
52+
"env": {
53+
"MAVEN_OPTS": "-server -Xmx8192m -Xms2048m"
54+
}
55+
},
56+
"group": "test"
57+
},
58+
{
59+
"label": "Clean Install (No Tests)",
60+
"type": "shell",
61+
"command": "mvn",
62+
"args": [
63+
"clean",
64+
"install",
65+
"-pl",
66+
"!com.hack23.cia:cia-dist-deb,!com.hack23.cia:cia-dist-cloudformation",
67+
"-DskipTests",
68+
"-DfailIfNoTests=false",
69+
"-Dsurefire.failIfNoSpecifiedTests=false",
70+
"-Dspdx.skip"
71+
],
72+
"options": {
73+
"cwd": "${workspaceFolder}/parent-pom",
74+
"env": {
75+
"MAVEN_OPTS": "-Xmx8192m -Xms2048m"
76+
}
77+
},
78+
"group": "build"
79+
}
80+
]
81+
}

0 commit comments

Comments
 (0)