You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by gn...@apache.org on 2015/04/10 15:44:28 UTC
[4/5] karaf git commit: Fix build with an empty maven repository
Fix build with an empty maven repository
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/f33eb49e
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/f33eb49e
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/f33eb49e
Branch: refs/heads/master
Commit: f33eb49e6d54eae2c5573d4c1adf02d0a0fdcf0b
Parents: 5b57d50
Author: Guillaume Nodet <gn...@gmail.com>
Authored: Wed Apr 1 10:43:02 2015 +0200
Committer: Guillaume Nodet <gn...@gmail.com>
Committed: Fri Apr 10 15:43:48 2015 +0200
----------------------------------------------------------------------
.../resources/etc/org.ops4j.pax.url.mvn.cfg | 3 ++-
assemblies/features/enterprise/pom.xml | 8 +++++++
assemblies/features/standard/pom.xml | 8 +++++++
pom.xml | 23 ++++++++++++++++++++
.../features/VerifyFeatureResolutionMojo.java | 23 ++++++++++++++++++--
5 files changed, 62 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/f33eb49e/assemblies/features/base/src/main/resources/resources/etc/org.ops4j.pax.url.mvn.cfg
----------------------------------------------------------------------
diff --git a/assemblies/features/base/src/main/resources/resources/etc/org.ops4j.pax.url.mvn.cfg b/assemblies/features/base/src/main/resources/resources/etc/org.ops4j.pax.url.mvn.cfg
index 79b15f8..3f675df 100644
--- a/assemblies/features/base/src/main/resources/resources/etc/org.ops4j.pax.url.mvn.cfg
+++ b/assemblies/features/base/src/main/resources/resources/etc/org.ops4j.pax.url.mvn.cfg
@@ -97,4 +97,5 @@ org.ops4j.pax.url.mvn.repositories= \
http://zodiac.springsource.com/maven/bundles/release@id=gemini, \
http://repository.apache.org/content/groups/snapshots-group@id=apache@snapshots@noreleases, \
https://oss.sonatype.org/content/repositories/snapshots@id=sonatype.snapshots.deploy@snapshots@noreleases, \
- https://oss.sonatype.org/content/repositories/ops4j-snapshots@id=ops4j.sonatype.snapshots.deploy@snapshots@noreleases
+ https://oss.sonatype.org/content/repositories/ops4j-snapshots@id=ops4j.sonatype.snapshots.deploy@snapshots@noreleases, \
+ http://repository.springsource.com/maven/bundles/external@id=spring-ebr-repository@snapshots@noreleases
http://git-wip-us.apache.org/repos/asf/karaf/blob/f33eb49e/assemblies/features/enterprise/pom.xml
----------------------------------------------------------------------
diff --git a/assemblies/features/enterprise/pom.xml b/assemblies/features/enterprise/pom.xml
index 860a5d0..16b1fec 100644
--- a/assemblies/features/enterprise/pom.xml
+++ b/assemblies/features/enterprise/pom.xml
@@ -187,6 +187,14 @@
<artifactId>org.apache.karaf.subsystem.core</artifactId>
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>org.ops4j.pax.cdi</groupId>
+ <artifactId>pax-cdi-features</artifactId>
+ <version>${pax.cdi.version}</version>
+ <classifier>features</classifier>
+ <type>xml</type>
+ <scope>provided</scope>
+ </dependency>
</dependencies>
<build>
http://git-wip-us.apache.org/repos/asf/karaf/blob/f33eb49e/assemblies/features/standard/pom.xml
----------------------------------------------------------------------
diff --git a/assemblies/features/standard/pom.xml b/assemblies/features/standard/pom.xml
index ef3e1cb..564caca 100644
--- a/assemblies/features/standard/pom.xml
+++ b/assemblies/features/standard/pom.xml
@@ -421,6 +421,14 @@
<artifactId>org.apache.karaf.scr.management</artifactId>
<scope>provided</scope>
</dependency>
+
+ <!-- jolokia -->
+ <dependency>
+ <groupId>org.jolokia</groupId>
+ <artifactId>jolokia-osgi</artifactId>
+ <version>${jolokia.version}</version>
+ <scope>provided</scope>
+ </dependency>
</dependencies>
<build>
http://git-wip-us.apache.org/repos/asf/karaf/blob/f33eb49e/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 03ab99d..74e9d13 100644
--- a/pom.xml
+++ b/pom.xml
@@ -353,6 +353,29 @@
<enabled>true</enabled>
</snapshots>
</repository>
+ <repository>
+ <id>ops4j.snapshots</id>
+ <name>OPS4j Snapshots</name>
+ <url>https://oss.sonatype.org/content/repositories/ops4j-snapshots/</url>
+ <releases>
+ <enabled>false</enabled>
+ </releases>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ </repository>
+ <!-- Jolokia snapshots -->
+ <repository>
+ <id>labs-consol-snapshot</id>
+ <name>ConSol* Labs Repository (Snapshots)</name>
+ <url>http://labs.consol.de/maven/snapshots-repository</url>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ <releases>
+ <enabled>false</enabled>
+ </releases>
+ </repository>
</repositories>
<pluginRepositories>
<!-- Apache snapshots -->
http://git-wip-us.apache.org/repos/asf/karaf/blob/f33eb49e/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/features/VerifyFeatureResolutionMojo.java
----------------------------------------------------------------------
diff --git a/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/features/VerifyFeatureResolutionMojo.java b/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/features/VerifyFeatureResolutionMojo.java
index 558bd3b..902b87a 100644
--- a/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/features/VerifyFeatureResolutionMojo.java
+++ b/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/features/VerifyFeatureResolutionMojo.java
@@ -157,10 +157,17 @@ public class VerifyFeatureResolutionMojo extends MojoSupport {
}
remote.append(invoke(obj, "getUrl"));
remote.append("@id=").append(invoke(obj, "getId"));
+ if (!((Boolean) invoke(getPolicy(obj, false), "isEnabled"))) {
+ remote.append("@noreleases");
+ }
+ if ((Boolean) invoke(getPolicy(obj, true), "isEnabled")) {
+ remote.append("@snapshots");
+ }
}
- config.put("remoteRepositories", remote.toString());
+ getLog().info("Using repositories: " + remote.toString());
+ config.put("maven.repositories", remote.toString());
// TODO: add more configuration bits ?
- resolver = MavenResolvers.createMavenResolver(config, null);
+ resolver = MavenResolvers.createMavenResolver(config, "maven");
doExecute();
}
@@ -172,6 +179,18 @@ public class VerifyFeatureResolutionMojo extends MojoSupport {
}
}
+ private Object getPolicy(Object object, boolean snapshots) throws MojoExecutionException {
+ return invoke(object, "getPolicy", new Class[] { Boolean.TYPE }, new Object[] { snapshots });
+ }
+
+ private Object invoke(Object object, String getter, Class[] types, Object[] params) throws MojoExecutionException {
+ try {
+ return object.getClass().getMethod(getter, types).invoke(object, params);
+ } catch (Exception e) {
+ throw new MojoExecutionException("Unable to build remote repository from " + object.toString(), e);
+ }
+ }
+
protected void doExecute() throws MojoExecutionException, MojoFailureException {
System.setProperty("karaf.home", "target/karaf");
System.setProperty("karaf.data", "target/karaf/data");