Author: jawi
Date: Tue Jan 26 16:58:57 2016
New Revision: 1726845
URL: http://svn.apache.org/viewvc?rev=1726845&view=rev
Log:
ACE-524 - make sure Bnd uses the right repository:
- use non-OSGi artifacts in the same was as Bnd uses its "buildrepo", making it
no longer necessary to generate index files;
- for this to work, some artifacts had to be named a little bit different to
get Bnd to recognize its version properly;
- removed some obsolete build artifacts (no longer or even never used).
Added:
ace/trunk/cnf/lib/aopalliance/aopalliance-1.0.0.jar
- copied unchanged from r1726844,
ace/trunk/cnf/lib/aopalliance/aopalliance-1.0.jar
ace/trunk/cnf/lib/bcprov.jdk14/
- copied from r1726844, ace/trunk/cnf/lib/bcprov-jdk14/
ace/trunk/cnf/lib/bcprov.jdk14/bcprov.jdk14-1.40.0.jar
- copied unchanged from r1726821,
ace/trunk/cnf/lib/bcprov-jdk14/bcprov-jdk14-1.40.jar
ace/trunk/cnf/lib/jsr250.api/
- copied from r1726844, ace/trunk/cnf/lib/jsr250-api/
ace/trunk/cnf/lib/jsr250.api/jsr250.api-1.0.0.jar
- copied unchanged from r1726821,
ace/trunk/cnf/lib/jsr250-api/jsr250-api-1.0.jar
ace/trunk/cnf/lib/oauth/oauth-2010.5.27.jar
- copied unchanged from r1726844,
ace/trunk/cnf/lib/oauth/oauth-20100527.jar
ace/trunk/cnf/lib/xpp3/xpp3-1.1.4.jar
- copied unchanged from r1726844, ace/trunk/cnf/lib/xpp3/xpp3-1.1.4.c.jar
Removed:
ace/trunk/cnf/buildrepo/ee.foundation/
ace/trunk/cnf/buildrepo/ee.minimum/
ace/trunk/cnf/buildrepo/org.easymock/org.easymock-latest.jar
ace/trunk/cnf/buildrepo/org.osgi.ee.foundation/
ace/trunk/cnf/buildrepo/org.osgi.ee.minimum/
ace/trunk/cnf/buildrepo/osgi.core/osgi.core-4.2.0.jar
ace/trunk/cnf/lib/aopalliance/aopalliance-1.0.jar
ace/trunk/cnf/lib/bcprov-jdk14/
ace/trunk/cnf/lib/bcprov.jdk14/bcprov-jdk14-1.40.jar
ace/trunk/cnf/lib/index.xml.gz
ace/trunk/cnf/lib/jsr250-api/
ace/trunk/cnf/lib/jsr250.api/jsr250-api-1.0.jar
ace/trunk/cnf/lib/oauth/oauth-20100527.jar
ace/trunk/cnf/lib/repository.xml
ace/trunk/cnf/lib/xpp3/xpp3-1.1.4.c.jar
ace/trunk/cnf/src/org/
ace/trunk/cnf/update-lib.sh
Modified:
ace/trunk/cnf/bnd.bnd
ace/trunk/cnf/ext/repositories.bnd
ace/trunk/org.apache.ace.client.repository/bnd.bnd
ace/trunk/org.apache.ace.nodelauncher/bnd.bnd
Modified: ace/trunk/cnf/bnd.bnd
URL:
http://svn.apache.org/viewvc/ace/trunk/cnf/bnd.bnd?rev=1726845&r1=1726844&r2=1726845&view=diff
==============================================================================
--- ace/trunk/cnf/bnd.bnd (original)
+++ ace/trunk/cnf/bnd.bnd Tue Jan 26 16:58:57 2016
@@ -1,4 +1,4 @@
-nobundles: true
-buildpath: \
- biz.aQute.bnd;version=2.2.0,\
+ biz.aQute.bnd;version=2.4.1,\
org.osgi.impl.bundle.bindex
\ No newline at end of file
Modified: ace/trunk/cnf/ext/repositories.bnd
URL:
http://svn.apache.org/viewvc/ace/trunk/cnf/ext/repositories.bnd?rev=1726845&r1=1726844&r2=1726845&view=diff
==============================================================================
--- ace/trunk/cnf/ext/repositories.bnd (original)
+++ ace/trunk/cnf/ext/repositories.bnd Tue Jan 26 16:58:57 2016
@@ -2,9 +2,10 @@ plugindir: ${workspace}/cnf/plugins
-pluginpath: ${plugindir}/biz.aQute.repository/biz.aQute.repository-2.1.0.jar
--plugin:
aQute.bnd.deployer.repository.LocalIndexedRepo;name=Release;local=${workspace}/cnf/releaserepo;pretty=true,\
+-plugin: \
+
aQute.bnd.deployer.repository.LocalIndexedRepo;name=Release;local=${workspace}/cnf/releaserepo;pretty=true,\
aQute.bnd.deployer.repository.LocalIndexedRepo;name=Local;local=${workspace}/cnf/localrepo;pretty=true,\
- aQute.bnd.deployer.repository.FixedIndexedRepo;name=Library
Repository;locations='file://${build}/lib/index.xml.gz',\
+ aQute.lib.deployer.FileRepo;name=Library
Repository;location=${workspace}/cnf/lib,\
aQute.lib.deployer.FileRepo;name=Build;location=${workspace}/cnf/buildrepo
-releaserepo: Release
Modified: ace/trunk/org.apache.ace.client.repository/bnd.bnd
URL:
http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.client.repository/bnd.bnd?rev=1726845&r1=1726844&r2=1726845&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.client.repository/bnd.bnd (original)
+++ ace/trunk/org.apache.ace.client.repository/bnd.bnd Tue Jan 26 16:58:57 2016
@@ -3,7 +3,7 @@
osgi.core;version=6.0.0,\
osgi.cmpn,\
org.mockito.mockito-all,\
- xpp3;version=1.1.4,\
+ xpp3;version=1.1,\
xstream;version=1.2.2,\
org.apache.velocity-dep;version=1.7.0,\
org.apache.felix.dependencymanager,\
Modified: ace/trunk/org.apache.ace.nodelauncher/bnd.bnd
URL:
http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.nodelauncher/bnd.bnd?rev=1726845&r1=1726844&r2=1726845&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.nodelauncher/bnd.bnd (original)
+++ ace/trunk/org.apache.ace.nodelauncher/bnd.bnd Tue Jan 26 16:58:57 2016
@@ -4,10 +4,9 @@
osgi.cmpn,\
org.apache.felix.dependencymanager,\
org.apache.ace.test;version=latest,\
- aopalliance;version=1.0,\
aws-common;version=1.5.0.beta_6,\
aws-ec2;version=1.5.0.beta_6,\
- bcprov;version=1.46.0,\
+ bcprov.jdk14;version=1.40.0,\
org.apache.commons.io;version=2.0,\
ec2;version=1.5.0.beta_6,\
com.google.gson;version=2.2,\
@@ -23,9 +22,10 @@
jclouds-slf4j;version=1.5.0.beta_6,\
jclouds-sshj;version=1.5.0.beta_6,\
com.sun.jersey.core;version=1.13.0,\
- jsr250-api;version=1.0,\
- jsr305;version=1.3.9,\
- oauth;version=20100527,\
+ jsr305,\
+ aopalliance;version=1.0,\
+ jsr250.api;version=1.0,\
+ oauth;version=2010.5.27,\
rocoto;version=6.1,\
net.schmizz.sshj;version=0.8.1,\
org.apache.ace.webui.vaadin;version=latest,\
