This is an automated email from the ASF dual-hosted git repository. alien11689 pushed a commit to branch run-idverifier-on-felix in repository https://gitbox.apache.org/repos/asf/aries.git
commit dcc67bef9062a2e27f0ec2040adc9d721d5d3187 Author: Dominik Przybysz <[email protected]> AuthorDate: Fri Feb 21 20:15:12 2025 +0100 [MAINTENANCE] Setup felix and pax-logging in idverifier --- .../filtered-resources/configuration/config.ini | 4 +- .../filtered-resources/configuration/config.ini | 4 +- .../filtered-resources/configuration/config.ini | 4 +- .../main/filtered-resources/conf/config.properties | 622 ++++++--------------- .../idverifier-assembly/src/main/resources/run.bat | 2 +- .../idverifier-assembly/src/main/resources/run.sh | 2 +- samples/pom.xml | 20 +- 7 files changed, 199 insertions(+), 459 deletions(-) diff --git a/samples/ariestrader/assemblies/equinox-test-harness/src/main/filtered-resources/configuration/config.ini b/samples/ariestrader/assemblies/equinox-test-harness/src/main/filtered-resources/configuration/config.ini index d9f683ecd..cc7c3054e 100644 --- a/samples/ariestrader/assemblies/equinox-test-harness/src/main/filtered-resources/configuration/config.ini +++ b/samples/ariestrader/assemblies/equinox-test-harness/src/main/filtered-resources/configuration/config.ini @@ -19,8 +19,8 @@ osgi.bundles=\ cm-${cmVersion}.jar@start,\ services-${servicesVersion}.jar@start,\ asm-all-${asmVersion}.jar@start,\ -pax-logging-api-${paxLoggingApiVersion}.jar@start,\ -pax-logging-service-${paxLoggingServiceVersion}.jar@start,\ +pax-logging-api-${pax-logging.version}.jar@start,\ +pax-logging-service-${pax-logging.version}.jar@start,\ derby-${derbyVersion}.jar@start,\ commons-collections-${commonsCollectionsVersion}.jar@start,\ commons-lang-${commonsLangVersion}.jar@start,\ diff --git a/samples/blog/blog-assembly/src/main/filtered-resources/configuration/config.ini b/samples/blog/blog-assembly/src/main/filtered-resources/configuration/config.ini index ef0d144b7..18326904e 100644 --- a/samples/blog/blog-assembly/src/main/filtered-resources/configuration/config.ini +++ b/samples/blog/blog-assembly/src/main/filtered-resources/configuration/config.ini @@ -19,8 +19,8 @@ osgi.bundles=\ cm-${cmVersion}@start,\ services-${servicesVersion}.jar@start,\ asm-all-${asmVersion}.jar@start,\ -pax-logging-api-${paxLoggingApiVersion}.jar@start,\ -pax-logging-service-${paxLoggingServiceVersion}.jar@start,\ +pax-logging-api-${pax-logging.version}.jar@start,\ +pax-logging-service-${pax-logging.version}.jar@start,\ derby-${derbyVersion}.jar@start,\ pax-web-jetty-bundle-${paxWebJettyBundleVersion}.jar@start,\ pax-web-extender-war-${paxWebExtenderWarVersion}.jar@start,\ diff --git a/samples/blueprint/helloworld/helloworld-assembly/src/main/filtered-resources/configuration/config.ini b/samples/blueprint/helloworld/helloworld-assembly/src/main/filtered-resources/configuration/config.ini index 95c4a13de..1b97b3174 100644 --- a/samples/blueprint/helloworld/helloworld-assembly/src/main/filtered-resources/configuration/config.ini +++ b/samples/blueprint/helloworld/helloworld-assembly/src/main/filtered-resources/configuration/config.ini @@ -18,8 +18,8 @@ osgi.bundles=\ cm-${cmVersion}@start,\ services-${servicesVersion}@start,\ -pax-logging-api-${paxLoggingApiVersion}.jar@start,\ -pax-logging-service-${paxLoggingServiceVersion}.jar@start,\ +pax-logging-api-${pax-logging.version}.jar@start,\ +pax-logging-service-${pax-logging.version}.jar@start,\ asm-all-${asmVersion}.jar@start,\ org.apache.aries.proxy-${ariesProxyVersion}.jar@start,\ org.apache.aries.util-${ariesUtilVersion}.jar@start,\ diff --git a/samples/blueprint/idverifier/idverifier-assembly/src/main/filtered-resources/conf/config.properties b/samples/blueprint/idverifier/idverifier-assembly/src/main/filtered-resources/conf/config.properties index 455a2c3de..6e5f48e76 100644 --- a/samples/blueprint/idverifier/idverifier-assembly/src/main/filtered-resources/conf/config.properties +++ b/samples/blueprint/idverifier/idverifier-assembly/src/main/filtered-resources/conf/config.properties @@ -19,452 +19,180 @@ ############################## # Felix settings ############################## -org.osgi.framework.storage=./cache/ -org.osgi.framework.startlevel.beginning=10 -felix.startlevel.bundle=10 -org.osgi.framework.storage.clean=onFirstInit -org.osgi.framework.executionenvironment=J2SE-1.2,J2SE-1.3,J2SE-1.4,J2SE-1.5,JRE-1.1,JavaSE-1.6,OSGi/Minimum-1.0,OSGi/Minimum-1.1,OSGi/Minimum-1.2 -org.osgi.framework.system.packages=org.osgi.framework; version=1.5.0, \ - org.osgi.framework.launch; version=1.0.0, \ - org.osgi.framework.hooks.service; version=1.0.0, \ - org.osgi.service.packageadmin; version=1.2.0, \ - org.osgi.service.startlevel; version=1.1.0, \ - org.osgi.service.url; version=1.0.0, \ - org.osgi.util.tracker; version=1.4.0 \ - ${jre-${java.specification.version}} +#org.osgi.framework.storage=./cache/ +#org.osgi.framework.startlevel.beginning=10 +#felix.startlevel.bundle=10 +#org.osgi.framework.storage.clean=onFirstInit +#org.osgi.framework.executionenvironment=J2SE-1.2,J2SE-1.3,J2SE-1.4,J2SE-1.5,JRE-1.1,JavaSE-1.6,OSGi/Minimum-1.0,OSGi/Minimum-1.1,OSGi/Minimum-1.2 +#org.osgi.framework.system.packages=org.osgi.framework; version=1.5.0, \ +# org.osgi.framework.launch; version=1.0.0, \ +# org.osgi.framework.hooks.service; version=1.0.0, \ +# org.osgi.service.packageadmin; version=1.2.0, \ +# org.osgi.service.startlevel; version=1.1.0, \ +# org.osgi.service.url; version=1.0.0, \ +# org.osgi.util.tracker; version=1.4.0 \ +# ${jre-${java.specification.version}} -# -# Java platform package export properties. -# -jre-1.3=, \ - javax.accessibility; \ - javax.naming; \ - javax.naming.directory; \ - javax.naming.event; \ - javax.naming.ldap; \ - javax.naming.spi; \ - javax.rmi; \ - javax.rmi.CORBA; \ - javax.sound.midi; \ - javax.sound.midi.spi; \ - javax.sound.sampled; \ - javax.sound.sampled.spi; \ - javax.swing; \ - 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.plaf.multi; \ - javax.swing.table; \ - javax.swing.text; \ - javax.swing.text.html; \ - javax.swing.text.html.parser; \ - javax.swing.text.rtf; \ - javax.swing.tree; \ - javax.swing.undo; \ - javax.transaction; \ - org.omg.CORBA; \ - org.omg.CORBA_2_3; \ - org.omg.CORBA_2_3.portable; \ - org.omg.CORBA.DynAnyPackage; \ - org.omg.CORBA.ORBPackage; \ - org.omg.CORBA.portable; \ - org.omg.CORBA.TypeCodePackage; \ - org.omg.CosNaming; \ - org.omg.CosNaming.NamingContextPackage; \ - org.omg.SendingContext; \ - org.omg.stub.java.rmi; \ - version="1.3.0" - -jre-1.4=, \ - javax.accessibility; \ - javax.crypto; \ - javax.crypto.interfaces; \ - javax.crypto.spec; \ - javax.imageio; \ - javax.imageio.event; \ - javax.imageio.metadata; \ - javax.imageio.plugins.jpeg; \ - javax.imageio.spi; \ - javax.imageio.stream; \ - javax.naming; \ - javax.naming.directory; \ - javax.naming.event; \ - javax.naming.ldap; \ - javax.naming.spi; \ - javax.net; \ - javax.net.ssl; \ - javax.print; \ - javax.print.attribute; \ - javax.print.attribute.standard; \ - javax.print.event; \ - javax.rmi; \ - javax.rmi.CORBA; \ - javax.security.auth; \ - javax.security.auth.callback; \ - javax.security.auth.kerberos; \ - javax.security.auth.login; \ - javax.security.auth.spi; \ - javax.security.auth.x500; \ - javax.security.cert; \ - javax.sound.midi; \ - javax.sound.midi.spi; \ - javax.sound.sampled; \ - javax.sound.sampled.spi; \ - javax.sql; \ - javax.swing; \ - 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.plaf.multi; \ - javax.swing.table; \ - javax.swing.text; \ - javax.swing.text.html; \ - javax.swing.text.html.parser; \ - javax.swing.text.rtf; \ - javax.swing.tree; \ - javax.swing.undo; \ - javax.transaction; \ - javax.transaction.xa; \ - javax.xml.parsers; \ - javax.xml.transform; \ - javax.xml.transform.dom; \ - javax.xml.transform.sax; \ - javax.xml.transform.stream; \ - org.ietf.jgss; \ - org.omg.CORBA; \ - org.omg.CORBA_2_3; \ - org.omg.CORBA_2_3.portable; \ - org.omg.CORBA.DynAnyPackage; \ - org.omg.CORBA.ORBPackage; \ - org.omg.CORBA.portable; \ - org.omg.CORBA.TypeCodePackage; \ - org.omg.CosNaming; \ - org.omg.CosNaming.NamingContextExtPackage; \ - org.omg.CosNaming.NamingContextPackage; \ - org.omg.Dynamic; \ - org.omg.DynamicAny; \ - org.omg.DynamicAny.DynAnyFactoryPackage; \ - org.omg.DynamicAny.DynAnyPackage; \ - org.omg.IOP; \ - org.omg.IOP.CodecFactoryPackage; \ - org.omg.IOP.CodecPackage; \ - org.omg.Messaging; \ - org.omg.PortableInterceptor; \ - org.omg.PortableInterceptor.ORBInitInfoPackage; \ - org.omg.PortableServer; \ - org.omg.PortableServer.CurrentPackage; \ - org.omg.PortableServer.POAManagerPackage; \ - org.omg.PortableServer.POAPackage; \ - org.omg.PortableServer.portable; \ - org.omg.PortableServer.ServantLocatorPackage; \ - org.omg.SendingContext; \ - org.omg.stub.java.rmi; \ - org.w3c.dom; \ - org.w3c.dom.css; \ - org.w3c.dom.events; \ - org.w3c.dom.html; \ - org.w3c.dom.stylesheets; \ - org.w3c.dom.traversal; \ - org.w3c.dom.views; \ - org.xml.sax; \ - org.xml.sax.ext; \ - org.xml.sax.helpers; \ - version="1.4.0" - -jre-1.5=, \ - javax.accessibility; \ - javax.activity; \ - javax.crypto; \ - javax.crypto.interfaces; \ - javax.crypto.spec; \ - javax.imageio; \ - javax.imageio.event; \ - javax.imageio.metadata; \ - javax.imageio.plugins.bmp; \ - javax.imageio.plugins.jpeg; \ - javax.imageio.spi; \ - javax.imageio.stream; \ - javax.management; \ - javax.management.loading; \ - javax.management.modelmbean; \ - javax.management.monitor; \ - javax.management.openmbean; \ - javax.management.relation; \ - javax.management.remote; \ - javax.management.remote.rmi; \ - javax.management.timer; \ - javax.naming; \ - javax.naming.directory; \ - javax.naming.event; \ - javax.naming.ldap; \ - javax.naming.spi; \ - javax.net; \ - javax.net.ssl; \ - javax.print; \ - javax.print.attribute; \ - javax.print.attribute.standard; \ - javax.print.event; \ - javax.rmi; \ - javax.rmi.CORBA; \ - javax.rmi.ssl; \ - javax.security.auth; \ - javax.security.auth.callback; \ - javax.security.auth.kerberos; \ - javax.security.auth.login; \ - javax.security.auth.spi; \ - javax.security.auth.x500; \ - javax.security.cert; \ - javax.security.sasl; \ - javax.sound.midi; \ - javax.sound.midi.spi; \ - javax.sound.sampled; \ - javax.sound.sampled.spi; \ - javax.sql; \ - javax.sql.rowset; \ - javax.sql.rowset.serial; \ - javax.sql.rowset.spi; \ - javax.swing; \ - 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.plaf.multi; \ - javax.swing.plaf.synth; \ - javax.swing.table; \ - javax.swing.text; \ - javax.swing.text.html; \ - javax.swing.text.html.parser; \ - javax.swing.text.rtf; \ - javax.swing.tree; \ - javax.swing.undo; \ - javax.transaction; \ - javax.transaction.xa; \ - javax.xml; \ - javax.xml.datatype; \ - javax.xml.namespace; \ - javax.xml.parsers; \ - javax.xml.transform; \ - javax.xml.transform.dom; \ - javax.xml.transform.sax; \ - javax.xml.transform.stream; \ - javax.xml.validation; \ - javax.xml.xpath; \ - org.ietf.jgss; \ - org.omg.CORBA; \ - org.omg.CORBA_2_3; \ - org.omg.CORBA_2_3.portable; \ - org.omg.CORBA.DynAnyPackage; \ - org.omg.CORBA.ORBPackage; \ - org.omg.CORBA.portable; \ - org.omg.CORBA.TypeCodePackage; \ - org.omg.CosNaming; \ - org.omg.CosNaming.NamingContextExtPackage; \ - org.omg.CosNaming.NamingContextPackage; \ - org.omg.Dynamic; \ - org.omg.DynamicAny; \ - org.omg.DynamicAny.DynAnyFactoryPackage; \ - org.omg.DynamicAny.DynAnyPackage; \ - org.omg.IOP; \ - org.omg.IOP.CodecFactoryPackage; \ - org.omg.IOP.CodecPackage; \ - org.omg.Messaging; \ - org.omg.PortableInterceptor; \ - org.omg.PortableInterceptor.ORBInitInfoPackage; \ - org.omg.PortableServer; \ - org.omg.PortableServer.CurrentPackage; \ - org.omg.PortableServer.POAManagerPackage; \ - org.omg.PortableServer.POAPackage; \ - org.omg.PortableServer.portable; \ - org.omg.PortableServer.ServantLocatorPackage; \ - org.omg.SendingContext; \ - org.omg.stub.java.rmi; \ - org.omg.stub.javax.management.remote.rmi; \ - org.w3c.dom; \ - org.w3c.dom.bootstrap; \ - org.w3c.dom.css; \ - org.w3c.dom.events; \ - org.w3c.dom.html; \ - org.w3c.dom.ls; \ - org.w3c.dom.ranges; \ - org.w3c.dom.stylesheets; \ - org.w3c.dom.traversal; \ - org.w3c.dom.views; \ - org.xml.sax; \ - org.xml.sax.ext; \ - org.xml.sax.helpers; \ - version="1.5.0" - -jre-1.6=, \ - javax.accessibility; \ - javax.activation; \ - javax.activity; \ - javax.annotation; \ - javax.annotation.processing; \ - javax.crypto; \ - javax.crypto.interfaces; \ - javax.crypto.spec; \ - javax.imageio; \ - javax.imageio.event; \ - javax.imageio.metadata; \ - javax.imageio.plugins.bmp; \ - javax.imageio.plugins.jpeg; \ - javax.imageio.spi; \ - javax.imageio.stream; \ - javax.jws; \ - javax.jws.soap; \ - javax.lang.model; \ - javax.lang.model.element; \ - javax.lang.model.type; \ - javax.lang.model.util; \ - javax.management; \ - javax.management.loading; \ - javax.management.modelmbean; \ - javax.management.monitor; \ - javax.management.openmbean; \ - javax.management.relation; \ - javax.management.remote; \ - javax.management.remote.rmi; \ - javax.management.timer; \ - javax.naming; \ - javax.naming.directory; \ - javax.naming.event; \ - javax.naming.ldap; \ - javax.naming.spi; \ - javax.net; \ - javax.net.ssl; \ - javax.print; \ - javax.print.attribute; \ - javax.print.attribute.standard; \ - javax.print.event; \ - javax.rmi; \ - javax.rmi.CORBA; \ - javax.rmi.ssl; \ - javax.script; \ - javax.security.auth; \ - javax.security.auth.callback; \ - javax.security.auth.kerberos; \ - javax.security.auth.login; \ - javax.security.auth.spi; \ - javax.security.auth.x500; \ - javax.security.cert; \ - javax.security.sasl; \ - javax.sound.midi; \ - javax.sound.midi.spi; \ - javax.sound.sampled; \ - javax.sound.sampled.spi; \ - javax.sql; \ - javax.sql.rowset; \ - javax.sql.rowset.serial; \ - javax.sql.rowset.spi; \ - javax.swing; \ - 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.plaf.multi; \ - javax.swing.plaf.synth; \ - javax.swing.table; \ - javax.swing.text; \ - javax.swing.text.html; \ - javax.swing.text.html.parser; \ - javax.swing.text.rtf; \ - javax.swing.tree; \ - javax.swing.undo; \ - javax.tools; \ - javax.transaction; \ - javax.transaction.xa; \ - javax.xml; \ - javax.xml.bind; \ - javax.xml.bind.annotation; \ - javax.xml.bind.annotation.adapters; \ - javax.xml.bind.attachment; \ - javax.xml.bind.helpers; \ - javax.xml.bind.util; \ - javax.xml.crypto; \ - javax.xml.crypto.dom; \ - javax.xml.crypto.dsig; \ - javax.xml.crypto.dsig.dom; \ - javax.xml.crypto.dsig.keyinfo; \ - javax.xml.crypto.dsig.spec; \ - javax.xml.datatype; \ - javax.xml.namespace; \ - javax.xml.parsers; \ - javax.xml.soap; \ - javax.xml.stream; \ - javax.xml.stream.events; \ - javax.xml.stream.util; \ - javax.xml.transform; \ - javax.xml.transform.dom; \ - javax.xml.transform.sax; \ - javax.xml.transform.stax; \ - javax.xml.transform.stream; \ - javax.xml.validation; \ - javax.xml.ws; \ - javax.xml.ws.handler; \ - javax.xml.ws.handler.soap; \ - javax.xml.ws.http; \ - javax.xml.ws.soap; \ - javax.xml.ws.spi; \ - javax.xml.xpath; \ - org.ietf.jgss; \ - org.omg.CORBA; \ - org.omg.CORBA_2_3; \ - org.omg.CORBA_2_3.portable; \ - org.omg.CORBA.DynAnyPackage; \ - org.omg.CORBA.ORBPackage; \ - org.omg.CORBA.portable; \ - org.omg.CORBA.TypeCodePackage; \ - org.omg.CosNaming; \ - org.omg.CosNaming.NamingContextExtPackage; \ - org.omg.CosNaming.NamingContextPackage; \ - org.omg.Dynamic; \ - org.omg.DynamicAny; \ - org.omg.DynamicAny.DynAnyFactoryPackage; \ - org.omg.DynamicAny.DynAnyPackage; \ - org.omg.IOP; \ - org.omg.IOP.CodecFactoryPackage; \ - org.omg.IOP.CodecPackage; \ - org.omg.Messaging; \ - org.omg.PortableInterceptor; \ - org.omg.PortableInterceptor.ORBInitInfoPackage; \ - org.omg.PortableServer; \ - org.omg.PortableServer.CurrentPackage; \ - org.omg.PortableServer.POAManagerPackage; \ - org.omg.PortableServer.POAPackage; \ - org.omg.PortableServer.portable; \ - org.omg.PortableServer.ServantLocatorPackage; \ - org.omg.SendingContext; \ - org.omg.stub.java.rmi; \ - org.omg.stub.javax.management.remote.rmi; \ - org.w3c.dom; \ - org.w3c.dom.bootstrap; \ - org.w3c.dom.css; \ - org.w3c.dom.events; \ - org.w3c.dom.html; \ - org.w3c.dom.ls; \ - org.w3c.dom.ranges; \ - org.w3c.dom.stylesheets; \ - org.w3c.dom.traversal; \ - org.w3c.dom.views; \ - org.w3c.dom.xpath; \ - org.xml.sax; \ - org.xml.sax.ext; \ - org.xml.sax.helpers; \ - version=\"1.6.0\" +#jre-1.6=, \ +# javax.accessibility; \ +# javax.activation; \ +# javax.activity; \ +# javax.annotation; \ +# javax.annotation.processing; \ +# javax.crypto; \ +# javax.crypto.interfaces; \ +# javax.crypto.spec; \ +# javax.imageio; \ +# javax.imageio.event; \ +# javax.imageio.metadata; \ +# javax.imageio.plugins.bmp; \ +# javax.imageio.plugins.jpeg; \ +# javax.imageio.spi; \ +# javax.imageio.stream; \ +# javax.jws; \ +# javax.jws.soap; \ +# javax.lang.model; \ +# javax.lang.model.element; \ +# javax.lang.model.type; \ +# javax.lang.model.util; \ +# javax.management; \ +# javax.management.loading; \ +# javax.management.modelmbean; \ +# javax.management.monitor; \ +# javax.management.openmbean; \ +# javax.management.relation; \ +# javax.management.remote; \ +# javax.management.remote.rmi; \ +# javax.management.timer; \ +# javax.naming; \ +# javax.naming.directory; \ +# javax.naming.event; \ +# javax.naming.ldap; \ +# javax.naming.spi; \ +# javax.net; \ +# javax.net.ssl; \ +# javax.print; \ +# javax.print.attribute; \ +# javax.print.attribute.standard; \ +# javax.print.event; \ +# javax.rmi; \ +# javax.rmi.CORBA; \ +# javax.rmi.ssl; \ +# javax.script; \ +# javax.security.auth; \ +# javax.security.auth.callback; \ +# javax.security.auth.kerberos; \ +# javax.security.auth.login; \ +# javax.security.auth.spi; \ +# javax.security.auth.x500; \ +# javax.security.cert; \ +# javax.security.sasl; \ +# javax.sound.midi; \ +# javax.sound.midi.spi; \ +# javax.sound.sampled; \ +# javax.sound.sampled.spi; \ +# javax.sql; \ +# javax.sql.rowset; \ +# javax.sql.rowset.serial; \ +# javax.sql.rowset.spi; \ +# javax.swing; \ +# 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.plaf.multi; \ +# javax.swing.plaf.synth; \ +# javax.swing.table; \ +# javax.swing.text; \ +# javax.swing.text.html; \ +# javax.swing.text.html.parser; \ +# javax.swing.text.rtf; \ +# javax.swing.tree; \ +# javax.swing.undo; \ +# javax.tools; \ +# javax.transaction; \ +# javax.transaction.xa; \ +# javax.xml; \ +# javax.xml.bind; \ +# javax.xml.bind.annotation; \ +# javax.xml.bind.annotation.adapters; \ +# javax.xml.bind.attachment; \ +# javax.xml.bind.helpers; \ +# javax.xml.bind.util; \ +# javax.xml.crypto; \ +# javax.xml.crypto.dom; \ +# javax.xml.crypto.dsig; \ +# javax.xml.crypto.dsig.dom; \ +# javax.xml.crypto.dsig.keyinfo; \ +# javax.xml.crypto.dsig.spec; \ +# javax.xml.datatype; \ +# javax.xml.namespace; \ +# javax.xml.parsers; \ +# javax.xml.soap; \ +# javax.xml.stream; \ +# javax.xml.stream.events; \ +# javax.xml.stream.util; \ +# javax.xml.transform; \ +# javax.xml.transform.dom; \ +# javax.xml.transform.sax; \ +# javax.xml.transform.stax; \ +# javax.xml.transform.stream; \ +# javax.xml.validation; \ +# javax.xml.ws; \ +# javax.xml.ws.handler; \ +# javax.xml.ws.handler.soap; \ +# javax.xml.ws.http; \ +# javax.xml.ws.soap; \ +# javax.xml.ws.spi; \ +# javax.xml.xpath; \ +# org.ietf.jgss; \ +# org.omg.CORBA; \ +# org.omg.CORBA_2_3; \ +# org.omg.CORBA_2_3.portable; \ +# org.omg.CORBA.DynAnyPackage; \ +# org.omg.CORBA.ORBPackage; \ +# org.omg.CORBA.portable; \ +# org.omg.CORBA.TypeCodePackage; \ +# org.omg.CosNaming; \ +# org.omg.CosNaming.NamingContextExtPackage; \ +# org.omg.CosNaming.NamingContextPackage; \ +# org.omg.Dynamic; \ +# org.omg.DynamicAny; \ +# org.omg.DynamicAny.DynAnyFactoryPackage; \ +# org.omg.DynamicAny.DynAnyPackage; \ +# org.omg.IOP; \ +# org.omg.IOP.CodecFactoryPackage; \ +# org.omg.IOP.CodecPackage; \ +# org.omg.Messaging; \ +# org.omg.PortableInterceptor; \ +# org.omg.PortableInterceptor.ORBInitInfoPackage; \ +# org.omg.PortableServer; \ +# org.omg.PortableServer.CurrentPackage; \ +# org.omg.PortableServer.POAManagerPackage; \ +# org.omg.PortableServer.POAPackage; \ +# org.omg.PortableServer.portable; \ +# org.omg.PortableServer.ServantLocatorPackage; \ +# org.omg.SendingContext; \ +# org.omg.stub.java.rmi; \ +# org.omg.stub.javax.management.remote.rmi; \ +# org.w3c.dom; \ +# org.w3c.dom.bootstrap; \ +# org.w3c.dom.css; \ +# org.w3c.dom.events; \ +# org.w3c.dom.html; \ +# org.w3c.dom.ls; \ +# org.w3c.dom.ranges; \ +# org.w3c.dom.stylesheets; \ +# org.w3c.dom.traversal; \ +# org.w3c.dom.views; \ +# org.w3c.dom.xpath; \ +# org.xml.sax; \ +# org.xml.sax.ext; \ +# org.xml.sax.helpers; \ +# version=\"1.6.0\" ############################## # Log setting @@ -478,8 +206,8 @@ felix.auto.start.1=\ "file:bundles/org.apache.felix.shell-${felixShellVersion}.jar" \ "file:bundles/org.apache.felix.shell.tui-${felixShellTuiVersion}.jar" felix.auto.start.2=\ -"file:bundles/pax-logging-service-${paxLoggingServiceVersion}.jar" \ -"file:bundles/pax-logging-api-${paxLoggingApiVersion}.jar" \ +"file:bundles/pax-logging-service-${pax-logging.version}.jar" \ +"file:bundles/pax-logging-api-${pax-logging.version}.jar" \ "file:bundles/org.apache.felix.eventadmin-${felixEventadminVersion}.jar" \ "file:bundles/org.apache.felix.configadmin-${felixConfigadminVersion}.jar" \ "file:bundles/org.apache.aries.util-${ariesUtilVersion}.jar" diff --git a/samples/blueprint/idverifier/idverifier-assembly/src/main/resources/run.bat b/samples/blueprint/idverifier/idverifier-assembly/src/main/resources/run.bat index 422b2f104..24f4d986a 100755 --- a/samples/blueprint/idverifier/idverifier-assembly/src/main/resources/run.bat +++ b/samples/blueprint/idverifier/idverifier-assembly/src/main/resources/run.bat @@ -18,4 +18,4 @@ @REM ################################################################################ @echo off set JAVA_OPTS=-Dcom.sun.management.jmxremote.port=8888 -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.ssl=false -java %JAVA_OPTS% -jar bundles/org.apache.felix.main-2.0.4.jar +java %JAVA_OPTS% -jar bundles/org.apache.felix.main-7.0.5.jar diff --git a/samples/blueprint/idverifier/idverifier-assembly/src/main/resources/run.sh b/samples/blueprint/idverifier/idverifier-assembly/src/main/resources/run.sh index 6d8b7866b..f30e10192 100755 --- a/samples/blueprint/idverifier/idverifier-assembly/src/main/resources/run.sh +++ b/samples/blueprint/idverifier/idverifier-assembly/src/main/resources/run.sh @@ -18,4 +18,4 @@ # limitations under the License. ################################################################################ JAVA_OPTS="-Dcom.sun.management.jmxremote.port=8888 -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.ssl=false" -java $JAVA_OPTS -jar bundles/org.apache.felix.main-2.0.4.jar +java $JAVA_OPTS -jar bundles/org.apache.felix.main-7.0.5.jar diff --git a/samples/pom.xml b/samples/pom.xml index cfc666ae8..631ba3846 100644 --- a/samples/pom.xml +++ b/samples/pom.xml @@ -128,8 +128,6 @@ <cmVersion>3.2.0-v20070116</cmVersion> <servicesVersion>3.1.200-v20070605</servicesVersion> <asmVersion>3.2</asmVersion> - <paxLoggingApiVersion>1.5.0</paxLoggingApiVersion> - <paxLoggingServiceVersion>1.5.0</paxLoggingServiceVersion> <derbyVersion>10.14.2.0</derbyVersion> <commonsCollectionsVersion>3.2.2</commonsCollectionsVersion> <commonsLangVersion>2.5</commonsLangVersion> @@ -151,7 +149,6 @@ <felixFileinstallVersion>3.1.4</felixFileinstallVersion> <felixBundleRepositoryVersion>1.6.4</felixBundleRepositoryVersion> - <felixMainVersion>2.0.4</felixMainVersion> <felixShellVersion>1.4.2</felixShellVersion> <felixShellTuiVersion>1.4.1</felixShellTuiVersion> <felixEventadminVersion>1.2.2</felixEventadminVersion> @@ -163,6 +160,11 @@ <twitter4jVersion>2.0.10</twitter4jVersion> <aries.javadoc.exclude.packages>*</aries.javadoc.exclude.packages> + + <!-- Updated dependencies --> + <org.apache.felix.main.version>7.0.5</org.apache.felix.main.version> + + <pax-logging.version>1.7.2</pax-logging.version> </properties> <dependencyManagement> @@ -177,7 +179,7 @@ <dependency> <groupId>org.apache.felix</groupId> <artifactId>org.apache.felix.main</artifactId> - <version>${felixMainVersion}</version> + <version>${org.apache.felix.main.version}</version> </dependency> <dependency> @@ -203,6 +205,16 @@ <artifactId>org.apache.felix.eventadmin</artifactId> <version>${felixEventadminVersion}</version> </dependency> + <dependency> + <groupId>org.ops4j.pax.logging</groupId> + <artifactId>pax-logging-api</artifactId> + <version>${pax-logging.version}</version> + </dependency> + <dependency> + <groupId>org.ops4j.pax.logging</groupId> + <artifactId>pax-logging-service</artifactId> + <version>${pax-logging.version}</version> + </dependency> <dependency> <groupId>org.ops4j.pax.web</groupId> <artifactId>pax-web-extender-war</artifactId>
