From cweiss@example.net  Mon Jun 20 05:46:08 2011
Return-Path: <cweiss@example.net>
X-Original-To: cweiss@example.net
Delivered-To: cweiss@example.net
Received: from mail.apache.org (hermes.apache.org [83.161.120.155])
	by minotaur.apache.org (Postfix) with SMTP id 7A19E69DC
	for <cweiss@example.net>; Mon, 20 Jun 2011 05:46:08 +0000 (UTC)
Received: (qmail 42812 invoked by uid 500); 20 Jun 2011 05:46:07 -0000
Delivered-To: cweiss@example.net
Received: (qmail 42120 invoked by uid 500); 20 Jun 2011 05:46:02 -0000
Mailing-List: contact cweiss@example.net; run by ezmlm
Precedence: bulk
List-Help: <mailto:cweiss@example.net>
List-Unsubscribe: <mailto:cweiss@example.net>
List-Post: <mailto:cweiss@example.net>
List-Id: <commits.ode.apache.org>
Reply-To: cweiss@example.net
Delivered-To: mailing list cweiss@example.net
Received: (qmail 42112 invoked by uid 99); 20 Jun 2011 05:46:00 -0000
Received: from nike.apache.org (HELO nike.apache.org) (83.161.120.155)
    by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 20 Jun 2011 05:46:00 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=5.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155)
    by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 20 Jun 2011 05:45:57 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id A1A5B2388A3C; Mon, 20 Jun 2011 05:45:36 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1137505 - in /ode/trunk: Rakefile dependencies.rb
Date: Mon, 20 Jun 2011 05:45:36 -0000
To: cweiss@example.net
From: cweiss@example.net
X-Mailer: svnmailer-1.0.8
Message-Id: <cweiss@example.net>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: jeffyu
Date: Mon Jun 20 05:45:36 2011
New Revision: 1137505

URL: http://svn.apache.org/viewvc?rev=1137505&view=rev
Log:
* ODE-917 Applied the Gert Vanthienen's patch, thanks Gert.

Modified:
    ode/trunk/Rakefile
    ode/trunk/dependencies.rb

Modified: ode/trunk/Rakefile
URL: http://svn.apache.org/viewvc/ode/trunk/Rakefile?rev=1137505&r1=1137504&r2=1137505&view=diff
==============================================================================
--- ode/trunk/Rakefile (original)
+++ ode/trunk/Rakefile Mon Jun 20 05:45:36 2011
@@ -58,6 +58,8 @@ BUNDLE_VERSIONS = {
   "servicemix.specs.version" => "1.4-SNAPSHOT",
 }
 
+BND_VERSION_POLICY = "[$(version;==;$(@)),$(version;+;$(@)))"
+
 Release.tag_name = lambda { |version| "APACHE_ODE_#{version.upcase}" } if Release
 
 desc "Apache ODE"
@@ -457,9 +459,10 @@ define "ode" do
       bnd['Bundle-Name'] = "Apache ODE 888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4 Commands"
       bnd['Bundle-Version'] = VERSION_NUMBER
       bnd['Require-Bundle'] = "org.apache.ode.ode-jbi-bundle;bundle-version=#{osgi_version_for(VERSION_NUMBER)}"
-      bnd['Import-Package'] = 'org.osgi.service.command,org.apache.karaf.shell.console;version="[2.1,2.2)",*'
+      bnd['Import-Package'] = 'org.apache.karaf.shell.console,*'
       bnd['Private-Package'] = "org.apache.ode.karaf.commands;version=#{VERSION_NUMBER}"
       bnd['Include-Resource'] = _('src/main/resources')
+      bnd['-versionpolicy'] = BND_VERSION_POLICY
     end
   end
 
@@ -479,6 +482,7 @@ define "ode" do
         bnd['Export-Package'] = ""
         bnd['-exportcontents'] = ""
         bnd['Include-Resource'] = _('src/main/resources')
+        bnd['-versionpolicy'] = BND_VERSION_POLICY
       end
       # we package sources and javadocs separately to give them a custom id
       package(:sources, :id => "helloworld-bundle")
@@ -499,6 +503,7 @@ define "ode" do
         bnd['Import-Package'] = "org.apache.servicemix.cxfbc,org.apache.servicemix.common.osgi"
         bnd['Export-Package'] = "org.apache.ode.ping"
         bnd['Include-Resource'] = _('src/main/resources')
+        bnd['-versionpolicy'] = BND_VERSION_POLICY
       end
       
       # we package sources and javadocs separately to give them a custom id
