karaf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbono...@apache.org
Subject karaf git commit: KARAF-4263 - Upgrade to JDK 1.8 KARAF-4264 - Upgrade to json 20150729, This closes #92
Date Wed, 13 Jan 2016 10:16:57 GMT
Repository: karaf
Updated Branches:
  refs/heads/master 51d254079 -> 68b95fb3d


KARAF-4263 - Upgrade to JDK 1.8
KARAF-4264 - Upgrade to json 20150729, This closes #92


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

Branch: refs/heads/master
Commit: 68b95fb3d85f12ff3fb5c514e1bc693ada1452c8
Parents: 51d2540
Author: Jean-Baptiste Onofré <jbonofre@apache.org>
Authored: Wed Jan 13 11:15:21 2016 +0100
Committer: Jean-Baptiste Onofré <jbonofre@apache.org>
Committed: Wed Jan 13 11:16:22 2016 +0100

----------------------------------------------------------------------
 .../src/main/resources/archetype-resources/pom.xml | 17 +++++++++++++++++
 assemblies/features/enterprise/pom.xml             |  2 +-
 assemblies/features/spring/pom.xml                 |  2 +-
 assemblies/features/standard/pom.xml               |  2 +-
 pom.xml                                            |  2 +-
 .../org/apache/karaf/tooling/AssemblyMojo.java     |  2 +-
 6 files changed, 22 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/karaf/blob/68b95fb3/archetypes/assembly/src/main/resources/archetype-resources/pom.xml
----------------------------------------------------------------------
diff --git a/archetypes/assembly/src/main/resources/archetype-resources/pom.xml b/archetypes/assembly/src/main/resources/archetype-resources/pom.xml
index dd96107..dd99aa1 100644
--- a/archetypes/assembly/src/main/resources/archetype-resources/pom.xml
+++ b/archetypes/assembly/src/main/resources/archetype-resources/pom.xml
@@ -105,6 +105,22 @@
             <classifier>features</classifier>
             <type>xml</type>
         </dependency>
+        <dependency>
+            <groupId>org.apache.karaf.features</groupId>
+            <artifactId>spring</artifactId>
+            <version>^project.version^</version>
+            <classifier>features</classifier>
+            <type>xml</type>
+            <scope>runtime</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.karaf.features</groupId>
+            <artifactId>enterprise</artifactId>
+            <version>^project.version^</version>
+            <classifier>features</classifier>
+            <type>xml</type>
+            <scope>runtime</scope>
+        </dependency>
     </dependencies>
 
     <build>
@@ -162,6 +178,7 @@
                         <!-- minimal distribution -->
                         <!--<feature>minimal</feature>-->
                     </bootFeatures>
+                    <javase>1.8</javase>
                 </configuration>
             </plugin>
         </plugins>

http://git-wip-us.apache.org/repos/asf/karaf/blob/68b95fb3/assemblies/features/enterprise/pom.xml
----------------------------------------------------------------------
diff --git a/assemblies/features/enterprise/pom.xml b/assemblies/features/enterprise/pom.xml
index f52afc9..5b54c1b 100644
--- a/assemblies/features/enterprise/pom.xml
+++ b/assemblies/features/enterprise/pom.xml
@@ -217,7 +217,7 @@
                                 <descriptor>file:${project.build.directory}/feature/feature.xml</descriptor>
                             </descriptors>
                             <distribution>org.apache.karaf.features:framework</distribution>
-                            <javase>1.7</javase>
+                            <javase>1.8</javase>
                             <framework>
                                 <feature>framework</feature>
                             </framework>

http://git-wip-us.apache.org/repos/asf/karaf/blob/68b95fb3/assemblies/features/spring/pom.xml
----------------------------------------------------------------------
diff --git a/assemblies/features/spring/pom.xml b/assemblies/features/spring/pom.xml
index 4ba4caa..3fff381 100644
--- a/assemblies/features/spring/pom.xml
+++ b/assemblies/features/spring/pom.xml
@@ -194,7 +194,7 @@
                                 <descriptor>file:${project.build.directory}/feature/feature.xml</descriptor>
                             </descriptors>
                             <distribution>org.apache.karaf.features:framework</distribution>
-                            <javase>1.7</javase>
+                            <javase>1.8</javase>
                             <framework>
                                 <feature>framework</feature>
                             </framework>

http://git-wip-us.apache.org/repos/asf/karaf/blob/68b95fb3/assemblies/features/standard/pom.xml
----------------------------------------------------------------------
diff --git a/assemblies/features/standard/pom.xml b/assemblies/features/standard/pom.xml
index 934414e..76c21ba 100644
--- a/assemblies/features/standard/pom.xml
+++ b/assemblies/features/standard/pom.xml
@@ -425,7 +425,7 @@
                                 <descriptor>file:${project.build.directory}/feature/feature.xml</descriptor>
                             </descriptors>
                             <distribution>org.apache.karaf.features:framework</distribution>
-                            <javase>1.7</javase>
+                            <javase>1.8</javase>
                             <framework>
                                 <feature>framework</feature>
                             </framework>

http://git-wip-us.apache.org/repos/asf/karaf/blob/68b95fb3/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 24da3bb..f0bda12 100644
--- a/pom.xml
+++ b/pom.xml
@@ -254,7 +254,7 @@
         <org.osgi.service.jdbc.version>1.0.0</org.osgi.service.jdbc.version>
         <osgi.version>6.0.0</osgi.version>
         <osgi.compendium.version>5.0.0</osgi.compendium.version>
-        <org.json.version>20140107</org.json.version>
+        <org.json.version>20150729</org.json.version>
 
         <pax.cdi.version>0.12.0</pax.cdi.version>
         <pax.exam.version>4.8.0</pax.exam.version>

http://git-wip-us.apache.org/repos/asf/karaf/blob/68b95fb3/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 c083256..e02425f 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
@@ -181,7 +181,7 @@ public class AssemblyMojo extends MojoSupport {
     /**
      * Specify the version of Java SE to be assumed for osgi.ee.
      */
-    @Parameter(defaultValue = "1.7")
+    @Parameter(defaultValue = "1.8")
     protected String javase;
 
     /**


Mime
View raw message