You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by cz...@apache.org on 2015/02/16 10:51:22 UTC

svn commit: r1660062 - in /felix/trunk/scr-compat: ./ src/ src/main/ src/main/java/ src/main/java/org/ src/main/java/org/apache/ src/main/java/org/apache/felix/ src/main/java/org/apache/felix/scr/ src/main/java/org/apache/felix/scr/impl/ src/main/java/...

Author: cziegeler
Date: Mon Feb 16 09:51:22 2015
New Revision: 1660062

URL: http://svn.apache.org/r1660062
Log:
FELIX-4785 : Incompatible SCR API

Added:
    felix/trunk/scr-compat/
    felix/trunk/scr-compat/pom.xml   (with props)
    felix/trunk/scr-compat/src/
    felix/trunk/scr-compat/src/main/
    felix/trunk/scr-compat/src/main/java/
    felix/trunk/scr-compat/src/main/java/org/
    felix/trunk/scr-compat/src/main/java/org/apache/
    felix/trunk/scr-compat/src/main/java/org/apache/felix/
    felix/trunk/scr-compat/src/main/java/org/apache/felix/scr/
    felix/trunk/scr-compat/src/main/java/org/apache/felix/scr/impl/
    felix/trunk/scr-compat/src/main/java/org/apache/felix/scr/impl/compat/

Added: felix/trunk/scr-compat/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/scr-compat/pom.xml?rev=1660062&view=auto
==============================================================================
--- felix/trunk/scr-compat/pom.xml (added)
+++ felix/trunk/scr-compat/pom.xml Mon Feb 16 09:51:22 2015
@@ -0,0 +1,129 @@
+<!--
+ 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.
+-->
+<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/maven-v4_0_0.xsd">
+    <parent>
+        <groupId>org.apache.felix</groupId>
+        <artifactId>felix-parent</artifactId>
+        <version>2.1</version>
+        <relativePath />
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+    <packaging>bundle</packaging>
+    <name>Apache Felix Declarative Services Compatibility Extension</name>
+    <description>
+        Extensions of the DS Implementation to provide compatibility with API from older Apache Felix DS implementations.
+    </description>
+    <artifactId>org.apache.felix.scr.compat</artifactId>
+    <version>0.0.1-SNAPSHOT</version>
+    <scm>
+        <connection>scm:svn:https://svn.apache.org/repos/asf/felix/trunk/scr-compat</connection>
+        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/felix/trunk/scr-compat</developerConnection>
+        <url>scm:svn:https://svn.apache.org/repos/asf/felix/trunk/scr-compat</url>
+    </scm>
+    
+    <dependencies>
+        <dependency>
+            <groupId>org.osgi</groupId>
+            <artifactId>org.osgi.core</artifactId>
+            <version>6.0.0</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.osgi</groupId>
+            <artifactId>org.osgi.annotation</artifactId>
+            <version>6.0.0</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.osgi</groupId>
+            <artifactId>org.osgi.enterprise</artifactId>
+            <version>5.0.0</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.felix</groupId>
+            <artifactId>org.apache.felix.scr</artifactId>
+            <version>1.8.3-SNAPSHOT</version>
+            <scope>provided</scope>
+        </dependency>
+    </dependencies>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <version>2.5.3</version>
+                <extensions>true</extensions>
+                <configuration>
+                    <instructions>
+                        <Bundle-Category>osgi</Bundle-Category>
+                        <Bundle-DocURL>http://felix.apache.org/site/apache-felix-service-component-runtime.html</Bundle-DocURL>
+                        <Bundle-Activator>org.apache.felix.scr.impl.compat.Activator</Bundle-Activator>
+                        <Export-Package>org.apache.felix.scr;version=1.8.1;provide:=true</Export-Package>
+                    </instructions>
+                </configuration>
+            </plugin>
+
+            <!--
+                Ensure not using too recent Java API
+                - Ensure Java 5 API
+            -->
+             <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>animal-sniffer-maven-plugin</artifactId>
+                <version>1.7</version>
+                <configuration>
+                    <signature>
+                        <groupId>org.codehaus.mojo.signature</groupId>
+                        <artifactId>java15</artifactId>
+                        <version>1.0</version>
+                    </signature>
+                </configuration>
+                <executions>
+                    <execution>
+                        <phase>test</phase>
+                        <goals>
+                            <goal>check</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+
+            <!--
+                Configure default compilation for Java 5
+            -->
+            <plugin>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <source>1.5</source>
+                    <target>1.5</target>
+                </configuration>
+            </plugin>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-javadoc-plugin</artifactId>
+                <configuration>
+                    <encoding>${project.build.sourceEncoding}</encoding>
+                    <excludePackageNames>*.impl</excludePackageNames>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+</project>

Propchange: felix/trunk/scr-compat/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: felix/trunk/scr-compat/pom.xml
------------------------------------------------------------------------------
    svn:keywords = Id