Skip to content

Commit 3d2038d

Browse files
committed
changed schema version for PropertyDeserializer run.
1 parent a27a57c commit 3d2038d

File tree

2 files changed

+13
-10
lines changed

2 files changed

+13
-10
lines changed

src/main/java/org/cyclonedx/util/PropertyDeserializer.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,9 @@
1313
import java.util.ArrayList;
1414
import java.util.Arrays;
1515
import java.util.List;
16+
1617
import org.cyclonedx.model.Property;
18+
1719
import com.fasterxml.jackson.core.JsonParser;
1820
import com.fasterxml.jackson.databind.DeserializationContext;
1921
import com.fasterxml.jackson.databind.JsonNode;
@@ -148,7 +150,7 @@ private List<Property> parsePropertyNode(JsonNode node, List<Property> propertie
148150
}
149151

150152
private boolean isPreleaseDeserializationEnabled() {
151-
final String s = System.getProperty("cyclonedx.prerelease.13.properties");
153+
final String s = System.getProperty("cyclonedx.prerelease.14.properties");
152154
return Boolean.parseBoolean(s);
153155
}
154156
}

src/test/java/org/cyclonedx/parsers/XmlParserTest.java

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,15 @@
1818
*/
1919
package org.cyclonedx.parsers;
2020

21+
import static org.junit.jupiter.api.Assertions.assertEquals;
22+
import static org.junit.jupiter.api.Assertions.assertFalse;
23+
import static org.junit.jupiter.api.Assertions.assertNotNull;
24+
import static org.junit.jupiter.api.Assertions.assertNull;
25+
import static org.junit.jupiter.api.Assertions.assertTrue;
26+
27+
import java.io.File;
28+
import java.util.List;
29+
2130
import org.apache.commons.io.IOUtils;
2231
import org.cyclonedx.CycloneDxSchema;
2332
import org.cyclonedx.model.Bom;
@@ -30,14 +39,6 @@
3039
import org.cyclonedx.model.Service;
3140
import org.cyclonedx.model.ServiceData;
3241
import org.junit.jupiter.api.Test;
33-
import java.io.File;
34-
import java.util.List;
35-
36-
import static org.junit.jupiter.api.Assertions.assertEquals;
37-
import static org.junit.jupiter.api.Assertions.assertFalse;
38-
import static org.junit.jupiter.api.Assertions.assertNotNull;
39-
import static org.junit.jupiter.api.Assertions.assertNull;
40-
import static org.junit.jupiter.api.Assertions.assertTrue;
4142

4243
@SuppressWarnings("deprecation")
4344
public class XmlParserTest {
@@ -439,7 +440,7 @@ public void test13PrereleasePropertyBom() throws Exception {
439440
assertEquals("Foo", c1.getProperties().get(0).getName());
440441
assertNull(c1.getProperties().get(0).getValue());
441442

442-
System.setProperty("cyclonedx.prerelease.13.properties", "true");
443+
System.setProperty("cyclonedx.prerelease.14.properties", "true");
443444
final Bom bom2 = parser.parse(file);
444445
Component c2 = bom2.getComponents().get(0);
445446
assertEquals(2, c2.getProperties().size());

0 commit comments

Comments
 (0)