You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ode.apache.org by va...@apache.org on 2015/02/25 14:35:33 UTC
[1/2] ode git commit: only gpg sign releases, not snapshots.
Repository: ode
Updated Branches:
refs/heads/master 28dcae93d -> 8580751c8
only gpg sign releases, not snapshots.
Project: http://git-wip-us.apache.org/repos/asf/ode/repo
Commit: http://git-wip-us.apache.org/repos/asf/ode/commit/3bc10edd
Tree: http://git-wip-us.apache.org/repos/asf/ode/tree/3bc10edd
Diff: http://git-wip-us.apache.org/repos/asf/ode/diff/3bc10edd
Branch: refs/heads/master
Commit: 3bc10edd93a4a18188d7db61540e002752883135
Parents: 28dcae9
Author: Tammo van Lessen <tv...@gmail.com>
Authored: Wed Feb 25 14:35:13 2015 +0100
Committer: Tammo van Lessen <tv...@gmail.com>
Committed: Wed Feb 25 14:35:13 2015 +0100
----------------------------------------------------------------------
Rakefile | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ode/blob/3bc10edd/Rakefile
----------------------------------------------------------------------
diff --git a/Rakefile b/Rakefile
index 5a023fe..a8702c7 100644
--- a/Rakefile
+++ b/Rakefile
@@ -21,7 +21,6 @@ require "buildr/openjpa"
require "buildr/javacc"
require "buildr/jetty"
require "buildr/hibernate"
-require "buildr/gpg"
require File.join(File.dirname(__FILE__), 'repositories.rb')
require File.join(File.dirname(__FILE__), 'dependencies.rb')
@@ -41,13 +40,17 @@ Java.classpath << Buildr::OpenJPA::REQUIRES
# Keep this structure to allow the build system to update version numbers.
VERSION_NUMBER = "1.4-SNAPSHOT"
-# Apache Nexus Repositories
+# if SNAPSHOT version...
if VERSION_NUMBER =~ /SNAPSHOT/
+ # ... deploy to:
# Apache Development Snapshot Repository
repositories.release_to[:url] = 'https://repository.apache.org/content/repositories/snapshots'
else
+ # ... else deploy to:
# Apache Release Distribution Repository
repositories.release_to[:url] = 'https://repository.apache.org/service/local/staging/deploy/maven2'
+ # and make sure artifacts are signed.
+ require "buildr/gpg"
end
BUNDLE_VERSIONS = {
[2/2] ode git commit: remove warning.
Posted by va...@apache.org.
remove warning.
Project: http://git-wip-us.apache.org/repos/asf/ode/repo
Commit: http://git-wip-us.apache.org/repos/asf/ode/commit/8580751c
Tree: http://git-wip-us.apache.org/repos/asf/ode/tree/8580751c
Diff: http://git-wip-us.apache.org/repos/asf/ode/diff/8580751c
Branch: refs/heads/master
Commit: 8580751c8aa858ede764a8c5da46118c382a0be0
Parents: 3bc10ed
Author: Tammo van Lessen <tv...@gmail.com>
Authored: Wed Feb 25 14:35:20 2015 +0100
Committer: Tammo van Lessen <tv...@gmail.com>
Committed: Wed Feb 25 14:35:20 2015 +0100
----------------------------------------------------------------------
Rakefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ode/blob/8580751c/Rakefile
----------------------------------------------------------------------
diff --git a/Rakefile b/Rakefile
index a8702c7..67fd19e 100644
--- a/Rakefile
+++ b/Rakefile
@@ -565,7 +565,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*, !org.apache.ode*, javax.jbi*;version="1.0", javax.transaction*;version="[1.1,1.2)", javax.xml.stream;version="[1.0,2)", org.apache.axiom*;resolution:=optional, org.apache.axis2*;resolution:=optional, org.apache.commons.beanutils;version="[1.8,2)", org.apache.commons.collections*;version="[3.2,4)", org.apache.commons.httpclient*;resolution:=optional, org.apache.commons.io;version="[1.4,2)", org.apache.commons.lang;version="[2.4,3)", org.apache.commons.logging*;version="[1.1,1.2)", org.apache.derby.jdbc;resolution:=optional, org.apache.geronimo.transaction.manager;version="[2,3)", org.apache.openjpa.jdbc.kernel;version="1.2.1", org.springframework.osgi.service.exporter.support, org.osgi.service.cm, org.springframework.osgi.compendium.cm, com.ibm.wsdl*;version="[1.6,2)", org.apache.xmlbeans.impl.schema;version="[2.5,3)", org.apache.xmlbeans*;version="[2.5,3)", org.hibernate*;resolution:=optional, org.hsqldb.jdb
c;resolution:=optional, org.osgi.framework;version="[1.5,2)", org.osgi.util.tracker;version="[1.4,2)", org.springframework.beans.factory*;version="[2.5,4)", org.springframework.context*;version="[2.5,4)", org.springframework.osgi.context;version="[1.2,2)", net.sf.saxon.event;version="[9.1,9.2)", net.sf.saxon*;version="[9.1,9.2)",javax.wsdl*;version="[1.2,2)",javax.resource*;version="[1.5, 2]",org.apache.geronimo.connector.outbound*;version="[2.1,3)",org.apache.log4j*;version="[1.2,2)",org.apache.openjpa*;version="[1.2,2)",*'
+ bnd['Import-Package'] = '!org.apache.axis2.client*, !org.apache.ode*, javax.jbi*;version="1.0", javax.transaction*;version="[1.1,1.2)", javax.xml.stream;version="[1.0,2)", org.apache.axiom*;resolution:=optional, org.apache.axis2*;resolution:=optional, org.apache.commons.beanutils;version="[1.8,2)", org.apache.commons.collections*;version="[3.2,4)", org.apache.commons.httpclient*;resolution:=optional, org.apache.commons.io;version="[1.4,2)", org.apache.commons.lang;version="[2.4,3)", org.apache.commons.logging*;version="[1.1,1.2)", org.apache.derby.jdbc;resolution:=optional, org.apache.geronimo.transaction.manager;version="[2,3)", org.apache.openjpa.jdbc.kernel;version="1.2.1", org.springframework.osgi.service.exporter.support, org.osgi.service.cm, org.springframework.osgi.compendium.cm, com.ibm.wsdl*;version="[1.6,2)", org.apache.xmlbeans.impl.schema;version="[2.5,3)", org.apache.xmlbeans*;version="[2.5,3)", org.hibernate*;resolution:=optional, org.hsqldb.jdbc;resolution:=opti
onal, org.osgi.framework;version="[1.5,2)", org.osgi.util.tracker;version="[1.4,2)", org.springframework.beans.factory*;version="[2.5,4)", org.springframework.context*;version="[2.5,4)", org.springframework.osgi.context;version="[1.2,2)", net.sf.saxon.event;version="[9.1,9.2)", net.sf.saxon*;version="[9.1,9.2)",javax.wsdl*;version="[1.2,2)",javax.resource*;version="[1.5, 2]",org.apache.geronimo.connector.outbound*;version="[2.1,3)",org.apache.log4j*;version="[1.2,2)",org.apache.openjpa*;version="[1.2,2)",*'
bnd['Embed-Dependency'] = '*;inline=**.xsd|schemaorg_apache_xmlbeans/**|**.xml'
bnd['DynamicImport-Package'] = '*'
bnd['Include-Resource'] = [embedres, _('src/main/resources'), inlines].flatten.join(', ')