[jboss-svn-commits] JBL Code SVN: r36089 - in labs/jbossrules/trunk: drools-compiler and 9 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Fri Nov 26 13:49:25 EST 2010
Author: ge0ffrey
Date: 2010-11-26 13:49:25 -0500 (Fri, 26 Nov 2010)
New Revision: 36089
Modified:
labs/jbossrules/trunk/drools-compiler/pom.xml
labs/jbossrules/trunk/drools-core/pom.xml
labs/jbossrules/trunk/drools-decisiontables/pom.xml
labs/jbossrules/trunk/drools-flow-compiler/pom.xml
labs/jbossrules/trunk/drools-flow-core/pom.xml
labs/jbossrules/trunk/drools-flow-persistence-jpa/pom.xml
labs/jbossrules/trunk/drools-persistence-jpa/pom.xml
labs/jbossrules/trunk/drools-process/drools-bpmn2/pom.xml
labs/jbossrules/trunk/drools-templates/pom.xml
labs/jbossrules/trunk/osgi-bundles/org.drools.osgi.test/src/test/resources/boot-bundles.properties
labs/jbossrules/trunk/pom.xml
Log:
JBRULES-2806 fix osgi-bundles testcases
Modified: labs/jbossrules/trunk/drools-compiler/pom.xml
===================================================================
--- labs/jbossrules/trunk/drools-compiler/pom.xml 2010-11-26 16:02:02 UTC (rev 36088)
+++ labs/jbossrules/trunk/drools-compiler/pom.xml 2010-11-26 18:49:25 UTC (rev 36089)
@@ -251,7 +251,7 @@
<instructions>
<_removeheaders>Ignore-Package</_removeheaders>
<Bundle-SymbolicName>org.drools.compiler;singleton:=true</Bundle-SymbolicName>
- <Require-Bundle>org.drools.core;visibility:=reexport;bundle-version="${pom.version}"</Require-Bundle>
+ <Require-Bundle>org.drools.core;visibility:=reexport;bundle-version="5.2.0.SNAPSHOT"</Require-Bundle>
<Import-Package>!org.drools.*,
<!-- java compilers are optional: only need one at most -->
org.codehaus.janino.*;resolution:=optional,org.eclipse.jdt.*;resolution:=optional,
Modified: labs/jbossrules/trunk/drools-core/pom.xml
===================================================================
--- labs/jbossrules/trunk/drools-core/pom.xml 2010-11-26 16:02:02 UTC (rev 36088)
+++ labs/jbossrules/trunk/drools-core/pom.xml 2010-11-26 18:49:25 UTC (rev 36089)
@@ -165,7 +165,7 @@
<manifestLocation>META-INF</manifestLocation>
<instructions>
<_removeheaders>Ignore-Package</_removeheaders>
- <Require-Bundle>org.drools.api;visibility:=reexport;bundle-version="${pom.version}"</Require-Bundle>
+ <Require-Bundle>org.drools.api;visibility:=reexport;bundle-version="5.2.0.SNAPSHOT"</Require-Bundle>
<Import-Package>!org.drools.*, *,org.osgi.util.tracker</Import-Package>
<Export-Package>!org.drools.visualize,org.drools.reteoo.*, org.drools.*</Export-Package>
<DynamicImport-Package>*</DynamicImport-Package>
Modified: labs/jbossrules/trunk/drools-decisiontables/pom.xml
===================================================================
--- labs/jbossrules/trunk/drools-decisiontables/pom.xml 2010-11-26 16:02:02 UTC (rev 36088)
+++ labs/jbossrules/trunk/drools-decisiontables/pom.xml 2010-11-26 18:49:25 UTC (rev 36089)
@@ -70,7 +70,7 @@
<instructions>
<Bundle-SymbolicName>org.drools.decisiontables;singleton:=true</Bundle-SymbolicName>
<_removeheaders>Ignore-Package</_removeheaders>
- <Require-Bundle>org.drools.core;bundle-version="${pom.version}"</Require-Bundle>
+ <Require-Bundle>org.drools.core;bundle-version="5.2.0.SNAPSHOT"</Require-Bundle>
<Import-Package>!org.drools.*, *</Import-Package>
<Export-Package>org.drools.*</Export-Package>
<DynamicImport-Package>org.drools.*</DynamicImport-Package>
Modified: labs/jbossrules/trunk/drools-flow-compiler/pom.xml
===================================================================
--- labs/jbossrules/trunk/drools-flow-compiler/pom.xml 2010-11-26 16:02:02 UTC (rev 36088)
+++ labs/jbossrules/trunk/drools-flow-compiler/pom.xml 2010-11-26 18:49:25 UTC (rev 36089)
@@ -92,7 +92,7 @@
<instructions>
<_removeheaders>Ignore-Package</_removeheaders>
<Bundle-SymbolicName>org.drools.flow.compiler;singleton:=true</Bundle-SymbolicName>
- <Require-Bundle>org.drools.flow.core;bundle-version="${pom.version}", org.drools.compiler;bundle-version="${project.version}"</Require-Bundle>
+ <Require-Bundle>org.drools.flow.core;bundle-version="5.2.0.SNAPSHOT", org.drools.compiler;bundle-version="5.2.0.SNAPSHOT"</Require-Bundle>
<Import-Package>!org.drools.*, *</Import-Package>
<Export-Package>org.drools.*</Export-Package>
<DynamicImport-Package>*</DynamicImport-Package>
Modified: labs/jbossrules/trunk/drools-flow-core/pom.xml
===================================================================
--- labs/jbossrules/trunk/drools-flow-core/pom.xml 2010-11-26 16:02:02 UTC (rev 36088)
+++ labs/jbossrules/trunk/drools-flow-core/pom.xml 2010-11-26 18:49:25 UTC (rev 36089)
@@ -87,7 +87,7 @@
<instructions>
<_removeheaders>Ignore-Package</_removeheaders>
<Bundle-SymbolicName>org.drools.flow.core;singleton:=true</Bundle-SymbolicName>
- <Require-Bundle>org.drools.core;bundle-version="${pom.version}"</Require-Bundle>
+ <Require-Bundle>org.drools.core;bundle-version="5.2.0.SNAPSHOT"</Require-Bundle>
<Import-Package>!org.drools.*,
<!-- java compilers are optional: only need one at most -->
org.codehaus.janino.*;resolution:=optional,org.eclipse.jdt.*;resolution:=optional,
Modified: labs/jbossrules/trunk/drools-flow-persistence-jpa/pom.xml
===================================================================
--- labs/jbossrules/trunk/drools-flow-persistence-jpa/pom.xml 2010-11-26 16:02:02 UTC (rev 36088)
+++ labs/jbossrules/trunk/drools-flow-persistence-jpa/pom.xml 2010-11-26 18:49:25 UTC (rev 36089)
@@ -39,7 +39,7 @@
<manifestLocation>META-INF</manifestLocation>
<instructions>
<_removeheaders>Ignore-Package</_removeheaders>
- <Require-Bundle>org.drools.core;bundle-version="${pom.version}", org.drools.compiler;bundle-version="${pom.version}"</Require-Bundle>
+ <Require-Bundle>org.drools.core;bundle-version="5.2.0.SNAPSHOT", org.drools.compiler;bundle-version="5.2.0.SNAPSHOT"</Require-Bundle>
<Import-Package>!org.drools.*, *</Import-Package>
<Export-Package>org.drools.*</Export-Package>
<DynamicImport-Package>*</DynamicImport-Package>
Modified: labs/jbossrules/trunk/drools-persistence-jpa/pom.xml
===================================================================
--- labs/jbossrules/trunk/drools-persistence-jpa/pom.xml 2010-11-26 16:02:02 UTC (rev 36088)
+++ labs/jbossrules/trunk/drools-persistence-jpa/pom.xml 2010-11-26 18:49:25 UTC (rev 36089)
@@ -39,7 +39,7 @@
<manifestLocation>META-INF</manifestLocation>
<instructions>
<_removeheaders>Ignore-Package</_removeheaders>
- <Require-Bundle>org.drools.core;bundle-version="${pom.version}", org.drools.compiler;bundle-version="${pom.version}"</Require-Bundle>
+ <Require-Bundle>org.drools.core;bundle-version="5.2.0.SNAPSHOT", org.drools.compiler;bundle-version="5.2.0.SNAPSHOT"</Require-Bundle>
<Import-Package>!org.drools.*, *</Import-Package>
<Export-Package>org.drools.*</Export-Package>
<DynamicImport-Package>*</DynamicImport-Package>
Modified: labs/jbossrules/trunk/drools-process/drools-bpmn2/pom.xml
===================================================================
--- labs/jbossrules/trunk/drools-process/drools-bpmn2/pom.xml 2010-11-26 16:02:02 UTC (rev 36088)
+++ labs/jbossrules/trunk/drools-process/drools-bpmn2/pom.xml 2010-11-26 18:49:25 UTC (rev 36089)
@@ -41,7 +41,7 @@
<instructions>
<Bundle-SymbolicName>org.drools.bpmn2;singleton:=true</Bundle-SymbolicName>
<_removeheaders>Ignore-Package</_removeheaders>
- <Require-Bundle>org.drools.flow.compiler;bundle-version="${project.version}", org.drools.persistence-jpa;optional="true";bundle-version="${project.version}"</Require-Bundle>
+ <Require-Bundle>org.drools.flow.compiler;bundle-version="5.2.0.SNAPSHOT", org.drools.persistence-jpa;optional="true";bundle-version="5.2.0.SNAPSHOT"</Require-Bundle>
<Import-Package>!org.drools.*, *</Import-Package>
<Export-Package> org.drools.*</Export-Package>
<DynamicImport-Package>*</DynamicImport-Package>
Modified: labs/jbossrules/trunk/drools-templates/pom.xml
===================================================================
--- labs/jbossrules/trunk/drools-templates/pom.xml 2010-11-26 16:02:02 UTC (rev 36088)
+++ labs/jbossrules/trunk/drools-templates/pom.xml 2010-11-26 18:49:25 UTC (rev 36089)
@@ -55,7 +55,7 @@
<instructions>
<Bundle-SymbolicName>org.drools.templates;singleton:=true</Bundle-SymbolicName>
<_removeheaders>Ignore-Package</_removeheaders>
- <Require-Bundle>org.drools.core;bundle-version="${pom.version}"</Require-Bundle>
+ <Require-Bundle>org.drools.core;bundle-version="5.2.0.SNAPSHOT"</Require-Bundle>
<Import-Package>!org.drools.*, *</Import-Package>
<Export-Package>org.drools.*</Export-Package>
<DynamicImport-Package>org.drools.*</DynamicImport-Package>
Modified: labs/jbossrules/trunk/osgi-bundles/org.drools.osgi.test/src/test/resources/boot-bundles.properties
===================================================================
--- labs/jbossrules/trunk/osgi-bundles/org.drools.osgi.test/src/test/resources/boot-bundles.properties 2010-11-26 16:02:02 UTC (rev 36088)
+++ labs/jbossrules/trunk/osgi-bundles/org.drools.osgi.test/src/test/resources/boot-bundles.properties 2010-11-26 18:49:25 UTC (rev 36089)
@@ -44,7 +44,7 @@
org.eclipse.equinox.weaving,hook,1.0.0-200905031323
# junit
-org.junit,com.springsource.org.junit,${ignore.junit.version}=
+org.junit,com.springsource.org.junit,${ignore.junit.version}
#commons
@@ -94,7 +94,6 @@
javax.transaction,com.springsource.javax.transaction,1.1.0
javax.xml.stream,com.springsource.javax.xml.stream,1.0.1
javax.xml.bind,com.springsource.javax.xml.bind,2.1.7
-javax.servlet,com.springsource.javax.servlet,2.5.0
javax.jms,com.springsource.javax.jms,1.1.0
#javax.mail,com.springsource.javax.mail,1.4.0
@@ -115,11 +114,11 @@
edu.oswego.cs.concurrent,com.springsource.edu.oswego.cs.dl.util.concurrent,1.3.4
# aop alliance
-org.aopalliance,com.springsource.org.aopalliance,1.0.0=
+org.aopalliance,com.springsource.org.aopalliance,1.0.0
# asm
-org.objectweb.asm,com.springsource.org.objectweb.asm,2.2.3=
-org.objectweb.asm,com.springsource.org.objectweb.asm,1.5.3=
-org.springframework,org.springframework.asm,${ignore.spring.version}=
+org.objectweb.asm,com.springsource.org.objectweb.asm,2.2.3
+org.objectweb.asm,com.springsource.org.objectweb.asm,1.5.3
+org.springframework,org.springframework.asm,${ignore.spring.version}
org.apache.ant,com.springsource.org.apache.tools.ant,1.7.1
@@ -157,43 +156,43 @@
# spring libs
-${ignore.spring.groupId},org.springframework.aop,${ignore.spring.version}=
-#${ignore.spring.groupId},org.springframework.aspects,${ignore.spring.version}=
-${ignore.spring.groupId},org.springframework.beans,${ignore.spring.version}=
-${ignore.spring.groupId},org.springframework.context,${ignore.spring.version}=
-${ignore.spring.groupId},org.springframework.context.support,${ignore.spring.version}=
-${ignore.spring.groupId},org.springframework.core,${ignore.spring.version}=
-${ignore.spring.groupId},org.springframework.expression,${ignore.spring.version}=
-#${ignore.spring.groupId},org.springframework.jdbc,${ignore.spring.version}=
-#${ignore.spring.groupId},org.springframework.orm,${ignore.spring.version}=
-${ignore.spring.groupId},org.springframework.test,${ignore.spring.version}=
-#${ignore.spring.groupId},org.springframework.transaction,${ignore.spring.version}=
-#${ignore.spring.groupId},org.springframework.web,${ignore.spring.version}=
+${ignore.spring.groupId},org.springframework.aop,${ignore.spring.version}
+#${ignore.spring.groupId},org.springframework.aspects,${ignore.spring.version}
+${ignore.spring.groupId},org.springframework.beans,${ignore.spring.version}
+${ignore.spring.groupId},org.springframework.context,${ignore.spring.version}
+${ignore.spring.groupId},org.springframework.context.support,${ignore.spring.version}
+${ignore.spring.groupId},org.springframework.core,${ignore.spring.version}
+${ignore.spring.groupId},org.springframework.expression,${ignore.spring.version}
+#${ignore.spring.groupId},org.springframework.jdbc,${ignore.spring.version}
+#${ignore.spring.groupId},org.springframework.orm,${ignore.spring.version}
+${ignore.spring.groupId},org.springframework.test,${ignore.spring.version}
+#${ignore.spring.groupId},org.springframework.transaction,${ignore.spring.version}
+#${ignore.spring.groupId},org.springframework.web,${ignore.spring.version}
#Security
-#org.springframework.security,org.springframework.security,2.0.0.A=
-#org.springframework.security,org.springframework.security.annotation,2.0.0.A=
+#org.springframework.security,org.springframework.security,2.0.0.A
+#org.springframework.security,org.springframework.security.annotation,2.0.0.A
#org.samba.jcifs,com.springsource.jcifs,1.2.15
#org.apache.commons,com.springsource.org.apache.commons.codec,1.3.0
# spring osgi libs
-${ignore.spring.osgi.groupId},org.springframework.osgi.io,${ignore.spring.osgi.version}=
-${ignore.spring.osgi.groupId},org.springframework.osgi.core,${ignore.spring.osgi.version}=
+${ignore.spring.osgi.groupId},org.springframework.osgi.io,${ignore.spring.osgi.version}
+${ignore.spring.osgi.groupId},org.springframework.osgi.core,${ignore.spring.osgi.version}
#${ignore.spring.osgi.groupId},org.springframework.osgi.extensions.annotation,${ignore.spring.osgi.version}=+15
-${ignore.spring.osgi.groupId},org.springframework.osgi.extender,${ignore.spring.osgi.version}=
-${ignore.spring.osgi.groupId},org.springframework.osgi.test,${ignore.spring.osgi.version}=
+${ignore.spring.osgi.groupId},org.springframework.osgi.extender,${ignore.spring.osgi.version}
+${ignore.spring.osgi.groupId},org.springframework.osgi.test,${ignore.spring.osgi.version}
-com.h2database,com.springsource.org.h2,1.0.71
+com.h2database,com.springsource.org.h2,1.0.71
-org.drools,org.drools.api,${ignore.drools.version}
-org.drools,org.drools.core,${ignore.drools.version}
-org.drools,org.drools.flow.core,${ignore.drools.version}
-org.drools,org.drools.compiler,${ignore.drools.version}
-org.drools,org.drools.flow.compiler,${ignore.drools.version}
-org.drools,org.drools.templates,${ignore.drools.version}
-org.drools,org.drools.decisiontables,${ignore.drools.version}
-org.drools,org.drools.bpmn2,${ignore.drools.version}
+org.drools,drools-api,${ignore.drools.version}
+org.drools,drools-core,${ignore.drools.version}
+org.drools,drools-flow-core,${ignore.drools.version}
+org.drools,drools-compiler,${ignore.drools.version}
+org.drools,drools-flow-compiler,${ignore.drools.version}
+org.drools,drools-templates,${ignore.drools.version}
+org.drools,drools-decisiontables,${ignore.drools.version}
+org.drools,drools-bpmn2,${ignore.drools.version}
#org.drools,org.drools.persistence-jpa,${ignore.drools.version}
Modified: labs/jbossrules/trunk/pom.xml
===================================================================
--- labs/jbossrules/trunk/pom.xml 2010-11-26 16:02:02 UTC (rev 36088)
+++ labs/jbossrules/trunk/pom.xml 2010-11-26 18:49:25 UTC (rev 36089)
@@ -5,9 +5,9 @@
<groupId>org.drools</groupId>
<artifactId>drools</artifactId>
<packaging>pom</packaging>
+ <!-- On updating the version, also look for these variaties for OSGi stuff: "5.2.0.qualifier" and "5.2.0.SNAPSHOT" -->
+ <version>5.2.0-SNAPSHOT</version>
<name>Drools</name>
- <!-- TODO Use -SNAPSHOT instead of .SNAPSHOT (gives problems with building the drools eclipse plugin) -->
- <version>5.2.0-SNAPSHOT</version>
<description>A rule production system</description>
<url>http://www.jboss.com/products/rules</url>
More information about the jboss-svn-commits
mailing list