From 4b9b980fb312844ee774cebbc5efcd41805765bf Mon Sep 17 00:00:00 2001 From: hieplq Date: Tue, 10 Nov 2015 17:07:12 +0700 Subject: [PATCH] IDEMPIERE-2910:update.sh run with issue remove version in plug-in, use cquery to control remove this plugin because just use in eclipse launch:org.apache.felix.webconsole.plugins.memoryusage remove this plub-in because useless:org.apache.felix.webconsole.plugins.packageadmin --- lib/artifacts.xml | 22 --------- lib/content.xml | 45 ------------------- org.adempiere.base-feature/feature.xml | 2 +- org.adempiere.sdk-feature/adempiere.cquery | 5 ++- org.adempiere.sdk-feature/adempiere.rmap | 5 ++- org.adempiere.server-feature/feature.xml | 23 +--------- org.adempiere.server-feature/server.product | 1 - .../server.product.functionaltest.launch | 2 +- .../server.product.launch | 2 +- .../setup/configuration/config.ini | 2 +- .../feature.xml | 34 +++++++------- .../director/configuration/config.ini | 2 +- .../feature.xml | 20 ++++----- .../feature.xml | 14 ------ 14 files changed, 40 insertions(+), 139 deletions(-) delete mode 100644 lib/artifacts.xml delete mode 100644 lib/content.xml diff --git a/lib/artifacts.xml b/lib/artifacts.xml deleted file mode 100644 index 3e00052eab..0000000000 --- a/lib/artifacts.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - diff --git a/lib/content.xml b/lib/content.xml deleted file mode 100644 index e0add5e5aa..0000000000 --- a/lib/content.xml +++ /dev/null @@ -1,45 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Bundle-SymbolicName: org.apache.felix.webconsole.plugins.packageadmin Bundle-Version: 1.0.0.1 - - - - - - diff --git a/org.adempiere.base-feature/feature.xml b/org.adempiere.base-feature/feature.xml index 49f2d152b3..cc856c2ef3 100644 --- a/org.adempiere.base-feature/feature.xml +++ b/org.adempiere.base-feature/feature.xml @@ -117,7 +117,7 @@ id="org.eclipse.jetty.osgi-servlet-api" download-size="0" install-size="0" - version="3.1.0.M0" + version="0.0.0" unpack="false"/> - + @@ -30,4 +30,7 @@ + + + diff --git a/org.adempiere.sdk-feature/adempiere.rmap b/org.adempiere.sdk-feature/adempiere.rmap index c9cfd11829..5a362716b3 100644 --- a/org.adempiere.sdk-feature/adempiere.rmap +++ b/org.adempiere.sdk-feature/adempiere.rmap @@ -1,6 +1,6 @@ - + @@ -75,7 +75,7 @@ - + @@ -121,6 +121,7 @@ + diff --git a/org.adempiere.server-feature/feature.xml b/org.adempiere.server-feature/feature.xml index bdee27e0ef..e95943a252 100644 --- a/org.adempiere.server-feature/feature.xml +++ b/org.adempiere.server-feature/feature.xml @@ -117,7 +117,7 @@ id="javax.annotation-api" download-size="0" install-size="0" - version="1.2.0" + version="0.0.0" unpack="false"/> - - - - - - - diff --git a/org.adempiere.server-feature/server.product.functionaltest.launch b/org.adempiere.server-feature/server.product.functionaltest.launch index 0c3c7e4c41..4c8b4657a2 100644 --- a/org.adempiere.server-feature/server.product.functionaltest.launch +++ b/org.adempiere.server-feature/server.product.functionaltest.launch @@ -22,7 +22,7 @@ - + diff --git a/org.adempiere.server-feature/server.product.launch b/org.adempiere.server-feature/server.product.launch index f3b6932367..530fe8f959 100644 --- a/org.adempiere.server-feature/server.product.launch +++ b/org.adempiere.server-feature/server.product.launch @@ -24,7 +24,7 @@ - + diff --git a/org.adempiere.server-feature/setup/configuration/config.ini b/org.adempiere.server-feature/setup/configuration/config.ini index 5a7c8a6f9e..e4ecfac5a6 100644 --- a/org.adempiere.server-feature/setup/configuration/config.ini +++ b/org.adempiere.server-feature/setup/configuration/config.ini @@ -1,4 +1,4 @@ -osgi.framework=file\:../plugins/org.eclipse.osgi_3.10.1.v20140909-1633.jar +osgi.framework=file\:../plugins/org.eclipse.osgi_3.10.2.v20150203-1939.jar osgi.install.area=setup equinox.use.ds=true osgi.bundles=org.eclipse.equinox.ds@1:start,\ diff --git a/org.adempiere.target.platform-feature/feature.xml b/org.adempiere.target.platform-feature/feature.xml index 2f6c38194f..fd4da2f42c 100644 --- a/org.adempiere.target.platform-feature/feature.xml +++ b/org.adempiere.target.platform-feature/feature.xml @@ -19,18 +19,18 @@ + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> diff --git a/org.idempiere.eclipse.platform-feature/director/configuration/config.ini b/org.idempiere.eclipse.platform-feature/director/configuration/config.ini index 7ff5db4119..2c3262519f 100644 --- a/org.idempiere.eclipse.platform-feature/director/configuration/config.ini +++ b/org.idempiere.eclipse.platform-feature/director/configuration/config.ini @@ -1,4 +1,4 @@ -osgi.framework=file\:../plugins/org.eclipse.osgi_3.10.1.v20140909-1633.jar +osgi.framework=file\:../plugins/org.eclipse.osgi_3.10.2.v20150203-1939.jar osgi.install.area=director equinox.use.ds=true osgi.bundles=org.eclipse.core.net@start,\ diff --git a/org.idempiere.eclipse.platform-feature/feature.xml b/org.idempiere.eclipse.platform-feature/feature.xml index 7748b35e70..f0b018d856 100644 --- a/org.idempiere.eclipse.platform-feature/feature.xml +++ b/org.idempiere.eclipse.platform-feature/feature.xml @@ -31,32 +31,32 @@ + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> - + diff --git a/org.idempiere.felix.webconsole-feature/feature.xml b/org.idempiere.felix.webconsole-feature/feature.xml index f21bfd4065..9bc21b6c5c 100644 --- a/org.idempiere.felix.webconsole-feature/feature.xml +++ b/org.idempiere.felix.webconsole-feature/feature.xml @@ -23,20 +23,6 @@ version="0.0.0" unpack="false"/> - - - -