You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by jb...@apache.org on 2013/12/18 09:19:58 UTC

[37/50] [abbrv] git commit: In preparation for the first release: - change the Cave version to 2.3.0-SNAPSHOT - update to Karaf 2.3.2 - update the manual with the filter option description of proxy and populate commands

In preparation for the first release:
- change the Cave version to 2.3.0-SNAPSHOT
- update to Karaf 2.3.2
- update the manual with the filter option description of proxy and populate commands

git-svn-id: https://svn.apache.org/repos/asf/karaf/cave/trunk@1507335 13f79535-47bb-0310-9956-ffa450edef68


Project: http://git-wip-us.apache.org/repos/asf/karaf-cave/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf-cave/commit/882ddf29
Tree: http://git-wip-us.apache.org/repos/asf/karaf-cave/tree/882ddf29
Diff: http://git-wip-us.apache.org/repos/asf/karaf-cave/diff/882ddf29

Branch: refs/heads/master
Commit: 882ddf29f76285dc1e84c56d3f0c63f13311cf09
Parents: b9faac0
Author: jbonofre <jb...@13f79535-47bb-0310-9956-ffa450edef68>
Authored: Fri Jul 26 14:33:36 2013 +0000
Committer: jbonofre <jb...@13f79535-47bb-0310-9956-ffa450edef68>
Committed: Fri Jul 26 14:33:36 2013 +0000

----------------------------------------------------------------------
 README                                                     | 2 +-
 assembly/pom.xml                                           | 2 +-
 client/pom.xml                                             | 2 +-
 manual/pom.xml                                             | 2 +-
 manual/src/main/webapp/user-guide/installation.conf        | 4 ++--
 manual/src/main/webapp/user-guide/populate-repository.conf | 7 +++++++
 manual/src/main/webapp/user-guide/proxy-repository.conf    | 8 +++++++-
 pom.xml                                                    | 4 ++--
 server/api/pom.xml                                         | 2 +-
 server/command/pom.xml                                     | 2 +-
 server/http/pom.xml                                        | 2 +-
 server/management/pom.xml                                  | 2 +-
 server/pom.xml                                             | 2 +-
 server/storage/pom.xml                                     | 2 +-
 14 files changed, 28 insertions(+), 15 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/karaf-cave/blob/882ddf29/README
----------------------------------------------------------------------
diff --git a/README b/README
index c50d958..b143dc9 100644
--- a/README
+++ b/README
@@ -47,7 +47,7 @@ BUILDING for instructions on building Apache Karaf Cave.
 
 To install Apache Karaf Cave, first you have to register the Cave features descriptor:
 
-karaf@root> features:addurl mvn:org.apache.karaf.cave/apache-karaf-cave/3.0.0-SNAPSHOT/xml/features
+karaf@root> features:addurl mvn:org.apache.karaf.cave/apache-karaf-cave/2.3.0-SNAPSHOT/xml/features
 
 Now, you can install the Cave feature simply by typing:
 

http://git-wip-us.apache.org/repos/asf/karaf-cave/blob/882ddf29/assembly/pom.xml
----------------------------------------------------------------------
diff --git a/assembly/pom.xml b/assembly/pom.xml
index 88f569a..349e804 100644
--- a/assembly/pom.xml
+++ b/assembly/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.apache.karaf</groupId>
         <artifactId>cave</artifactId>
-        <version>3.0.0-SNAPSHOT</version>
+        <version>2.3.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

http://git-wip-us.apache.org/repos/asf/karaf-cave/blob/882ddf29/client/pom.xml
----------------------------------------------------------------------
diff --git a/client/pom.xml b/client/pom.xml
index 0e2e50b..019baa7 100644
--- a/client/pom.xml
+++ b/client/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.apache.karaf</groupId>
         <artifactId>cave</artifactId>
-        <version>3.0.0-SNAPSHOT</version>
+        <version>2.3.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

