Skip to content

Commit

Permalink
Merge branch '2.5.x' of github.com:KlasJoenssson/bioclipse.cheminform…
Browse files Browse the repository at this point in the history 
…atics into 2.5.x
  • Loading branch information
@KlasJoensson
KlasJoensson committed Feb 13, 2012
2 parents 907a4bb + ebb91b3 commit 6d8eecc
Show file tree
Hide file tree
Showing 4 changed files with 35 additions and 28 deletions.
37 changes: 22 additions & 15 deletions features/net.bioclipse.chemoinformatics_feature/feature.xml
View file
Expand Up @@ -44,7 +44,7 @@ The Eclipse Public License accompanies this distribution, and is available at ht
<import plugin="org.openscience.cdk.pdb"/>
<import plugin="org.openscience.cdk.pcore"/>
<import plugin="org.openscience.cdk.ioformats"/>
<import plugin="org.openscience.cdk.isomorphism"/>
<import plugin="org.openscience.cdk.isomorphism" version="1.4.0" match="greaterOrEqual"/>
<import plugin="javax.vecmath" version="1.0.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.ui"/>
<import plugin="org.eclipse.core.runtime"/>
Expand Down Expand Up @@ -76,31 +76,24 @@ The Eclipse Public License accompanies this distribution, and is available at ht
<import plugin="org.eclipse.swt"/>
<import plugin="org.xmlpull.xpp3"/>
<import plugin="org.openscience.cdk.control"/>
<import plugin="org.openscience.cdk.ioformats" version="1.1.5" match="greaterOrEqual"/>
<import plugin="org.openscience.cdk.io" version="1.1.5" match="greaterOrEqual"/>
<import plugin="org.openscience.cdk.libiocml" version="1.1.5" match="greaterOrEqual"/>
<import plugin="org.openscience.cdk.smarts" version="1.1.5" match="greaterOrEqual"/>
<import plugin="org.openscience.cdk.data" version="1.2.2" match="greaterOrEqual"/>
<import plugin="net.bioclipse.inchi" version="2.0.0" match="greaterOrEqual"/>
<import plugin="org.openscience.cdk.renderextra" version="1.3.0" match="greaterOrEqual"/>
<import plugin="org.openscience.cdk.renderbasic" version="1.3.0" match="greaterOrEqual"/>
<import plugin="org.openscience.cdk.controlbasic" version="1.3.0" match="greaterOrEqual"/>
<import plugin="org.openscience.cdk.controlextra" version="1.3.0" match="greaterOrEqual"/>
<import plugin="org.openscience.cdk.rendercontrol" version="1.3.0" match="greaterOrEqual"/>
<import plugin="net.bioclipse.ioformats"/>
<import plugin="org.openscience.cdk.cip"/>
<import plugin="org.openscience.cdk.annotation"/>
<import plugin="org.eclipse.core.commands"/>
<import plugin="org.eclipse.jface"/>
<import plugin="org.openscience.cdk.renderswt"/>
<import plugin="org.eclipse.osgi"/>
<import plugin="com.springsource.javax.mail"/>
<import plugin="org.apache.commons.codec"/>
<import plugin="net.sourceforge.nattable.core"/>
<import plugin="org.openscience.cdk.inchi"/>
<import plugin="org.eclipse.help"/>
<import plugin="net.bioclipse.browser.business"/>
<import plugin="org.eclipse.core.contenttype"/>
<import plugin="com.springsource.javax.mail"/>
<import plugin="jnati-core-0.4"/>
<import plugin="jcl.over.slf4j"/>
<import feature="org.eclipse.rcp" version="3.7.1" match="greaterOrEqual"/>
</requires>

Expand Down Expand Up @@ -196,28 +189,42 @@ The Eclipse Public License accompanies this distribution, and is available at ht
unpack="false"/>

<plugin
id="net.bioclipse.ioformats"
id="net.bioclipse.opsin"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>

<plugin
id="net.bioclipse.opsin"
id="net.bioclipse.opsin.ui"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>

<plugin
id="net.bioclipse.opsin.ui"
id="net.sf.jni-inchi"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>

<plugin
id="net.sf.jni-inchi"
id="net.sourceforge.nattable.core"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>

<plugin
id="org.apache.commons.lang"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>

<plugin
id="jnati-core"
download-size="0"
install-size="0"
version="0.0.0"
Expand Down
2 changes: 1 addition & 1 deletion plugins/net.bioclipse.cdk.jchempaint.view/META-INF/MANIFEST.MF
View file
Expand Up @@ -7,7 +7,7 @@ Export-Package: net.bioclipse.cdk.jchempaint.view
Import-Package: org.apache.log4j
Bundle-Vendor: The Bioclipse Team
Bundle-ActivationPolicy: lazy
Require-Bundle: javax.vecmath;bundle-version="1.0.0",
Require-Bundle: javax.vecmath,
org.eclipse.swt,
org.eclipse.core.commands,
net.bioclipse.cdk.business,
Expand Down
22 changes: 11 additions & 11 deletions plugins/net.bioclipse.cdk.jchempaint/META-INF/MANIFEST.MF
View file
Expand Up @@ -25,18 +25,18 @@ Require-Bundle: org.openscience.cdk.interfaces,
org.eclipse.core.expressions,
net.bioclipse.scripting.ui,
org.openscience.cdk.nonotify,
org.openscience.cdk.ioformats;bundle-version="1.1.5",
org.openscience.cdk.io;bundle-version="1.1.5",
org.openscience.cdk.libiocml;bundle-version="1.1.5",
org.openscience.cdk.smarts;bundle-version="1.1.5",
org.openscience.cdk.ioformats,
org.openscience.cdk.io,
org.openscience.cdk.libiocml,
org.openscience.cdk.smarts,
net.bioclipse.ui.business,
org.openscience.cdk.data;bundle-version="1.2.2",
net.bioclipse.inchi;bundle-version="2.0.0",
org.openscience.cdk.renderextra;bundle-version="1.3.0",
org.openscience.cdk.renderbasic;bundle-version="1.3.0",
org.openscience.cdk.controlbasic;bundle-version="1.3.0",
org.openscience.cdk.controlextra;bundle-version="1.3.0",
org.openscience.cdk.rendercontrol;bundle-version="1.3.0",
org.openscience.cdk.data,
net.bioclipse.inchi,
org.openscience.cdk.renderextra,
org.openscience.cdk.renderbasic,
org.openscience.cdk.controlbasic,
org.openscience.cdk.controlextra,
org.openscience.cdk.rendercontrol,
net.bioclipse.cml,
net.bioclipse.ioformats,
org.openscience.cdk.cip,
Expand Down
2 changes: 1 addition & 1 deletion plugins/net.bioclipse.jmol.cdk/META-INF/MANIFEST.MF
View file
Expand Up @@ -27,7 +27,7 @@ Require-Bundle: org.openscience.cdk.data,
net.bioclipse.cdk.business,
javax.vecmath,
net.bioclipse.jmol,
net.bioclipse.ui.business;bundle-version="2.0.0"
net.bioclipse.ui.business
Bundle-ActivationPolicy: lazy
Bundle-ClassPath: .
Import-Package: org.apache.log4j
Expand Down

0 comments on commit 6d8eecc

Please sign in to comment.