IDEMPIERE-3531:avoid dupplicate of bundle id

at the moment, idempiere have feature and plugin same id make tycho error
This commit is contained in:
hieplq 2018-01-25 16:00:18 +07:00
parent 512cb52cd8
commit 073d0a7ddf
21 changed files with 59 additions and 73 deletions

View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<feature
id="org.adempiere.base"
id="org.adempiere.base.feature"
label="Adempiere Base"
version="5.1.0.qualifier">
@ -17,23 +17,23 @@
</license>
<includes
id="org.compiere.db.provider"
id="org.compiere.db.provider.feature"
version="0.0.0"/>
<includes
id="org.adempiere.payment.processor"
id="org.adempiere.payment.processor.feature"
version="0.0.0"/>
<includes
id="org.adempiere.pipo"
id="org.adempiere.pipo.feature"
version="0.0.0"/>
<includes
id="org.adempiere.replication"
id="org.adempiere.replication.feature"
version="0.0.0"/>
<includes
id="org.adempiere.report.jasper"
id="org.adempiere.report.jasper.feature"
version="0.0.0"/>
<plugin

View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<feature
id="org.adempiere.bundles.external"
id="org.adempiere.bundles.external.feature"
label="External bundles"
version="5.1.0.qualifier"
provider-name="Adempiere.org">

View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<feature
id="org.adempiere.payment.processor"
id="org.adempiere.payment.processor.feature"
label="Payment Processor"
version="5.1.0.qualifier">

View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<feature
id="org.adempiere.pipo"
id="org.adempiere.pipo.feature"
label="Pipo-feature"
version="5.1.0.qualifier">

View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<feature
id="org.adempiere.replication"
id="org.adempiere.replication.feature"
label="Replication-feature"
version="5.1.0.qualifier">

View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<feature
id="org.adempiere.replication.server"
id="org.adempiere.replication.server.feature"
label="Replication Server-feature"
version="5.1.0.qualifier">
@ -17,8 +17,8 @@
</license>
<requires>
<import feature="org.adempiere.base" version="0.0.0"/>
<import feature="org.adempiere.replication" version="0.0.0"/>
<import feature="org.adempiere.base.feature" version="0.0.0"/>
<import feature="org.adempiere.replication.feature" version="0.0.0"/>
<import plugin="org.adempiere.server" version="0.0.0"/>
</requires>

View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<feature
id="org.adempiere.report.jasper"
id="org.adempiere.report.jasper.feature"
label="JasperReport-feature"
version="5.1.0.qualifier">

View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<feature
id="org.adempiere.sdk"
id="org.adempiere.sdk.feature"
label="Adempiere SDK"
version="5.1.0.qualifier"
provider-name="Adempiere.org">
@ -18,28 +18,28 @@
</license>
<includes
id="org.adempiere.target.platform"
id="org.adempiere.target.platform.feature"
version="0.0.0"/>
<includes
id="org.adempiere.server"
id="org.adempiere.server.feature"
version="0.0.0"/>
<includes
id="org.adempiere.ui.swing"
id="org.adempiere.ui.swing.feature"
version="0.0.0"/>
<includes
id="org.idempiere.hazelcast.service"
id="org.idempiere.hazelcast.service.feature"
version="0.0.0"
optional="true"/>
<includes
id="org.idempiere.fitnesse"
id="org.idempiere.fitnesse.feature"
version="0.0.0"/>
<includes
id="org.idempiere.equinox.p2.director"
id="org.idempiere.equinox.p2.director.feature"
version="0.0.0"/>
<plugin

View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<feature
id="org.adempiere.server"
id="org.adempiere.server.feature"
label="iDempiere Server-feature"
version="5.1.0.qualifier">
@ -17,48 +17,43 @@
</license>
<includes
id="org.adempiere.replication.server"
id="org.adempiere.replication.server.feature"
version="0.0.0"
optional="true"/>
<includes
id="org.adempiere.ui.zk"
id="org.adempiere.ui.zk.feature"
version="0.0.0"/>
<includes
id="org.adempiere.webstore"
id="org.adempiere.webstore.feature"
version="0.0.0"
optional="true"/>
<includes
id="org.idempiere.felix.webconsole"
id="org.idempiere.felix.webconsole.feature"
version="0.0.0"/>
<includes
id="org.adempiere.report.jasper"
id="org.adempiere.report.jasper.feature"
version="0.0.0"/>
<includes
id="org.adempiere.pipo"
id="org.adempiere.pipo.feature"
version="0.0.0"/>
<includes
id="org.idempiere.hazelcast.service"
id="org.idempiere.hazelcast.service.feature"
version="0.0.0"/>
<includes
id="org.adempiere.base"
id="org.adempiere.base.feature"
version="0.0.0"/>
<includes
id="org.idempiere.zk"
id="org.idempiere.zk.feature"
version="0.0.0"/>
<includes
id="org.idempiere.customize"
version="0.0.0"
optional="true"/>
<plugin
id="org.apache.taglibs.taglibs-standard-spec"
download-size="0"

