You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by jb...@apache.org on 2012/12/20 18:52:58 UTC

svn commit: r1424610 - in /karaf/eik/trunk: features/org.apache.karaf.eik.feature/ features/org.apache.karaf.eik.jmx.feature/ features/org.apache.karaf.eik.p2.feature/ features/org.apache.karaf.eik.repository/ features/org.apache.karaf.eik.wtp.feature/...

Author: jbonofre
Date: Thu Dec 20 17:52:57 2012
New Revision: 1424610

URL: http://svn.apache.org/viewvc?rev=1424610&view=rev
Log:
Don't use qualifier in MANIFEST (to be Maven release independent)

Modified:
    karaf/eik/trunk/features/org.apache.karaf.eik.feature/feature.xml
    karaf/eik/trunk/features/org.apache.karaf.eik.jmx.feature/feature.xml
    karaf/eik/trunk/features/org.apache.karaf.eik.p2.feature/feature.xml
    karaf/eik/trunk/features/org.apache.karaf.eik.repository/category.xml
    karaf/eik/trunk/features/org.apache.karaf.eik.wtp.feature/feature.xml
    karaf/eik/trunk/plugins/org.apache.karaf.eik.app/META-INF/MANIFEST.MF
    karaf/eik/trunk/plugins/org.apache.karaf.eik.core/META-INF/MANIFEST.MF
    karaf/eik/trunk/plugins/org.apache.karaf.eik.felix/META-INF/MANIFEST.MF
    karaf/eik/trunk/plugins/org.apache.karaf.eik.hooks/META-INF/MANIFEST.MF
    karaf/eik/trunk/plugins/org.apache.karaf.eik.jmx/META-INF/MANIFEST.MF
    karaf/eik/trunk/plugins/org.apache.karaf.eik.ui/META-INF/MANIFEST.MF
    karaf/eik/trunk/plugins/org.apache.karaf.eik.workbench/META-INF/MANIFEST.MF
    karaf/eik/trunk/plugins/org.apache.karaf.eik.wtp.core/META-INF/MANIFEST.MF
    karaf/eik/trunk/plugins/org.apache.karaf.eik.wtp.ui/META-INF/MANIFEST.MF

Modified: karaf/eik/trunk/features/org.apache.karaf.eik.feature/feature.xml
URL: http://svn.apache.org/viewvc/karaf/eik/trunk/features/org.apache.karaf.eik.feature/feature.xml?rev=1424610&r1=1424609&r2=1424610&view=diff
==============================================================================
--- karaf/eik/trunk/features/org.apache.karaf.eik.feature/feature.xml (original)
+++ karaf/eik/trunk/features/org.apache.karaf.eik.feature/feature.xml Thu Dec 20 17:52:57 2012
@@ -2,7 +2,7 @@
 <feature
       id="org.apache.karaf.eik.feature"
       label="%featureName"
-      version="0.9.0.qualifier"
+      version="0.9.0"
       provider-name="%providerName">
 
    <description>

Modified: karaf/eik/trunk/features/org.apache.karaf.eik.jmx.feature/feature.xml
URL: http://svn.apache.org/viewvc/karaf/eik/trunk/features/org.apache.karaf.eik.jmx.feature/feature.xml?rev=1424610&r1=1424609&r2=1424610&view=diff
==============================================================================
--- karaf/eik/trunk/features/org.apache.karaf.eik.jmx.feature/feature.xml (original)
+++ karaf/eik/trunk/features/org.apache.karaf.eik.jmx.feature/feature.xml Thu Dec 20 17:52:57 2012
@@ -2,7 +2,7 @@
 <feature
       id="org.apache.karaf.eik.jmx.feature"
       label="Eclipse JMX Integration Feature for Apache Felix Karaf"
-      version="0.9.0.qualifier"
+      version="0.9.0"
       provider-name="Apache Software Foundation">
 
    <description>