http://git-wip-us.apache.org/repos/asf/karaf-cave/blob/882ddf29/manual/pom.xml
----------------------------------------------------------------------
diff --git a/manual/pom.xml b/manual/pom.xml
index 93bbf29..55bb1b8 100644
--- a/manual/pom.xml
+++ b/manual/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.apache.karaf</groupId>
         <artifactId>cave</artifactId>
-        <version>3.0.0-SNAPSHOT</version>
+        <version>2.3.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

http://git-wip-us.apache.org/repos/asf/karaf-cave/blob/882ddf29/manual/src/main/webapp/user-guide/installation.conf
----------------------------------------------------------------------
diff --git a/manual/src/main/webapp/user-guide/installation.conf b/manual/src/main/webapp/user-guide/installation.conf
index 18dd32b..82ab4d2 100644
--- a/manual/src/main/webapp/user-guide/installation.conf
+++ b/manual/src/main/webapp/user-guide/installation.conf
@@ -16,14 +16,14 @@ Karaf Cave is provided as a Karaf features XML descriptor.
 Simply register the Cave features URL in your Karaf instance:
 
 {code}
-karaf@root> features:addurl mvn:org.apache.karaf.cave/apache-karaf-cave/3.0.0-SNAPSHOT/xml/features
+karaf@root> features:addurl mvn:org.apache.karaf.cave/apache-karaf-cave/2.3.0-SNAPSHOT/xml/features
 {code}
 
 Now you have Cave features available in your Karaf instance:
 
 {code}
 karaf@root> features:list|grep -i cave
-[uninstalled] [3.0.0-SNAPSHOT ] cave-server                   repo-0
+[uninstalled] [2.3.0-SNAPSHOT ] cave-server                   repo-0
 {code}
 
 h3. Starting Cave OBR Server

http://git-wip-us.apache.org/repos/asf/karaf-cave/blob/882ddf29/manual/src/main/webapp/user-guide/populate-repository.conf
----------------------------------------------------------------------
diff --git a/manual/src/main/webapp/user-guide/populate-repository.conf b/manual/src/main/webapp/user-guide/populate-repository.conf
index f94e76f..7faef1a 100644
--- a/manual/src/main/webapp/user-guide/populate-repository.conf
+++ b/manual/src/main/webapp/user-guide/populate-repository.conf
@@ -41,6 +41,13 @@ karaf@root> cave:populate-repository cave-repo http://repo1.maven.org/maven2
 WARNING: the Central Maven Repository is really huge and populating from the whole Maven Central Repository will take
 very very long time. It's just for demonstration purpose.
 
+You can filter the artifacts that you want to pick up to populate the repository. The cave:populate-repository command accepts
+a regex option for the filter. For instance, to pick up only joda-time version 2 artifact, you can run:
+
+{code}
+cave:populate-repository --filter .*joda-time-2.* cave-repo http://repo2.maven.org/maven2/joda-time/joda-time
+{code}
+
 The cave:populate-repository command doesn't update the OBR metadata. You have to run:
 
 {code}

http://git-wip-us.apache.org/repos/asf/karaf-cave/blob/882ddf29/manual/src/main/webapp/user-guide/proxy-repository.conf
----------------------------------------------------------------------
diff --git a/manual/src/main/webapp/user-guide/proxy-repository.conf b/manual/src/main/webapp/user-guide/proxy-repository.conf
index fce049a..c8b9b85 100644
--- a/manual/src/main/webapp/user-guide/proxy-repository.conf
+++ b/manual/src/main/webapp/user-guide/proxy-repository.conf
@@ -12,4 +12,10 @@ karaf@root> cave:proxy-repository cave-repo http://repo1.maven.org/maven2/org/ap
 NB: the Cave Repository will only handle the OBR metadata, it doesn't monitor the remote repository. It means that you
 have to call cave:proxy-repository command each time that the remote repository change (new artifact, etc).
 
