You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jclouds.apache.org by an...@apache.org on 2016/10/26 22:39:47 UTC
[1/3] jclouds-cli git commit: Align the startup.properties file with
Karaf 2.3.11
Repository: jclouds-cli
Updated Branches:
refs/heads/master 1ed73848b -> cf1d92f1c
Align the startup.properties file with Karaf 2.3.11
Project: http://git-wip-us.apache.org/repos/asf/jclouds-cli/repo
Commit: http://git-wip-us.apache.org/repos/asf/jclouds-cli/commit/60a93ba7
Tree: http://git-wip-us.apache.org/repos/asf/jclouds-cli/tree/60a93ba7
Diff: http://git-wip-us.apache.org/repos/asf/jclouds-cli/diff/60a93ba7
Branch: refs/heads/master
Commit: 60a93ba76bf2f418be0d658fd4af5b6b760cfb93
Parents: 1ed7384
Author: Andrew Phillips <an...@apache.org>
Authored: Wed Sep 7 00:25:05 2016 -0400
Committer: Andrew Phillips <an...@apache.org>
Committed: Wed Oct 26 18:37:05 2016 -0400
----------------------------------------------------------------------
assembly/src/main/filtered-resources/etc/startup.properties | 7 ++++---
project/pom.xml | 2 +-
2 files changed, 5 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jclouds-cli/blob/60a93ba7/assembly/src/main/filtered-resources/etc/startup.properties
----------------------------------------------------------------------
diff --git a/assembly/src/main/filtered-resources/etc/startup.properties b/assembly/src/main/filtered-resources/etc/startup.properties
index d7f990c..1b3fca7 100644
--- a/assembly/src/main/filtered-resources/etc/startup.properties
+++ b/assembly/src/main/filtered-resources/etc/startup.properties
@@ -39,11 +39,12 @@ org/apache/aries/blueprint/org.apache.aries.blueprint.api/${aries.blueprint.api.
org/apache/aries/blueprint/org.apache.aries.blueprint.core/${aries.blueprint.core.version}/org.apache.aries.blueprint.core-${aries.blueprint.core.version}.jar=20
org/apache/aries/blueprint/org.apache.aries.blueprint.cm/${aries.blueprint.cm.version}/org.apache.aries.blueprint.cm-${aries.blueprint.cm.version}.jar=20
-org/apache/karaf/shell/org.apache.karaf.shell.console/${karaf.version}/org.apache.karaf.shell.console-${karaf.version}.jar=29
+org/apache/karaf/shell/org.apache.karaf.shell.console/${karaf.version}/org.apache.karaf.shell.console-${karaf.version}.jar=25
+
org/apache/karaf/shell/org.apache.karaf.shell.log/${karaf.version}/org.apache.karaf.shell.log-${karaf.version}.jar=30
org/apache/karaf/shell/org.apache.karaf.shell.commands/${karaf.version}/org.apache.karaf.shell.commands-${karaf.version}.jar=30
org/apache/karaf/shell/org.apache.karaf.shell.config/${karaf.version}/org.apache.karaf.shell.config-${karaf.version}.jar=30
-org/apache/karaf/jaas/org.apache.karaf.jaas.config/${karaf.version}/org.apache.karaf.jaas.config-${karaf.version}.jar=28
+org/apache/karaf/jaas/org.apache.karaf.jaas.config/${karaf.version}/org.apache.karaf.jaas.config-${karaf.version}.jar=30
org/apache/karaf/jaas/org.apache.karaf.jaas.modules/${karaf.version}/org.apache.karaf.jaas.modules-${karaf.version}.jar=30
-org/apache/karaf/features/org.apache.karaf.features.core/${karaf.version}/org.apache.karaf.features.core-${karaf.version}.jar=29
+org/apache/karaf/features/org.apache.karaf.features.core/${karaf.version}/org.apache.karaf.features.core-${karaf.version}.jar=30
org/apache/karaf/features/org.apache.karaf.features.command/${karaf.version}/org.apache.karaf.features.command-${karaf.version}.jar=30
http://git-wip-us.apache.org/repos/asf/jclouds-cli/blob/60a93ba7/project/pom.xml
----------------------------------------------------------------------
diff --git a/project/pom.xml b/project/pom.xml
index 5c6b704..b93a36e 100644
--- a/project/pom.xml
+++ b/project/pom.xml
@@ -66,7 +66,7 @@
<properties>
<!-- Karaf Version Dependencies -->
- <karaf.version>2.3.9</karaf.version>
+ <karaf.version>2.3.11</karaf.version>
<pax.url.version>1.3.7</pax.url.version>
<pax.logging.version>1.7.4</pax.logging.version>
<felix.configadmin.version>1.8.0</felix.configadmin.version>
[3/3] jclouds-cli git commit: Remove Guava from the system deps for
the distribution
Posted by an...@apache.org.
Remove Guava from the system deps for the distribution
There are no files matching the filter anyway, so this already be a no-op
in practice.
Project: http://git-wip-us.apache.org/repos/asf/jclouds-cli/repo
Commit: http://git-wip-us.apache.org/repos/asf/jclouds-cli/commit/cf1d92f1
Tree: http://git-wip-us.apache.org/repos/asf/jclouds-cli/tree/cf1d92f1
Diff: http://git-wip-us.apache.org/repos/asf/jclouds-cli/diff/cf1d92f1
Branch: refs/heads/master
Commit: cf1d92f1cac00bb66664df54c15bd91b09fbae68
Parents: 0af97c2
Author: Andrew Phillips <an...@apache.org>
Authored: Wed Sep 7 00:26:46 2016 -0400
Committer: Andrew Phillips <an...@apache.org>
Committed: Wed Oct 26 18:37:59 2016 -0400
----------------------------------------------------------------------
assembly/src/main/assembly/unix.xml | 7 -------
assembly/src/main/assembly/win.xml | 7 -------
2 files changed, 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jclouds-cli/blob/cf1d92f1/assembly/src/main/assembly/unix.xml
----------------------------------------------------------------------
diff --git a/assembly/src/main/assembly/unix.xml b/assembly/src/main/assembly/unix.xml
index 0de1193..095fe62 100644
--- a/assembly/src/main/assembly/unix.xml
+++ b/assembly/src/main/assembly/unix.xml
@@ -138,13 +138,6 @@
<useTransitiveDependencies>false</useTransitiveDependencies>
</dependencySet>
<dependencySet>
- <outputDirectory>/system/com/google/guava/guava/${guava.version}/</outputDirectory>
- <fileMode>0644</fileMode>
- <includes>
- <include>com.google:guava</include>
- </includes>
- </dependencySet>
- <dependencySet>
<outputDirectory>/system/org/apache/jclouds/cli/jclouds-cli-runner/${project.version}/</outputDirectory>
<fileMode>0644</fileMode>
<includes>
http://git-wip-us.apache.org/repos/asf/jclouds-cli/blob/cf1d92f1/assembly/src/main/assembly/win.xml
----------------------------------------------------------------------
diff --git a/assembly/src/main/assembly/win.xml b/assembly/src/main/assembly/win.xml
index bbbdc02..88053f2 100644
--- a/assembly/src/main/assembly/win.xml
+++ b/assembly/src/main/assembly/win.xml
@@ -136,13 +136,6 @@
<useTransitiveDependencies>false</useTransitiveDependencies>
</dependencySet>
<dependencySet>
- <outputDirectory>/system/com/google/guava/guava/${guava.version}/</outputDirectory>
- <fileMode>0644</fileMode>
- <includes>
- <include>com.google:guava</include>
- </includes>
- </dependencySet>
- <dependencySet>
<outputDirectory>/system/org/apache/jclouds/cli/jclouds-cli-runner/${project.version}/</outputDirectory>
<fileMode>0644</fileMode>
<includes>
[2/3] jclouds-cli git commit: Remove a non-existent feature from the
list of features to boot on startup
Posted by an...@apache.org.
Remove a non-existent feature from the list of features to boot on startup
The ConfigAdmin service is automatically loaded already
Project: http://git-wip-us.apache.org/repos/asf/jclouds-cli/repo
Commit: http://git-wip-us.apache.org/repos/asf/jclouds-cli/commit/0af97c24
Tree: http://git-wip-us.apache.org/repos/asf/jclouds-cli/tree/0af97c24
Diff: http://git-wip-us.apache.org/repos/asf/jclouds-cli/diff/0af97c24
Branch: refs/heads/master
Commit: 0af97c24fd6683d85e2aea7fe92ad1afe8cdbfad
Parents: 60a93ba
Author: Andrew Phillips <an...@apache.org>
Authored: Wed Sep 7 00:25:44 2016 -0400
Committer: Andrew Phillips <an...@apache.org>
Committed: Wed Oct 26 18:37:07 2016 -0400
----------------------------------------------------------------------
.../src/main/filtered-resources/etc/org.apache.karaf.features.cfg | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jclouds-cli/blob/0af97c24/assembly/src/main/filtered-resources/etc/org.apache.karaf.features.cfg
----------------------------------------------------------------------
diff --git a/assembly/src/main/filtered-resources/etc/org.apache.karaf.features.cfg b/assembly/src/main/filtered-resources/etc/org.apache.karaf.features.cfg
index d0f6270..728c2b2 100644
--- a/assembly/src/main/filtered-resources/etc/org.apache.karaf.features.cfg
+++ b/assembly/src/main/filtered-resources/etc/org.apache.karaf.features.cfg
@@ -16,4 +16,4 @@
#
featuresRepositories=mvn:org.apache.jclouds.karaf/jclouds-karaf/${jclouds.karaf.version}/xml/features
-featuresBoot=config,jclouds-chef,jclouds-aws-ec2,jclouds-aws-s3
\ No newline at end of file
+featuresBoot=jclouds-chef,jclouds-aws-ec2,jclouds-aws-s3
\ No newline at end of file