Change start-level to start-order in tests
diff --git a/src/it/analyzer-apiregions-errors-detected/src/main/features/errorsDetected.json b/src/it/analyzer-apiregions-errors-detected/src/main/features/errorsDetected.json
index aa755e9..e43f78e 100644
--- a/src/it/analyzer-apiregions-errors-detected/src/main/features/errorsDetected.json
+++ b/src/it/analyzer-apiregions-errors-detected/src/main/features/errorsDetected.json
@@ -3,7 +3,7 @@
"bundles":[
{
"id":"org.apache.aries.versioning:org.apache.aries.versioning.checker:0.3.1",
- "start-level":"20"
+ "start-order":"20"
}
],
"api-regions:JSON|false": [
diff --git a/src/it/analyzer-errors-detected/src/main/features/errorsDetected.json b/src/it/analyzer-errors-detected/src/main/features/errorsDetected.json
index 1c4abee..bd584cf 100644
--- a/src/it/analyzer-errors-detected/src/main/features/errorsDetected.json
+++ b/src/it/analyzer-errors-detected/src/main/features/errorsDetected.json
@@ -3,7 +3,7 @@
"bundles":[
{
"id":"org.osgi:org.osgi.framework:1.9.0",
- "start-level":"20"
+ "start-order":"20"
}
],
"api-regions:JSON|false": [
diff --git a/src/it/apis-jar-wrapped-flattened-classes/src/main/features/main.json b/src/it/apis-jar-wrapped-flattened-classes/src/main/features/main.json
index 997ac88..cae7e8c 100644
--- a/src/it/apis-jar-wrapped-flattened-classes/src/main/features/main.json
+++ b/src/it/apis-jar-wrapped-flattened-classes/src/main/features/main.json
@@ -3,11 +3,11 @@
"bundles":[
{
"id":"org.apache.jackrabbit:oak-lucene:1.10.2",
- "start-level":"4"
+ "start-order":"4"
},
{
"id":"org.apache.jackrabbit:oak-solr-osgi:1.10.2",
- "start-level":"5"
+ "start-order":"5"
}
],
"api-regions:JSON|false": [
diff --git a/src/it/apis-jar-wrapper-bundle/src/main/features/main.json b/src/it/apis-jar-wrapper-bundle/src/main/features/main.json
index b1315d4..7e76274 100644
--- a/src/it/apis-jar-wrapper-bundle/src/main/features/main.json
+++ b/src/it/apis-jar-wrapper-bundle/src/main/features/main.json
@@ -3,7 +3,7 @@
"bundles":[
{
"id":"io.wcm.osgi.wrapper:io.wcm.osgi.wrapper.gson:2.8.4-0000",
- "start-level":"4"
+ "start-order":"4"
}
],
"api-regions:JSON|false": [
diff --git a/src/it/apis-jar/src/main/features/main.json b/src/it/apis-jar/src/main/features/main.json
index 7bab2ab..9623b88 100644
--- a/src/it/apis-jar/src/main/features/main.json
+++ b/src/it/apis-jar/src/main/features/main.json
@@ -3,15 +3,15 @@
"bundles":[
{
"id":"org.apache.felix:org.apache.felix.inventory:1.0.6",
- "start-level":"5"
+ "start-order":"5"
},
{
"id":"org.apache.felix:org.apache.felix.metatype:1.2.2",
- "start-level":"4"
+ "start-order":"4"
},
{
"id":"org.apache.felix:org.apache.felix.scr:2.1.14",
- "start-level":"4"
+ "start-order":"4"
}
],
"api-regions:JSON|false": [
diff --git a/src/it/attach-metadata-from-pom/src/main/features/metadata-test.json b/src/it/attach-metadata-from-pom/src/main/features/metadata-test.json
index 1e8554c..81e7208 100644
--- a/src/it/attach-metadata-from-pom/src/main/features/metadata-test.json
+++ b/src/it/attach-metadata-from-pom/src/main/features/metadata-test.json
@@ -4,7 +4,7 @@
"bundles":[
{
"id":"org.osgi:org.osgi.framework:${osgi.framework.version}",
- "start-level":"20"
+ "start-order":"20"
}
]
}
diff --git a/src/it/variables-interpolator/src/main/features/interpolated-variables.json b/src/it/variables-interpolator/src/main/features/interpolated-variables.json
index 46e2702..ee97116 100644
--- a/src/it/variables-interpolator/src/main/features/interpolated-variables.json
+++ b/src/it/variables-interpolator/src/main/features/interpolated-variables.json
@@ -15,7 +15,7 @@
"bundles":[
{
"id":"org.osgi:org.osgi.framework:${osgi.framework.version}",
- "start-level":"20"
+ "start-order":"20"
}
]
}
diff --git a/src/test/resources/aggregate-features/dir/test_y.json b/src/test/resources/aggregate-features/dir/test_y.json
index 54d37bd..192ca6b 100644
--- a/src/test/resources/aggregate-features/dir/test_y.json
+++ b/src/test/resources/aggregate-features/dir/test_y.json
@@ -3,7 +3,7 @@
"bundles":[
{
"id":"org.apache.aries:org.apache.aries.util:1.1.3",
- "start-level":"20"
+ "start-order":"20"
}
]
}
diff --git a/src/test/resources/aggregate-features/dir2/test_y.json b/src/test/resources/aggregate-features/dir2/test_y.json
index 54d37bd..192ca6b 100644
--- a/src/test/resources/aggregate-features/dir2/test_y.json
+++ b/src/test/resources/aggregate-features/dir2/test_y.json
@@ -3,7 +3,7 @@
"bundles":[
{
"id":"org.apache.aries:org.apache.aries.util:1.1.3",
- "start-level":"20"
+ "start-order":"20"
}
]
}
diff --git a/src/test/resources/aggregate-features/dir3/test_y.json b/src/test/resources/aggregate-features/dir3/test_y.json
index 88f690e..3aa8110 100644
--- a/src/test/resources/aggregate-features/dir3/test_y.json
+++ b/src/test/resources/aggregate-features/dir3/test_y.json
@@ -3,7 +3,7 @@
"bundles":[
{
"id":"org.apache.aries:org.apache.aries.util:1.1.3",
- "start-level":"20"
+ "start-order":"20"
}
],
"extension1:JSON|false": [
diff --git a/src/test/resources/aggregate-features/test-aggregated-feature-example-runtime.json b/src/test/resources/aggregate-features/test-aggregated-feature-example-runtime.json
index 497cc18..1cf6273 100644
--- a/src/test/resources/aggregate-features/test-aggregated-feature-example-runtime.json
+++ b/src/test/resources/aggregate-features/test-aggregated-feature-example-runtime.json
@@ -7,7 +7,7 @@
"bundles":[
{
"id":"org.apache.aries:org.apache.aries.util:1.1.3",
- "start-level":"1"
+ "start-order":"1"
}
],
"framework-properties":{
@@ -22,4 +22,4 @@
"sling.jpms.java.xml":"{dollar}{sling.jre.java.xml},javax.xml.catalog;uses:=\"javax.xml.namespace\";version=\"1.0.0\"",
"sling.jre-1.8":",java.applet;version=\"{dollar}{felix.detect.java.version}\",java.awt;version=\"{dollar}{felix.detect.java.version}\",java.awt.color;version=\"{dollar}{felix.detect.java.version}\",java.awt.datatransfer;version=\"{dollar}{felix.detect.java.version}\",java.awt.dnd;version=\"{dollar}{felix.detect.java.version}\",java.awt.event;version=\"{dollar}{felix.detect.java.version}\",java.awt.font;version=\"{dollar}{felix.detect.java.version}\",java.awt.geom;version=\"{dollar}{felix.detect.java.version}\",java.awt.im;version=\"{dollar}{felix.detect.java.version}\",java.awt.im.spi;version=\"{dollar}{felix.detect.java.version}\",java.awt.image;version=\"{dollar}{felix.detect.java.version}\",java.awt.image.renderable;version=\"{dollar}{felix.detect.java.version}\",java.awt.print;version=\"{dollar}{felix.detect.java.version}\",java.beans;version=\"{dollar}{felix.detect.java.version}\",java.beans.beancontext;version=\"{dollar}{felix.detect.java.version}\",java.io;version=\"{dollar}{felix.detect.java.version}\",java.lang;version=\"{dollar}{felix.detect.java.version}\",java.lang.annotation;version=\"{dollar}{felix.detect.java.version}\",java.lang.instrument;version=\"{dollar}{felix.detect.java.version}\",java.lang.invoke;version=\"{dollar}{felix.detect.java.version}\",java.lang.management;version=\"{dollar}{felix.detect.java.version}\",java.lang.ref;version=\"{dollar}{felix.detect.java.version}\",java.lang.reflect;version=\"{dollar}{felix.detect.java.version}\",java.math;version=\"{dollar}{felix.detect.java.version}\",java.net;version=\"{dollar}{felix.detect.java.version}\",java.nio;version=\"{dollar}{felix.detect.java.version}\",java.nio.channels;version=\"{dollar}{felix.detect.java.version}\",java.nio.channels.spi;version=\"{dollar}{felix.detect.java.version}\",java.nio.charset;version=\"{dollar}{felix.detect.java.version}\",java.nio.charset.spi;version=\"{dollar}{felix.detect.java.version}\",java.nio.file;version=\"{dollar}{felix.detect.java.version}\",java.nio.file.attribute;version=\"{dollar}{felix.detect.java.version}\",java.nio.file.spi;version=\"{dollar}{felix.detect.java.version}\",java.rmi;version=\"{dollar}{felix.detect.java.version}\",java.rmi.activation;version=\"{dollar}{felix.detect.java.version}\",java.rmi.dgc;version=\"{dollar}{felix.detect.java.version}\",java.rmi.registry;version=\"{dollar}{felix.detect.java.version}\",java.rmi.server;version=\"{dollar}{felix.detect.java.version}\",java.security;version=\"{dollar}{felix.detect.java.version}\",java.security.acl;version=\"{dollar}{felix.detect.java.version}\",java.security.cert;version=\"{dollar}{felix.detect.java.version}\",java.security.interfaces;version=\"{dollar}{felix.detect.java.version}\",java.security.spec;version=\"{dollar}{felix.detect.java.version}\",java.sql;version=\"{dollar}{felix.detect.java.version}\",java.text;version=\"{dollar}{felix.detect.java.version}\",java.text.spi;version=\"{dollar}{felix.detect.java.version}\",java.time;version=\"{dollar}{felix.detect.java.version}\",java.time.chrono;version=\"{dollar}{felix.detect.java.version}\",java.time.format;version=\"{dollar}{felix.detect.java.version}\",java.time.temporal;version=\"{dollar}{felix.detect.java.version}\",java.time.zone;version=\"{dollar}{felix.detect.java.version}\",java.util;version=\"{dollar}{felix.detect.java.version}\",java.util.concurrent;version=\"{dollar}{felix.detect.java.version}\",java.util.concurrent.atomic;version=\"{dollar}{felix.detect.java.version}\",java.util.concurrent.locks;version=\"{dollar}{felix.detect.java.version}\",java.util.function;version=\"{dollar}{felix.detect.java.version}\",java.util.jar;version=\"{dollar}{felix.detect.java.version}\",java.util.logging;version=\"{dollar}{felix.detect.java.version}\",java.util.prefs;version=\"{dollar}{felix.detect.java.version}\",java.util.regex;version=\"{dollar}{felix.detect.java.version}\",java.util.spi;version=\"{dollar}{felix.detect.java.version}\",java.util.stream;version=\"{dollar}{felix.detect.java.version}\",java.util.zip;version=\"{dollar}{felix.detect.java.version}\",javax.accessibility;uses:=\"javax.swing.text\";version=\"{dollar}{felix.detect.java.version}\",javax.annotation.processing;uses:=\"javax.lang.model,javax.lang.model.element,javax.lang.model.util,javax.tools\";version=\"{dollar}{felix.detect.java.version}\",javax.crypto;uses:=\"javax.crypto.spec,javax.security.auth\";version=\"{dollar}{felix.detect.java.version}\",javax.crypto.interfaces;uses:=\"javax.crypto,javax.crypto.spec\";version=\"{dollar}{felix.detect.java.version}\",javax.crypto.spec;uses:=\"javax.crypto\";version=\"{dollar}{felix.detect.java.version}\",javax.imageio;uses:=\"javax.imageio.event,javax.imageio.metadata,javax.imageio.spi,javax.imageio.stream\";version=\"{dollar}{felix.detect.java.version}\",javax.imageio.event;uses:=\"javax.imageio\";version=\"{dollar}{felix.detect.java.version}\",javax.imageio.metadata;uses:=\"javax.imageio,org.w3c.dom\";version=\"{dollar}{felix.detect.java.version}\",javax.imageio.plugins.bmp;uses:=\"javax.imageio\";version=\"{dollar}{felix.detect.java.version}\",javax.imageio.plugins.jpeg;uses:=\"javax.imageio\";version=\"{dollar}{felix.detect.java.version}\",javax.imageio.spi;uses:=\"javax.imageio,javax.imageio.metadata,javax.imageio.stream\";version=\"{dollar}{felix.detect.java.version}\",javax.imageio.stream;uses:=\"javax.imageio\";version=\"{dollar}{felix.detect.java.version}\",javax.lang.model;uses:=\"javax.lang.model.element\";version=\"{dollar}{felix.detect.java.version}\",javax.lang.model.element;uses:=\"javax.lang.model,javax.lang.model.type\";version=\"{dollar}{felix.detect.java.version}\",javax.lang.model.type;uses:=\"javax.lang.model,javax.lang.model.element\";version=\"{dollar}{felix.detect.java.version}\",javax.lang.model.util;uses:=\"javax.annotation.processing,javax.lang.model,javax.lang.model.element,javax.lang.model.type\";version=\"{dollar}{felix.detect.java.version}\",javax.management;uses:=\"javax.management.loading,javax.management.openmbean\";version=\"{dollar}{felix.detect.java.version}\",javax.management.loading;uses:=\"javax.management\";version=\"{dollar}{felix.detect.java.version}\",javax.management.modelmbean;uses:=\"javax.management,javax.management.loading\";version=\"{dollar}{felix.detect.java.version}\",javax.management.monitor;uses:=\"javax.management\";version=\"{dollar}{felix.detect.java.version}\",javax.management.openmbean;uses:=\"javax.management\";version=\"{dollar}{felix.detect.java.version}\",javax.management.relation;uses:=\"javax.management\";version=\"{dollar}{felix.detect.java.version}\",javax.management.remote;uses:=\"javax.management,javax.security.auth\";version=\"{dollar}{felix.detect.java.version}\",javax.management.remote.rmi;uses:=\"javax.management,javax.management.loading,javax.management.remote,javax.naming,javax.rmi,javax.rmi.CORBA,javax.rmi.ssl,javax.security.auth,org.omg.CORBA,org.omg.CORBA.portable,org.omg.CORBA_2_3.portable\";version=\"{dollar}{felix.detect.java.version}\",javax.management.timer;uses:=\"javax.management\";version=\"{dollar}{felix.detect.java.version}\",javax.naming;uses:=\"javax.naming.spi\";version=\"{dollar}{felix.detect.java.version}\",javax.naming.directory;uses:=\"javax.naming\";version=\"{dollar}{felix.detect.java.version}\",javax.naming.event;uses:=\"javax.naming,javax.naming.directory\";version=\"{dollar}{felix.detect.java.version}\",javax.naming.ldap;uses:=\"javax.naming,javax.naming.directory,javax.naming.event,javax.net.ssl\";version=\"{dollar}{felix.detect.java.version}\",javax.naming.spi;uses:=\"javax.naming,javax.naming.directory\";version=\"{dollar}{felix.detect.java.version}\",javax.net;version=\"{dollar}{felix.detect.java.version}\",javax.net.ssl;uses:=\"javax.net,javax.security.auth.x500,javax.security.cert\";version=\"{dollar}{felix.detect.java.version}\",javax.print;uses:=\"javax.print.attribute,javax.print.attribute.standard,javax.print.event\";version=\"{dollar}{felix.detect.java.version}\",javax.print.attribute;version=\"{dollar}{felix.detect.java.version}\",javax.print.attribute.standard;uses:=\"javax.print.attribute\";version=\"{dollar}{felix.detect.java.version}\",javax.print.event;uses:=\"javax.print,javax.print.attribute\";version=\"{dollar}{felix.detect.java.version}\",javax.rmi.ssl;uses:=\"javax.net,javax.net.ssl\";version=\"{dollar}{felix.detect.java.version}\",javax.script;version=\"{dollar}{felix.detect.java.version}\",javax.security.auth;version=\"{dollar}{felix.detect.java.version}\",javax.security.auth.callback;version=\"{dollar}{felix.detect.java.version}\",javax.security.auth.kerberos;uses:=\"javax.crypto,javax.security.auth\";version=\"{dollar}{felix.detect.java.version}\",javax.security.auth.login;uses:=\"javax.security.auth,javax.security.auth.callback\";version=\"{dollar}{felix.detect.java.version}\",javax.security.auth.spi;uses:=\"javax.security.auth,javax.security.auth.callback,javax.security.auth.login\";version=\"{dollar}{felix.detect.java.version}\",javax.security.auth.x500;uses:=\"javax.security.auth\";version=\"{dollar}{felix.detect.java.version}\",javax.security.cert;version=\"{dollar}{felix.detect.java.version}\",javax.security.sasl;uses:=\"javax.security.auth.callback\";version=\"{dollar}{felix.detect.java.version}\",javax.sound.midi;uses:=\"javax.sound.midi.spi\";version=\"{dollar}{felix.detect.java.version}\",javax.sound.midi.spi;uses:=\"javax.sound.midi\";version=\"{dollar}{felix.detect.java.version}\",javax.sound.sampled;uses:=\"javax.sound.sampled.spi\";version=\"{dollar}{felix.detect.java.version}\",javax.sound.sampled.spi;uses:=\"javax.sound.sampled\";version=\"{dollar}{felix.detect.java.version}\",javax.sql;uses:=\"javax.transaction.xa\";version=\"{dollar}{felix.detect.java.version}\",javax.sql.rowset;uses:=\"javax.sql,javax.sql.rowset.serial,javax.sql.rowset.spi\";version=\"{dollar}{felix.detect.java.version}\",javax.sql.rowset.serial;uses:=\"javax.sql.rowset\";version=\"{dollar}{felix.detect.java.version}\",javax.sql.rowset.spi;uses:=\"javax.naming,javax.sql,javax.sql.rowset\";version=\"{dollar}{felix.detect.java.version}\",javax.swing;uses:=\"javax.accessibility,javax.print,javax.print.attribute,javax.swing.border,javax.swing.colorchooser,javax.swing.event,javax.swing.filechooser,javax.swing.plaf,javax.swing.plaf.basic,javax.swing.plaf.metal,javax.swing.table,javax.swing.text,javax.swing.text.html,javax.swing.tree\";version=\"{dollar}{felix.detect.java.version}\",javax.swing.border;uses:=\"javax.swing\";version=\"{dollar}{felix.detect.java.version}\",javax.swing.colorchooser;uses:=\"javax.accessibility,javax.swing,javax.swing.border,javax.swing.event,javax.swing.text\";version=\"{dollar}{felix.detect.java.version}\",javax.swing.event;uses:=\"javax.swing,javax.swing.table,javax.swing.text,javax.swing.tree,javax.swing.undo\";version=\"{dollar}{felix.detect.java.version}\",javax.swing.filechooser;uses:=\"javax.swing\";version=\"{dollar}{felix.detect.java.version}\",javax.swing.plaf;uses:=\"javax.accessibility,javax.swing,javax.swing.border,javax.swing.filechooser,javax.swing.text,javax.swing.tree\";version=\"{dollar}{felix.detect.java.version}\",javax.swing.plaf.basic;uses:=\"javax.accessibility,javax.sound.sampled,javax.swing,javax.swing.border,javax.swing.colorchooser,javax.swing.event,javax.swing.filechooser,javax.swing.plaf,javax.swing.plaf.synth,javax.swing.table,javax.swing.text,javax.swing.text.html,javax.swing.tree\";version=\"{dollar}{felix.detect.java.version}\",javax.swing.plaf.metal;uses:=\"javax.swing,javax.swing.border,javax.swing.event,javax.swing.filechooser,javax.swing.plaf,javax.swing.plaf.basic,javax.swing.text,javax.swing.tree\";version=\"{dollar}{felix.detect.java.version}\",javax.swing.plaf.multi;uses:=\"javax.accessibility,javax.swing,javax.swing.filechooser,javax.swing.plaf,javax.swing.text,javax.swing.tree\";version=\"{dollar}{felix.detect.java.version}\",javax.swing.plaf.nimbus;uses:=\"javax.swing,javax.swing.border,javax.swing.plaf,javax.swing.plaf.synth\";version=\"{dollar}{felix.detect.java.version}\",javax.swing.plaf.synth;uses:=\"javax.swing,javax.swing.border,javax.swing.colorchooser,javax.swing.event,javax.swing.plaf,javax.swing.plaf.basic,javax.swing.table,javax.swing.text,javax.swing.tree,javax.xml.parsers,org.xml.sax,org.xml.sax.helpers\";version=\"{dollar}{felix.detect.java.version}\",javax.swing.table;uses:=\"javax.accessibility,javax.swing,javax.swing.border,javax.swing.event,javax.swing.plaf\";version=\"{dollar}{felix.detect.java.version}\",javax.swing.text;uses:=\"javax.accessibility,javax.print,javax.print.attribute,javax.swing,javax.swing.event,javax.swing.plaf,javax.swing.plaf.basic,javax.swing.text.html,javax.swing.tree,javax.swing.undo\";version=\"{dollar}{felix.detect.java.version}\",javax.swing.text.html;uses:=\"javax.accessibility,javax.swing,javax.swing.border,javax.swing.event,javax.swing.plaf,javax.swing.text,javax.swing.undo\";version=\"{dollar}{felix.detect.java.version}\",javax.swing.text.html.parser;uses:=\"javax.swing.text,javax.swing.text.html\";version=\"{dollar}{felix.detect.java.version}\",javax.swing.text.rtf;uses:=\"javax.swing.text\";version=\"{dollar}{felix.detect.java.version}\",javax.swing.tree;uses:=\"javax.swing,javax.swing.border,javax.swing.event,javax.swing.plaf,javax.swing.plaf.basic\";version=\"{dollar}{felix.detect.java.version}\",javax.swing.undo;uses:=\"javax.swing,javax.swing.event\";version=\"{dollar}{felix.detect.java.version}\",javax.tools;uses:=\"javax.annotation.processing,javax.lang.model,javax.lang.model.element\";version=\"{dollar}{felix.detect.java.version}\",javax.transaction.xa;version=\"{dollar}{felix.detect.java.version}\",org.ietf.jgss;version=\"{dollar}{felix.detect.java.version}\"{dollar}{sling.jre.java.xml},javax.xml.crypto;uses:=\"javax.xml.crypto.dsig.keyinfo\";version=\"{dollar}{felix.detect.java.version}\",javax.xml.crypto.dom;uses:=\"javax.xml.crypto,org.w3c.dom\";version=\"{dollar}{felix.detect.java.version}\",javax.xml.crypto.dsig;uses:=\"javax.xml.crypto,javax.xml.crypto.dsig.keyinfo,javax.xml.crypto.dsig.spec\";version=\"{dollar}{felix.detect.java.version}\",javax.xml.crypto.dsig.dom;uses:=\"javax.xml.crypto,javax.xml.crypto.dom,javax.xml.crypto.dsig,org.w3c.dom\";version=\"{dollar}{felix.detect.java.version}\",javax.xml.crypto.dsig.keyinfo;uses:=\"javax.xml.crypto\";version=\"{dollar}{felix.detect.java.version}\",javax.xml.crypto.dsig.spec;uses:=\"javax.xml.crypto\";version=\"{dollar}{felix.detect.java.version}\""
}
-}
\ No newline at end of file
+}
diff --git a/src/test/resources/aggregate-features/test_x.json b/src/test/resources/aggregate-features/test_x.json
index 9edfa19..5f1bdfa 100644
--- a/src/test/resources/aggregate-features/test_x.json
+++ b/src/test/resources/aggregate-features/test_x.json
@@ -3,7 +3,7 @@
"bundles":[
{
"id":"mygroup:org.apache.aries.util:1.1.3",
- "start-level":"20"
+ "start-order":"20"
}
]
}
diff --git a/src/test/resources/attach-resources/features/processed/test_a.json b/src/test/resources/attach-resources/features/processed/test_a.json
index c16ba64..b7f2ecf 100644
--- a/src/test/resources/attach-resources/features/processed/test_a.json
+++ b/src/test/resources/attach-resources/features/processed/test_a.json
@@ -3,7 +3,7 @@
"bundles":[
{
"id":"org.apache.aries:org.apache.aries.util:1.1.3",
- "start-level":"20"
+ "start-order":"20"
}
]
}