-NB: a best practice is to create a Cave Repository dedicated for each proxied repository.
\ No newline at end of file
+NB: a best practice is to create a Cave Repository dedicated for each proxied repository.
+
+The cave:proxy-repository command accepts the filter option, as the cave:populate-repository command:
+
+{code}
+cave:proxy-repository --filter .*joda-time-2.* cave-repo http://repo2.maven.org/maven2/joda-time/joda-time
+{code}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/karaf-cave/blob/882ddf29/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index fd54cdf..2409176 100644
--- a/pom.xml
+++ b/pom.xml
@@ -30,7 +30,7 @@
 
     <groupId>org.apache.karaf</groupId>
     <artifactId>cave</artifactId>
-    <version>3.0.0-SNAPSHOT</version>
+    <version>2.3.0-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>Apache Karaf :: Cave</name>
 
@@ -40,7 +40,7 @@
         <felix.bundlerepository.version>1.6.6</felix.bundlerepository.version>
         <httpclient.version>4.2.1</httpclient.version>
         <jsoup.version>1.7.1</jsoup.version>
-        <karaf.version>2.3.0</karaf.version>
+        <karaf.version>2.3.2</karaf.version>
         <osgi.version>4.3.0</osgi.version>
         <wagon.version>1.0</wagon.version>
     </properties>

http://git-wip-us.apache.org/repos/asf/karaf-cave/blob/882ddf29/server/api/pom.xml
----------------------------------------------------------------------
diff --git a/server/api/pom.xml b/server/api/pom.xml
index 85ec4e3..7da9a96 100644
--- a/server/api/pom.xml
+++ b/server/api/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.apache.karaf.cave</groupId>
         <artifactId>org.apache.karaf.cave.server</artifactId>
-        <version>3.0.0-SNAPSHOT</version>
+        <version>2.3.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

http://git-wip-us.apache.org/repos/asf/karaf-cave/blob/882ddf29/server/command/pom.xml
----------------------------------------------------------------------
diff --git a/server/command/pom.xml b/server/command/pom.xml
index 7b59dcd..73f7559 100644
--- a/server/command/pom.xml
+++ b/server/command/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.apache.karaf.cave</groupId>
         <artifactId>org.apache.karaf.cave.server</artifactId>
-        <version>3.0.0-SNAPSHOT</version>
+        <version>2.3.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

http://git-wip-us.apache.org/repos/asf/karaf-cave/blob/882ddf29/server/http/pom.xml
----------------------------------------------------------------------
diff --git a/server/http/pom.xml b/server/http/pom.xml
index 33b4abf..8ac5f43 100644
--- a/server/http/pom.xml
+++ b/server/http/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.apache.karaf.cave</groupId>
         <artifactId>org.apache.karaf.cave.server</artifactId>
-        <version>3.0.0-SNAPSHOT</version>
+        <version>2.3.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

http://git-wip-us.apache.org/repos/asf/karaf-cave/blob/882ddf29/server/management/pom.xml
----------------------------------------------------------------------
diff --git a/server/management/pom.xml b/server/management/pom.xml
index df7e97d..10628b6 100644
--- a/server/management/pom.xml
+++ b/server/management/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.apache.karaf.cave</groupId>
         <artifactId>org.apache.karaf.cave.server</artifactId>
-        <version>3.0.0-SNAPSHOT</version>
+        <version>2.3.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

http://git-wip-us.apache.org/repos/asf/karaf-cave/blob/882ddf29/server/pom.xml
----------------------------------------------------------------------
diff --git a/server/pom.xml b/server/pom.xml
index b8045a8..4258743 100644
--- a/server/pom.xml
+++ b/server/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.apache.karaf</groupId>
         <artifactId>cave</artifactId>
-        <version>3.0.0-SNAPSHOT</version>
+        <version>2.3.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

http://git-wip-us.apache.org/repos/asf/karaf-cave/blob/882ddf29/server/storage/pom.xml
----------------------------------------------------------------------
diff --git a/server/storage/pom.xml b/server/storage/pom.xml
index 593ba53..8b9f9be 100644
--- a/server/storage/pom.xml
+++ b/server/storage/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.apache.karaf.cave</groupId>
         <artifactId>org.apache.karaf.cave.server</artifactId>
-        <version>3.0.0-SNAPSHOT</version>
+        <version>2.3.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>