You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by cs...@apache.org on 2015/03/05 14:54:49 UTC
[1/3] karaf git commit: snapshot version not necessary here
Repository: karaf
Updated Branches:
refs/heads/master ffd2df4f9 -> 205ae3f68
snapshot version not necessary here
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/9e97c4d9
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/9e97c4d9
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/9e97c4d9
Branch: refs/heads/master
Commit: 9e97c4d9dfcb099321d0cb158fce7d7e8dd86a7e
Parents: ffd2df4
Author: Christian Schneider <ch...@die-schneider.net>
Authored: Thu Mar 5 14:52:41 2015 +0100
Committer: Christian Schneider <ch...@die-schneider.net>
Committed: Thu Mar 5 14:52:41 2015 +0100
----------------------------------------------------------------------
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/9e97c4d9/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 0c3797a..ded55d9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -209,7 +209,7 @@
<aries.proxy.api.version>1.0.1</aries.proxy.api.version>
<aries.subsystem.api.version>1.0.0</aries.subsystem.api.version>
<aries.subsystem.core.version>1.1.0</aries.subsystem.core.version>
- <aries.transaction.manager.version>1.1.2-SNAPSHOT</aries.transaction.manager.version>
+ <aries.transaction.manager.version>1.1.1</aries.transaction.manager.version>
<aries.transaction.blueprint.version>1.0.2</aries.transaction.blueprint.version>
<aries.transaction.jdbc.version>2.0.0</aries.transaction.jdbc.version>
<aries.util.version>1.1.0</aries.util.version>
[2/3] karaf git commit: Extracted artifact URI as a constant to make
it more obvious we depend on it
Posted by cs...@apache.org.
Extracted artifact URI as a constant to make it more obvious we depend on it
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/c9301bc2
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/c9301bc2
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/c9301bc2
Branch: refs/heads/master
Commit: c9301bc2c7eb9b6cfb8459c8cede3e81d4a79c87
Parents: 9e97c4d
Author: Christian Schneider <ch...@die-schneider.net>
Authored: Thu Mar 5 14:53:55 2015 +0100
Committer: Christian Schneider <ch...@die-schneider.net>
Committed: Thu Mar 5 14:53:55 2015 +0100
----------------------------------------------------------------------
.../main/java/org/apache/karaf/profile/assembly/Builder.java | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/c9301bc2/profile/src/main/java/org/apache/karaf/profile/assembly/Builder.java
----------------------------------------------------------------------
diff --git a/profile/src/main/java/org/apache/karaf/profile/assembly/Builder.java b/profile/src/main/java/org/apache/karaf/profile/assembly/Builder.java
index 3364dfb..101737e 100644
--- a/profile/src/main/java/org/apache/karaf/profile/assembly/Builder.java
+++ b/profile/src/main/java/org/apache/karaf/profile/assembly/Builder.java
@@ -89,9 +89,12 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import static java.util.jar.JarFile.MANIFEST_NAME;
+import static org.apache.karaf.profile.assembly.Builder.Stage.Startup;
public class Builder {
+ private static final String STATIC_FEATURES_KAR = "mvn:org.apache.karaf.features/static/%s/kar";
+
private static final Logger LOGGER = LoggerFactory.getLogger(Builder.class);
private static final String FEATURES_REPOSITORIES = "featuresRepositories";
@@ -289,9 +292,8 @@ public class Builder {
}
public Builder staticFramework(String version) {
- return this.defaultStage(Stage.Startup)
- .useReferenceUrls()
- .kars(Stage.Startup, true, "mvn:org.apache.karaf.features/static/" + version + "/kar");
+ String staticFeaturesKar = String.format(STATIC_FEATURES_KAR, version);
+ return this.defaultStage(Startup).useReferenceUrls().kars(Startup, true, staticFeaturesKar);
}
public void generateAssembly() throws Exception {
[3/3] karaf git commit: Ignore test as it depends on a profile that
is not available in the build at this point
Posted by cs...@apache.org.
Ignore test as it depends on a profile that is not available in the build at this point
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/205ae3f6
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/205ae3f6
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/205ae3f6
Branch: refs/heads/master
Commit: 205ae3f684d76ea73d79d9208d548e6c500508b1
Parents: c9301bc
Author: Christian Schneider <ch...@die-schneider.net>
Authored: Thu Mar 5 14:54:26 2015 +0100
Committer: Christian Schneider <ch...@die-schneider.net>
Committed: Thu Mar 5 14:54:26 2015 +0100
----------------------------------------------------------------------
.../test/java/org/apache/karaf/profile/assembly/BuilderTest.java | 3 +++
1 file changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/205ae3f6/profile/src/test/java/org/apache/karaf/profile/assembly/BuilderTest.java
----------------------------------------------------------------------
diff --git a/profile/src/test/java/org/apache/karaf/profile/assembly/BuilderTest.java b/profile/src/test/java/org/apache/karaf/profile/assembly/BuilderTest.java
index dc7fbcd..fd49e06 100644
--- a/profile/src/test/java/org/apache/karaf/profile/assembly/BuilderTest.java
+++ b/profile/src/test/java/org/apache/karaf/profile/assembly/BuilderTest.java
@@ -22,11 +22,14 @@ import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.Paths;
+import org.junit.Ignore;
import org.junit.Test;
public class BuilderTest {
+ // TODO This test can not run at this position as it needs the staticFramework kar which is not yet available
@Test
+ @Ignore
public void testBuilder() throws Exception {
Path workDir = Paths.get("target/distrib");