Modified: karaf/eik/trunk/features/org.apache.karaf.eik.p2.feature/feature.xml
URL: http://svn.apache.org/viewvc/karaf/eik/trunk/features/org.apache.karaf.eik.p2.feature/feature.xml?rev=1424610&r1=1424609&r2=1424610&view=diff
==============================================================================
--- karaf/eik/trunk/features/org.apache.karaf.eik.p2.feature/feature.xml (original)
+++ karaf/eik/trunk/features/org.apache.karaf.eik.p2.feature/feature.xml Thu Dec 20 17:52:57 2012
@@ -2,7 +2,7 @@
 <feature
         id="org.apache.karaf.eik.p2.feature"
         label="Eclipse p2 Integeration for Apache Karaf"
-        version="0.9.0.qualifier"
+        version="0.9.0"
         provider-name="Apache Software Foundation">
 
     <copyright>

Modified: karaf/eik/trunk/features/org.apache.karaf.eik.repository/category.xml
URL: http://svn.apache.org/viewvc/karaf/eik/trunk/features/org.apache.karaf.eik.repository/category.xml?rev=1424610&r1=1424609&r2=1424610&view=diff
==============================================================================
--- karaf/eik/trunk/features/org.apache.karaf.eik.repository/category.xml (original)
+++ karaf/eik/trunk/features/org.apache.karaf.eik.repository/category.xml Thu Dec 20 17:52:57 2012
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <site>
-   <feature url="features/org.apache.karaf.eik.wtp.feature_0.9.0.qualifier.jar" id="org.apache.karaf.eik.wtp.feature" version="0.9.0.qualifier">
+   <feature url="features/org.apache.karaf.eik.wtp.feature_0.9.0.jar" id="org.apache.karaf.eik.wtp.feature" version="0.9.0">
       <category name="Eclipse Web Tools Platform Integration for Apache Karaf"/>
    </feature>
-   <feature url="features/org.apache.karaf.eik.feature_0.9.0.qualifier.jar" id="org.apache.karaf.eik.feature" version="0.9.0.qualifier">
+   <feature url="features/org.apache.karaf.eik.feature_0.9.0.jar" id="org.apache.karaf.eik.feature" version="0.9.0">
       <category name="Eclipse Integration for Apache Karaf"/>
    </feature>
-   <feature url="features/org.apache.karaf.eik.jmx.feature_0.9.0.qualifier.jar" id="org.apache.karaf.eik.jmx.feature" version="0.9.0.qualifier">
+   <feature url="features/org.apache.karaf.eik.jmx.feature_0.9.0.jar" id="org.apache.karaf.eik.jmx.feature" version="0.9.0">
       <category name="Eclipse Integration for Apache Karaf"/>
    </feature>
    <category-def name="Eclipse Integration for Apache Karaf" label="Eclipse Integration for Apache Karaf"/>

Modified: karaf/eik/trunk/features/org.apache.karaf.eik.wtp.feature/feature.xml
URL: http://svn.apache.org/viewvc/karaf/eik/trunk/features/org.apache.karaf.eik.wtp.feature/feature.xml?rev=1424610&r1=1424609&r2=1424610&view=diff
==============================================================================
--- karaf/eik/trunk/features/org.apache.karaf.eik.wtp.feature/feature.xml (original)
+++ karaf/eik/trunk/features/org.apache.karaf.eik.wtp.feature/feature.xml Thu Dec 20 17:52:57 2012
@@ -2,7 +2,7 @@
 <feature
       id="org.apache.karaf.eik.wtp.feature"
       label="%featureName"
-      version="0.9.0.qualifier"
+      version="0.9.0"
       provider-name="%providerName">
 
    <description>

Modified: karaf/eik/trunk/plugins/org.apache.karaf.eik.app/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/karaf/eik/trunk/plugins/org.apache.karaf.eik.app/META-INF/MANIFEST.MF?rev=1424610&r1=1424609&r2=1424610&view=diff
==============================================================================
--- karaf/eik/trunk/plugins/org.apache.karaf.eik.app/META-INF/MANIFEST.MF (original)
+++ karaf/eik/trunk/plugins/org.apache.karaf.eik.app/META-INF/MANIFEST.MF Thu Dec 20 17:52:57 2012
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Apache Karaf :: EIK :: Plugins :: Application Definition
 Bundle-SymbolicName: org.apache.karaf.eik.app;singleton:=true
-Bundle-Version: 0.9.0.qualifier
+Bundle-Version: 0.9.0
 Bundle-Activator: org.apache.karaf.eik.app.Activator
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.1.0,4.0.0)"
 Bundle-ActivationPolicy: lazy

