karaf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbono...@apache.org
Subject [2/4] karaf git commit: KARAF-3969: fill in missing <javase> in assembly.
Date Wed, 02 Sep 2015 06:00:50 GMT
KARAF-3969: fill in missing <javase> in assembly.


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

Branch: refs/heads/master
Commit: 0732a4d2067c164013b3275c6c178c3571677c93
Parents: c3f7954
Author: Benson Margulies <benson@basistech.com>
Authored: Tue Sep 1 20:24:25 2015 -0400
Committer: Benson Margulies <benson@basistech.com>
Committed: Tue Sep 1 20:24:25 2015 -0400

----------------------------------------------------------------------
 .../src/main/java/org/apache/karaf/tooling/AssemblyMojo.java  | 7 +++++++
 1 file changed, 7 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/karaf/blob/0732a4d2/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/AssemblyMojo.java
----------------------------------------------------------------------
diff --git a/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/AssemblyMojo.java
b/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/AssemblyMojo.java
index e530bc9..eb3381d 100644
--- a/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/AssemblyMojo.java
+++ b/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/AssemblyMojo.java
@@ -160,6 +160,12 @@ public class AssemblyMojo extends MojoSupport {
     @Parameter
     protected Builder.KarafVersion karafVersion = Builder.KarafVersion.v4x;
 
+    /**
+     * Specify the version of Java SE to be assumed for osgi.ee.
+     */
+    @Parameter(defaultValue = "1.7")
+    protected String javase;
+
     @Override
     public void execute() throws MojoExecutionException, MojoFailureException {
         try {
@@ -205,6 +211,7 @@ public class AssemblyMojo extends MojoSupport {
 
         Builder builder = Builder.newInstance();
         builder.offline(mavenSession.isOffline());
+        builder.javase(javase);
 
         // Set up blacklisted items
         builder.blacklistBundles(blacklistedBundles);


Mime
View raw message