View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<feature
id="org.adempiere.target.platform"
id="org.adempiere.target.platform.feature"
label="Adempiere Target Platform"
version="5.1.0.qualifier"
provider-name="Adempiere.org">
@ -33,11 +33,7 @@
version="0.0.0"/>
<includes
id="org.adempiere.bundles.external"
version="0.0.0"/>
<includes
id="org.eclipse.ecf.core.feature"
id="org.adempiere.bundles.external.feature"
version="0.0.0"/>
<includes
@ -48,6 +44,10 @@
id="org.eclipse.osgi.compatibility.plugins.feature"
version="0.0.0"/>
<includes
id="org.eclipse.ecf.core.feature"
version="0.0.0"/>
<plugin
id="javax.xml"
download-size="0"

View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<feature
id="org.adempiere.ui.swing"
id="org.adempiere.ui.swing.feature"
label="Swing Client-feature"
version="5.1.0.qualifier">
@ -17,7 +17,7 @@
</license>
<requires>
<import feature="org.adempiere.base" version="0.0.0"/>
<import feature="org.adempiere.base.feature" version="0.0.0"/>
</requires>
<plugin

View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<feature
id="org.adempiere.ui.zk"
id="org.adempiere.ui.zk.feature"
label="Zk Client-feature"
version="5.1.0.qualifier">
@ -17,7 +17,7 @@
</license>
<requires>
<import feature="org.adempiere.base" version="0.0.0"/>
<import feature="org.adempiere.base.feature" version="0.0.0"/>
</requires>
<plugin
@ -25,11 +25,12 @@
download-size="0"
install-size="0"
version="5.1.0.qualifier"/>
<plugin
id="org.atmosphere.runtime"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
</feature>

View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<feature
id="org.adempiere.webstore"
id="org.adempiere.webstore.feature"
label="Webstore-feature"
version="5.1.0.qualifier">
@ -17,7 +17,7 @@
</license>
<requires>
<import feature="org.adempiere.base" version="0.0.0"/>
<import feature="org.adempiere.base.feature" version="0.0.0"/>
<import plugin="org.adempiere.report.jasper.webapp" version="0.0.0"/>
<import plugin="org.mortbay.jasper.apache-jsp"/>
<import plugin="org.apache.taglibs.taglibs-standard-spec"/>

View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<feature
id="org.compiere.db.provider"
id="org.compiere.db.provider.feature"
label="Database Provider-feature"
version="5.1.0.qualifier">

View File

@ -1,11 +1 @@
bin.includes = feature.xml
root.linux.gtk.x86_64.permissions.755=*.sh,**/*.sh
root.linux.gtk.x86.permissions.755=*.sh,**/*.sh
root.macosx.cocoa.x86.permissions.755=*.sh,**/*.sh
root.macosx.cocoa.x86_64.permissions.755=*.sh,**/*.sh
root.solaris.gtk.x86.permissions.755=*.sh,**/*.sh
bin.includes = feature.xml

View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<feature
id="org.idempiere.eclipse.platform"
id="org.idempiere.eclipse.platform.feature"
label="Eclipse Platform for iDempiere"
version="5.1.0.qualifier"
provider-name="www.idempiere.org">

View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<feature
id="org.idempiere.equinox.p2.director"
id="org.idempiere.equinox.p2.director.feature"
label="Idempiere P2 Director"
version="5.1.0.qualifier"
provider-name="www.idempiere.org">

View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<feature
id="org.idempiere.felix.webconsole"
id="org.idempiere.felix.webconsole.feature"
label="Felix Web Console Feature"
version="5.1.0.qualifier">

View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<feature
id="org.idempiere.fitnesse"
id="org.idempiere.fitnesse.feature"
label="Fitnesse Feature"
version="5.1.0.qualifier">

View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<feature
id="org.idempiere.hazelcast.service"
id="org.idempiere.hazelcast.service.feature"
label="Hazelcast Service Feature"
version="5.1.0.qualifier">
@ -41,7 +41,7 @@
id="org.idempiere.hazelcast.service.config"
download-size="0"
install-size="0"
version="5.1.0"
version="0.0.0"
fragment="true"/>
</feature>

View File

@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<feature
id="org.idempiere.zk"
id="org.idempiere.zk.feature"
label="Materialize zk osgi libary"
version="1.0.0.qualifier">
version="5.1.0.qualifier">
<description url="http://www.example.com/description">
[Enter Feature Description here.]
@ -85,19 +85,19 @@
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="org.apache.commons.fileupload"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
<plugin
id="org.apache.commons.io"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
</feature>