Modified: karaf/eik/trunk/plugins/org.apache.karaf.eik.core/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/karaf/eik/trunk/plugins/org.apache.karaf.eik.core/META-INF/MANIFEST.MF?rev=1424610&r1=1424609&r2=1424610&view=diff
==============================================================================
--- karaf/eik/trunk/plugins/org.apache.karaf.eik.core/META-INF/MANIFEST.MF (original)
+++ karaf/eik/trunk/plugins/org.apache.karaf.eik.core/META-INF/MANIFEST.MF Thu Dec 20 17:52:57 2012
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Apache Karaf :: EIK :: Plugins :: Core
 Bundle-SymbolicName: org.apache.karaf.eik.core;singleton:=true
-Bundle-Version: 0.9.0.qualifier
+Bundle-Version: 0.9.0
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.1.0,4.0.0)",
  org.eclipse.core.resources;bundle-version="[3.0.0,4.0.0)",

Modified: karaf/eik/trunk/plugins/org.apache.karaf.eik.felix/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/karaf/eik/trunk/plugins/org.apache.karaf.eik.felix/META-INF/MANIFEST.MF?rev=1424610&r1=1424609&r2=1424610&view=diff
==============================================================================
--- karaf/eik/trunk/plugins/org.apache.karaf.eik.felix/META-INF/MANIFEST.MF (original)
+++ karaf/eik/trunk/plugins/org.apache.karaf.eik.felix/META-INF/MANIFEST.MF Thu Dec 20 17:52:57 2012
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Apache Karaf :: EIK :: Plugins :: Felix OSGi Framework for Eclipse PDE
 Bundle-SymbolicName: org.apache.karaf.eik.felix;singleton:=true
-Bundle-Version: 0.9.0.qualifier
+Bundle-Version: 0.9.0
 Bundle-Activator: org.apache.karaf.eik.felix.Activator
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,

Modified: karaf/eik/trunk/plugins/org.apache.karaf.eik.hooks/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/karaf/eik/trunk/plugins/org.apache.karaf.eik.hooks/META-INF/MANIFEST.MF?rev=1424610&r1=1424609&r2=1424610&view=diff
==============================================================================
--- karaf/eik/trunk/plugins/org.apache.karaf.eik.hooks/META-INF/MANIFEST.MF (original)
+++ karaf/eik/trunk/plugins/org.apache.karaf.eik.hooks/META-INF/MANIFEST.MF Thu Dec 20 17:52:57 2012
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Apache Karaf :: EIK :: Plugins :: Framework Extensions for Eclipse Integration for Apache Felix Karaf
 Bundle-SymbolicName: org.apache.karaf.eik.hooks;singleton:=true
-Bundle-Version: 0.9.0.qualifier
+Bundle-Version: 0.9.0
 Fragment-Host: org.eclipse.osgi;bundle-version="3.4.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-Vendor: Apache Software Foundation

Modified: karaf/eik/trunk/plugins/org.apache.karaf.eik.jmx/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/karaf/eik/trunk/plugins/org.apache.karaf.eik.jmx/META-INF/MANIFEST.MF?rev=1424610&r1=1424609&r2=1424610&view=diff
==============================================================================
--- karaf/eik/trunk/plugins/org.apache.karaf.eik.jmx/META-INF/MANIFEST.MF (original)
+++ karaf/eik/trunk/plugins/org.apache.karaf.eik.jmx/META-INF/MANIFEST.MF Thu Dec 20 17:52:57 2012
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Apache Karaf :: EIK :: Plugins :: JMX Data Exporter for Eclipse Integration
 Bundle-SymbolicName: org.apache.karaf.eik.jmx
-Bundle-Version: 0.9.0.qualifier
+Bundle-Version: 0.9.0
 Bundle-Activator: org.apache.karaf.eik.jmx.KarafJMXPlugin
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6,

