Author: cschneider
Date: Fri Apr 27 17:34:59 2012
New Revision: 1331511
URL: http://svn.apache.org/viewvc?rev=1331511&view=rev
Log:
KARAF-1282 Added a new module for the core spec and switched the instance.core
module to use it
Added:
karaf/trunk/osgicore/ (with props)
karaf/trunk/osgicore/pom.xml
Modified:
karaf/trunk/instance/core/pom.xml
karaf/trunk/pom.xml
Modified: karaf/trunk/instance/core/pom.xml
URL:
http://svn.apache.org/viewvc/karaf/trunk/instance/core/pom.xml?rev=1331511&r1=1331510&r2=1331511&view=diff
==============================================================================
--- karaf/trunk/instance/core/pom.xml (original)
+++ karaf/trunk/instance/core/pom.xml Fri Apr 27 17:34:59 2012
@@ -41,7 +41,7 @@
<dependency>
<groupId>org.apache.karaf</groupId>
- <artifactId>org.apache.karaf.main</artifactId>
+ <artifactId>org.osgi.core</artifactId>
<scope>provided</scope>
</dependency>
Propchange: karaf/trunk/osgicore/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Apr 27 17:34:59 2012
@@ -0,0 +1,4 @@
+.classpath
+.project
+.settings
+target
Added: karaf/trunk/osgicore/pom.xml
URL:
http://svn.apache.org/viewvc/karaf/trunk/osgicore/pom.xml?rev=1331511&view=auto
==============================================================================
--- karaf/trunk/osgicore/pom.xml (added)
+++ karaf/trunk/osgicore/pom.xml Fri Apr 27 17:34:59 2012
@@ -0,0 +1,122 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
+
+ <!-- Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed
with this
+ work for additional information regarding copyright ownership.
The ASF licenses
+ this file to You under the Apache License, Version 2.0 (the
"License"); you
+ may not use this file except in compliance with the License.
You may obtain
+ a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0 Unless
+ required by applicable law or agreed to in writing, software
distributed
+ under the License is distributed on an "AS IS" BASIS, WITHOUT
WARRANTIES
+ OR CONDITIONS OF ANY KIND, either express or implied. See the
License for
+ the specific language governing permissions and limitations
under the License. -->
+
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.karaf</groupId>
+ <artifactId>karaf</artifactId>
+ <version>3.0.0-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+
+ <artifactId>org.osgi.core</artifactId>
+ <packaging>bundle</packaging>
+ <name>OSGi core spec compiled for Java 7</name>
+ <description>The orignal osgi core spec can not be used to compile
other code with Java 7. So we recompile the spec
+for Java 5+ so it can be used as a maven dependency in projects that are
compiled with Java 7
+ </description>
+
+ <properties>
+
<appendedResourcesDirectory>${basedir}/../etc/appended-resources</appendedResourcesDirectory>
+ </properties>
+
+ <dependencies>
+ </dependencies>
+
+ <build>
+
<sourceDirectory>${project.build.directory}/generated-sources/src/main/java
+ </sourceDirectory>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>unpack-sources</id>
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>unpack</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
+ <artifactItem>
+
<groupId>org.osgi</groupId>
+
<artifactId>org.osgi.core</artifactId>
+
<classifier>sources</classifier>
+ </artifactItem>
+ </artifactItems>
+
<outputDirectory>${project.build.directory}/generated-sources/src/main/java</outputDirectory>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <configuration>
+ <instructions>
+ <Export-Package>org.osgi.*</Export-Package>
+ </instructions>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+ <profiles>
+ <profile>
+ <id>deploy</id>
+ <properties>
+ <createSourcesJar>true</createSourcesJar>
+ </properties>
+ <build>
+ <plugins>
+ <plugin>
+
<groupId>org.apache.maven.plugins</groupId>
+
<artifactId>maven-source-plugin</artifactId>
+ <executions>
+ <execution>
+
<id>attach-sources</id>
+
<phase>process-classes</phase>
+ <goals>
+
<goal>jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+
<groupId>org.apache.maven.plugins</groupId>
+
<artifactId>maven-javadoc-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>package</id>
+
<phase>package</phase>
+ <goals>
+
<goal>jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+
<minmemory>128m</minmemory>
+
<maxmemory>512m</maxmemory>
+
<sourcepath>${project.build.directory}/sources</sourcepath>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+
+</project>
Modified: karaf/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/karaf/trunk/pom.xml?rev=1331511&r1=1331510&r2=1331511&view=diff
==============================================================================
--- karaf/trunk/pom.xml (original)
+++ karaf/trunk/pom.xml Fri Apr 27 17:34:59 2012
@@ -35,6 +35,7 @@
<inceptionYear>2007</inceptionYear>
<modules>
+ <module>osgicore</module>
<module>util</module>
<module>main</module>
<module>features</module>
@@ -305,6 +306,11 @@
<dependencyManagement>
<dependencies>
<dependency>
+ <groupId>org.apache.karaf</groupId>
+ <artifactId>org.osgi.core</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
<version>${osgi.version}</version>
