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 2020/01/05 15:58:18 UTC
[karaf] branch karaf-3.0.x updated: Quick build fix
This is an automated email from the ASF dual-hosted git repository.
jbonofre pushed a commit to branch karaf-3.0.x
in repository https://gitbox.apache.org/repos/asf/karaf.git
The following commit(s) were added to refs/heads/karaf-3.0.x by this push:
new c5ce367 Quick build fix
c5ce367 is described below
commit c5ce367d7e5924677a0437f386966be7c3fd2347
Author: Jean-Baptiste Onofré <jb...@apache.org>
AuthorDate: Sun Jan 5 16:58:02 2020 +0100
Quick build fix
---
tooling/karaf-maven-plugin/pom.xml | 1 +
.../src/it/test-aggregate-features/aggregate-features/pom.xml | 2 +-
.../src/it/test-check-dependencies/dependencies-features/pom.xml | 2 +-
.../src/it/test-feature-dependencies/dependencies-features/pom.xml | 2 +-
.../src/it/test-feature-dependencies/dependency-feature-a/pom.xml | 2 +-
.../src/it/test-feature-dependencies/dependency-feature-c/pom.xml | 2 +-
.../karaf-maven-plugin/src/it/test-include-project-artifact/pom.xml | 3 ++-
7 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/tooling/karaf-maven-plugin/pom.xml b/tooling/karaf-maven-plugin/pom.xml
index 8692fe7..f198b05 100644
--- a/tooling/karaf-maven-plugin/pom.xml
+++ b/tooling/karaf-maven-plugin/pom.xml
@@ -205,6 +205,7 @@
<goals>
<goal>install</goal>
</goals>
+ <mavenOpts>-Dhttps.protocols=TLSv1.2</mavenOpts>
</configuration>
<executions>
<execution>
diff --git a/tooling/karaf-maven-plugin/src/it/test-aggregate-features/aggregate-features/pom.xml b/tooling/karaf-maven-plugin/src/it/test-aggregate-features/aggregate-features/pom.xml
index e46bb4f..371b30b 100644
--- a/tooling/karaf-maven-plugin/src/it/test-aggregate-features/aggregate-features/pom.xml
+++ b/tooling/karaf-maven-plugin/src/it/test-aggregate-features/aggregate-features/pom.xml
@@ -32,7 +32,7 @@
<artifactId>aggregate-features</artifactId>
<version>1.0-SNAPSHOT</version>
- <packaging>feature</packaging>
+ <packaging>pom</packaging>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
diff --git a/tooling/karaf-maven-plugin/src/it/test-check-dependencies/dependencies-features/pom.xml b/tooling/karaf-maven-plugin/src/it/test-check-dependencies/dependencies-features/pom.xml
index d6f8506..7911dec 100644
--- a/tooling/karaf-maven-plugin/src/it/test-check-dependencies/dependencies-features/pom.xml
+++ b/tooling/karaf-maven-plugin/src/it/test-check-dependencies/dependencies-features/pom.xml
@@ -32,7 +32,7 @@
<artifactId>check-dependencies-features</artifactId>
<version>1.0-SNAPSHOT</version>
- <packaging>feature</packaging>
+ <packaging>pom</packaging>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
diff --git a/tooling/karaf-maven-plugin/src/it/test-feature-dependencies/dependencies-features/pom.xml b/tooling/karaf-maven-plugin/src/it/test-feature-dependencies/dependencies-features/pom.xml
index 3b232ab..e8bd859 100644
--- a/tooling/karaf-maven-plugin/src/it/test-feature-dependencies/dependencies-features/pom.xml
+++ b/tooling/karaf-maven-plugin/src/it/test-feature-dependencies/dependencies-features/pom.xml
@@ -32,7 +32,7 @@
<artifactId>dependencies-features</artifactId>
<version>1.0-SNAPSHOT</version>
- <packaging>feature</packaging>
+ <packaging>pom</packaging>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
diff --git a/tooling/karaf-maven-plugin/src/it/test-feature-dependencies/dependency-feature-a/pom.xml b/tooling/karaf-maven-plugin/src/it/test-feature-dependencies/dependency-feature-a/pom.xml
index d11c7ee..884d697 100644
--- a/tooling/karaf-maven-plugin/src/it/test-feature-dependencies/dependency-feature-a/pom.xml
+++ b/tooling/karaf-maven-plugin/src/it/test-feature-dependencies/dependency-feature-a/pom.xml
@@ -31,7 +31,7 @@
<groupId>test</groupId>
<artifactId>dependency-feature-a</artifactId>
<version>1.0-SNAPSHOT</version>
- <packaging>feature</packaging>
+ <packaging>pom</packaging>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
diff --git a/tooling/karaf-maven-plugin/src/it/test-feature-dependencies/dependency-feature-c/pom.xml b/tooling/karaf-maven-plugin/src/it/test-feature-dependencies/dependency-feature-c/pom.xml
index 6717450..4b235b2 100644
--- a/tooling/karaf-maven-plugin/src/it/test-feature-dependencies/dependency-feature-c/pom.xml
+++ b/tooling/karaf-maven-plugin/src/it/test-feature-dependencies/dependency-feature-c/pom.xml
@@ -31,7 +31,7 @@
<groupId>test</groupId>
<artifactId>dependency-feature-c</artifactId>
<version>1.0-SNAPSHOT</version>
- <packaging>feature</packaging>
+ <packaging>pom</packaging>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
diff --git a/tooling/karaf-maven-plugin/src/it/test-include-project-artifact/pom.xml b/tooling/karaf-maven-plugin/src/it/test-include-project-artifact/pom.xml
index 976e5c1..6095c80 100644
--- a/tooling/karaf-maven-plugin/src/it/test-include-project-artifact/pom.xml
+++ b/tooling/karaf-maven-plugin/src/it/test-include-project-artifact/pom.xml
@@ -35,6 +35,7 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
+ <version>2.5.4</version>
<extensions>true</extensions>
</plugin>
<plugin>
@@ -57,4 +58,4 @@
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>