Modified: karaf/eik/trunk/plugins/org.apache.karaf.eik.ui/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/karaf/eik/trunk/plugins/org.apache.karaf.eik.ui/META-INF/MANIFEST.MF?rev=1424610&r1=1424609&r2=1424610&view=diff
==============================================================================
--- karaf/eik/trunk/plugins/org.apache.karaf.eik.ui/META-INF/MANIFEST.MF (original)
+++ karaf/eik/trunk/plugins/org.apache.karaf.eik.ui/META-INF/MANIFEST.MF Thu Dec 20 17:52:57 2012
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Apache Karaf :: EIK :: Plugins :: UI for Eclipse Integration
 Bundle-SymbolicName: org.apache.karaf.eik.ui;singleton:=true
-Bundle-Version: 0.9.0.qualifier
+Bundle-Version: 0.9.0
 Require-Bundle: org.eclipse.ant.core;bundle-version="3.2.201",
  org.eclipse.core.variables;bundle-version="3.2.400",
  org.eclipse.ui;bundle-version="[3.2.0,4.0.0)",

Modified: karaf/eik/trunk/plugins/org.apache.karaf.eik.workbench/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/karaf/eik/trunk/plugins/org.apache.karaf.eik.workbench/META-INF/MANIFEST.MF?rev=1424610&r1=1424609&r2=1424610&view=diff
==============================================================================
--- karaf/eik/trunk/plugins/org.apache.karaf.eik.workbench/META-INF/MANIFEST.MF (original)
+++ karaf/eik/trunk/plugins/org.apache.karaf.eik.workbench/META-INF/MANIFEST.MF Thu Dec 20 17:52:57 2012
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Apache Karaf :: EIK :: Plugins :: Eclipse Workbench Service Registry
 Bundle-SymbolicName: org.apache.karaf.eik.workbench;singleton:=true
-Bundle-Version: 0.9.0.qualifier
+Bundle-Version: 0.9.0
 Bundle-Activator: org.apache.karaf.eik.workbench.KarafWorkbenchActivator
 Bundle-Vendor: Apache Software Foundation
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.1.0,4.0.0)",

Modified: karaf/eik/trunk/plugins/org.apache.karaf.eik.wtp.core/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/karaf/eik/trunk/plugins/org.apache.karaf.eik.wtp.core/META-INF/MANIFEST.MF?rev=1424610&r1=1424609&r2=1424610&view=diff
==============================================================================
--- karaf/eik/trunk/plugins/org.apache.karaf.eik.wtp.core/META-INF/MANIFEST.MF (original)
+++ karaf/eik/trunk/plugins/org.apache.karaf.eik.wtp.core/META-INF/MANIFEST.MF Thu Dec 20 17:52:57 2012
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Apache Karaf :: EIK :: Plugins :: Eclipse WTP Core Integration
 Bundle-SymbolicName: org.apache.karaf.eik.wtp.core;singleton:=true
-Bundle-Version: 0.9.0.qualifier
+Bundle-Version: 0.9.0
 Bundle-Activator: org.apache.karaf.eik.wtp.core.KarafWtpPluginActivator
 Require-Bundle: org.eclipse.jst.server.core;bundle-version="[1.1.3,2.0.0)",
  org.eclipse.pde.ui;bundle-version="[3.2.0,4.0.0)",

Modified: karaf/eik/trunk/plugins/org.apache.karaf.eik.wtp.ui/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/karaf/eik/trunk/plugins/org.apache.karaf.eik.wtp.ui/META-INF/MANIFEST.MF?rev=1424610&r1=1424609&r2=1424610&view=diff
==============================================================================
--- karaf/eik/trunk/plugins/org.apache.karaf.eik.wtp.ui/META-INF/MANIFEST.MF (original)
+++ karaf/eik/trunk/plugins/org.apache.karaf.eik.wtp.ui/META-INF/MANIFEST.MF Thu Dec 20 17:52:57 2012
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Apache Karaf :: EIK :: Plugins :: Eclipse WTP UI Integration
 Bundle-SymbolicName: org.apache.karaf.eik.wtp.ui;singleton:=true
-Bundle-Version: 0.9.0.qualifier
+Bundle-Version: 0.9.0
 Bundle-Activator: org.apache.karaf.eik.wtp.ui.KarafWtpUIPluginActivator
 Require-Bundle: org.eclipse.debug.ui;bundle-version="[3.2.0,4.0.0)",
  org.eclipse.pde.ui;bundle-version="[3.2.0,4.0.0)",