@@ -565,7 +570,7 @@ define "ode" do
       # embedd *.xsd, *.xml, xmlbeans* from ode libs
       embedres = ode_libs.map {|pkg| ['**.xsd', '**.xml', 'schemaorg_apache_xmlbeans/**'].map {|x| '@' + pkg.to_s + '!/' + x}}.join(', ')
       bnd['Export-Package'] = "org.apache.ode*;version=#{VERSION_NUMBER};-split-package:=merge-first"
-      bnd['Import-Package'] = '!com.sun.mirror*, !org.apache.axis2.client*, javax.jbi*;version="1.0", javax.transaction*;version="1.1", org.tranql.connector.jdbc, org.apache.commons.httpclient*;version="3.0", org.apache.commons.logging*;version="1.1", org.apache.commons*, org.apache.geronimo.transaction.manager;version="2.0", org.osgi.service.command;version="[0.2,1)", org.springframework.beans.factory.xml;version="2.5", org.w3c.dom, org.xml.sax, org.xml.sax.ext, org.xml.sax.helpers, org.jaxen.saxpath,net.sf.saxon.xpath,*;resolution:=optional'
+      bnd['Import-Package'] = '!com.sun.mirror*, !org.apache.axis2.client*, javax.jbi*;version="1.0", javax.transaction*;version="1.1", org.tranql.connector.jdbc, org.apache.commons.httpclient*;version="3.0", org.apache.commons.logging*;version="1.1", org.apache.commons*, org.apache.geronimo.transaction.manager;version="2.0", org.springframework.beans.factory.xml;version="2.5", org.w3c.dom, org.xml.sax, org.xml.sax.ext, org.xml.sax.helpers, org.jaxen.saxpath,net.sf.saxon.xpath,*;resolution:=optional'
       bnd['Embed-Dependency'] = '*;inline=**.xsd|schemaorg_apache_xmlbeans/**|**.xml'
       bnd['DynamicImport-Package'] = '*'
       bnd['Include-Resource'] = [embedres, _('src/main/resources'), inlines].flatten.join(', ')
@@ -573,6 +578,7 @@ define "ode" do
       bnd['Bundle-License'] = 'http://www.apache.org/licenses/LICENSE-2.0'
       bnd['Bundle-DocURL'] = 'http://ode.apache.org'
       bnd['Bundle-Name'] = 'Apache ODE 888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4 BPEL Service Engine'
+      bnd['-versionpolicy'] = BND_VERSION_POLICY
       bnd.classpath = [project.compile.target, bnd_libs, artifacts(project("jbi").package(:jar)), libs].flatten
 
       BUNDLE_VERSIONS.each {|key, value| bnd[key] = value }

Modified: ode/trunk/dependencies.rb
URL: http://svn.apache.org/viewvc/ode/trunk/dependencies.rb?rev=1137505&r1=1137504&r2=1137505&view=diff
==============================================================================
--- ode/trunk/dependencies.rb (original)
+++ ode/trunk/dependencies.rb Mon Jun 20 05:45:36 2011
@@ -43,7 +43,7 @@ AXIS2_MODULES        = struct(
                         "org.apache.santuario:xmlsec:jar:1.4.1",
                         "org.apache.axis2:mex:jar:impl:1.41", #1.41 is not a typo!
                         "opensaml:opensaml:jar:1.1",
-                        "bouncycastle:bcprov-jdk15:jar:132",
+                        "bouncycastle:bcprov-jdk15:jar:133",
                         BACKPORT]
 )
 AXIS2_WAR           = "org.apache.axis2:axis2-webapp:war:1.5"
@@ -93,9 +93,9 @@ JIBX                = "jibx:jibx-run:jar
 KARAF               = [
                         "org.apache.felix:org.osgi.core:jar:1.4.0",
                         "org.apache.felix:org.osgi.compendium:jar:1.4.0",
-                        "org.apache.karaf.shell:org.apache.karaf.shell.console:jar:2.1.3",
-                        group("org.apache.felix.gogo.commands","org.apache.felix.gogo.runtime",
-                          :under=>"org.apache.felix.gogo", :version=>"0.4.0")
+                        "org.apache.karaf.shell:org.apache.karaf.shell.console:jar:2.2.0",
+                        group("org.apache.felix.gogo.command","org.apache.felix.gogo.runtime",
+                          :under=>"org.apache.felix", :version=>"0.6.1")
                       ]
 LOG4J               = "log4j:log4j:jar:1.2.13"
 OPENJPA             = ["org.apache.openjpa:openjpa:jar:1.2.1",




{'source': 'Apache Software Foundation Public Mail Archives'}