Skip to content
Browse files

Do not commit the generated file MANIFEST.MF + ignore it (similar lik…

…e we do it on drools) to avoid merge conflicts when 2 different developers build and push their changes.
  • Loading branch information...
1 parent 1822b3e commit a15644937e93523c51dc1cfe96de6dc4b3f288bc @ge0ffrey ge0ffrey committed May 18, 2011
Showing with 3 additions and 77 deletions.
  1. +3 −0 .gitignore
  2. +0 −77 META-INF/MANIFEST.MF
View
3 .gitignore
@@ -10,3 +10,6 @@
/*.ipr
/*.iws
/*.iml
+
+# The META-INF directory is generated by the maven-felix-plugin
+/META-INF
View
77 META-INF/MANIFEST.MF
@@ -1,77 +0,0 @@
-Manifest-Version: 1.0
-Export-Package: org.mvel2;uses:="org.mvel2.util,org.mvel2.conversion,o
- rg.mvel2.integration.impl,org.mvel2.optimizers.impl.refl.nodes,org.mv
- el2.integration,org.mvel2.compiler,org.mvel2.ast,org.mvel2.debug";ver
- sion="2.1.0.SNAPSHOT",org.mvel2.asm;version="2.1.0.SNAPSHOT",org.mvel
- 2.asm.signature;version="2.1.0.SNAPSHOT",org.mvel2.asm.util;uses:="or
- g.mvel2.asm,org.mvel2.asm.signature";version="2.1.0.SNAPSHOT",org.mve
- l2.ast;uses:="org.mvel2.integration,org.mvel2.optimizers,org.mvel2,or
- g.mvel2.debug,org.mvel2.compiler,org.mvel2.util,org.mvel2.math,org.mv
- el2.integration.impl";version="2.1.0.SNAPSHOT",org.mvel2.compiler;use
- s:="org.mvel2.integration,org.mvel2,org.mvel2.util,org.mvel2.ast,org.
- mvel2.optimizers,org.mvel2.integration.impl,org.mvel2.optimizers.impl
- .refl.nodes";version="2.1.0.SNAPSHOT",org.mvel2.conversion;uses:="org
- .mvel2,org.mvel2.compiler";version="2.1.0.SNAPSHOT",org.mvel2.debug;u
- ses:="org.mvel2.integration,org.mvel2.util,org.mvel2.ast,org.mvel2.co
- mpiler,org.mvel2";version="2.1.0.SNAPSHOT",org.mvel2.integration;uses
- :="org.mvel2.ast";version="2.1.0.SNAPSHOT",org.mvel2.integration.impl
- ;uses:="org.mvel2.integration,org.mvel2,org.mvel2.ast,org.mvel2.util"
- ;version="2.1.0.SNAPSHOT",org.mvel2.math;uses:="org.mvel2,org.mvel2.d
- ebug,org.mvel2.util";version="2.1.0.SNAPSHOT",org.mvel2.optimizers;us
- es:="org.mvel2,org.mvel2.util,org.mvel2.compiler,org.mvel2.integratio
- n,org.mvel2.optimizers.dynamic,org.mvel2.optimizers.impl.asm,org.mvel
- 2.optimizers.impl.refl";version="2.1.0.SNAPSHOT",org.mvel2.optimizers
- .dynamic;uses:="org.mvel2.compiler,org.mvel2.util,org.mvel2.integrati
- on,org.mvel2.optimizers,org.mvel2,org.mvel2.optimizers.impl.asm";vers
- ion="2.1.0.SNAPSHOT",org.mvel2.optimizers.impl.asm;uses:="org.mvel2.i
- ntegration,org.mvel2.optimizers.impl.refl.nodes,org.mvel2.util,org.mv
- el2.asm,org.mvel2.optimizers,org.mvel2,org.mvel2.compiler,org.mvel2.a
- st";version="2.1.0.SNAPSHOT",org.mvel2.optimizers.impl.refl;uses:="or
- g.mvel2.integration,org.mvel2.optimizers.impl.refl.nodes,org.mvel2.ut
- il,org.mvel2.optimizers.impl.refl.collection,org.mvel2.optimizers,org
- .mvel2,org.mvel2.compiler,org.mvel2.ast";version="2.1.0.SNAPSHOT",org
- .mvel2.optimizers.impl.refl.collection;uses:="org.mvel2.integration,o
- rg.mvel2.compiler,org.mvel2,org.mvel2.util";version="2.1.0.SNAPSHOT",
- org.mvel2.optimizers.impl.refl.nodes;uses:="org.mvel2.integration,org
- .mvel2.compiler,org.mvel2,org.mvel2.util,org.mvel2.ast,org.mvel2.opti
- mizers";version="2.1.0.SNAPSHOT",org.mvel2.sh;uses:="org.mvel2,org.mv
- el2.templates,org.mvel2.integration.impl,org.mvel2.integration,org.mv
- el2.util,org.mvel2.sh.command.basic,org.mvel2.sh.command.file";versio
- n="2.1.0.SNAPSHOT",org.mvel2.sh.command.basic;uses:="org.mvel2.sh,org
- .mvel2.sh.text,org.mvel2.util,org.mvel2";version="2.1.0.SNAPSHOT",org
- .mvel2.sh.command.file;uses:="org.mvel2.sh";version="2.1.0.SNAPSHOT",
- org.mvel2.sh.text;version="2.1.0.SNAPSHOT",org.mvel2.templates;uses:=
- "org.mvel2.templates.res,org.mvel2.templates.util,org.mvel2,org.mvel2
- .util,org.mvel2.integration.impl,org.mvel2.integration,org.mvel2.temp
- lates.util.io";version="2.1.0.SNAPSHOT",org.mvel2.templates.res;uses:
- ="org.mvel2.templates,org.mvel2.integration,org.mvel2.templates.util,
- org.mvel2,org.mvel2.integration.impl,org.mvel2.util";version="2.1.0.S
- NAPSHOT",org.mvel2.templates.util;uses:="org.mvel2.templates.res,org.
- mvel2.templates,org.mvel2.util";version="2.1.0.SNAPSHOT",org.mvel2.te
- mplates.util.io;uses:="org.mvel2.templates.util,org.mvel2.util";versi
- on="2.1.0.SNAPSHOT",org.mvel2.util;uses:="org.mvel2.ast,org.mvel2.int
- egration,org.mvel2,org.mvel2.compiler,org.mvel2.integration.impl,org.
- mvel2.math,sun.misc";version="2.1.0.SNAPSHOT"
-Bundle-Version: 2.1.0.SNAPSHOT
-Tool: Bnd-0.0.357
-Bundle-Name: mvel2
-Bnd-LastModified: 1304383604992
-Created-By: 1.6.0_21 (Apple Inc.)
-Bundle-ManifestVersion: 2
-Bundle-SymbolicName: org.mvel2
-Import-Package: org.mvel2;version="2.1",org.mvel2.asm;version="2.1",or
- g.mvel2.asm.signature;version="2.1",org.mvel2.asm.util;version="2.1",
- org.mvel2.ast;version="2.1",org.mvel2.compiler;version="2.1",org.mvel
- 2.conversion;version="2.1",org.mvel2.debug;version="2.1",org.mvel2.in
- tegration;version="2.1",org.mvel2.integration.impl;version="2.1",org.
- mvel2.math;version="2.1",org.mvel2.optimizers;version="2.1",org.mvel2
- .optimizers.dynamic;version="2.1",org.mvel2.optimizers.impl.asm;versi
- on="2.1",org.mvel2.optimizers.impl.refl;version="2.1",org.mvel2.optim
- izers.impl.refl.collection;version="2.1",org.mvel2.optimizers.impl.re
- fl.nodes;version="2.1",org.mvel2.sh;version="2.1",org.mvel2.sh.comman
- d.basic;version="2.1",org.mvel2.sh.command.file;version="2.1",org.mve
- l2.sh.text;version="2.1",org.mvel2.templates;version="2.1",org.mvel2.
- templates.res;version="2.1",org.mvel2.templates.util;version="2.1",or
- g.mvel2.templates.util.io;version="2.1",org.mvel2.util;version="2.1",
- sun.misc;resolution:=optional
-

0 comments on commit a156449

Please sign in to comment.
Something went wrong with that request. Please try again.