felix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cziege...@apache.org
Subject svn commit: r1372268 - in /felix/trunk/scrplugin: annotations/ annotations/src/main/appended-resources/ annotations/src/main/appended-resources/META-INF/ annotations/src/main/resources/META-INF/services/ ds-annotations/ ds-annotations/src/main/appended...
Date Mon, 13 Aug 2012 06:10:39 GMT
Author: cziegeler
Date: Mon Aug 13 06:10:37 2012
New Revision: 1372268

URL: http://svn.apache.org/viewvc?rev=1372268&view=rev
Log:
FELIX-2689 - Upgrade Descriptor generator to new parent POM and adapt legal files

Added:
    felix/trunk/scrplugin/annotations/src/main/appended-resources/
    felix/trunk/scrplugin/annotations/src/main/appended-resources/META-INF/
    felix/trunk/scrplugin/annotations/src/main/appended-resources/META-INF/DEPENDENCIES
    felix/trunk/scrplugin/ds-annotations/src/main/appended-resources/
    felix/trunk/scrplugin/ds-annotations/src/main/appended-resources/META-INF/
    felix/trunk/scrplugin/ds-annotations/src/main/appended-resources/META-INF/DEPENDENCIES
    felix/trunk/scrplugin/generator/src/main/appended-resources/
    felix/trunk/scrplugin/generator/src/main/appended-resources/META-INF/
    felix/trunk/scrplugin/generator/src/main/appended-resources/META-INF/DEPENDENCIES
    felix/trunk/scrplugin/generator/src/main/appended-resources/META-INF/LICENSE   (with props)
    felix/trunk/scrplugin/maven-scr-plugin/src/main/appended-resources/
    felix/trunk/scrplugin/maven-scr-plugin/src/main/appended-resources/META-INF/
    felix/trunk/scrplugin/maven-scr-plugin/src/main/appended-resources/META-INF/DEPENDENCIES
    felix/trunk/scrplugin/scrtask/src/main/appended-resources/
    felix/trunk/scrplugin/scrtask/src/main/appended-resources/META-INF/
    felix/trunk/scrplugin/scrtask/src/main/appended-resources/META-INF/DEPENDENCIES
    felix/trunk/scrplugin/scrtask/src/main/appended-resources/META-INF/LICENSE   (with props)
    felix/trunk/scrplugin/scrtask/src/main/appended-resources/META-INF/NOTICE   (contents,
props changed)
      - copied, changed from r1372257, felix/trunk/scrplugin/scrtask/NOTICE
Removed:
    felix/trunk/scrplugin/annotations/DEPENDENCIES
    felix/trunk/scrplugin/annotations/LICENSE
    felix/trunk/scrplugin/annotations/NOTICE
    felix/trunk/scrplugin/ds-annotations/DEPENDENCIES
    felix/trunk/scrplugin/ds-annotations/LICENSE
    felix/trunk/scrplugin/ds-annotations/NOTICE
    felix/trunk/scrplugin/generator/DEPENDENCIES
    felix/trunk/scrplugin/generator/LICENSE
    felix/trunk/scrplugin/generator/NOTICE
    felix/trunk/scrplugin/maven-scr-plugin/DEPENDENCIES
    felix/trunk/scrplugin/maven-scr-plugin/LICENSE
    felix/trunk/scrplugin/maven-scr-plugin/NOTICE
    felix/trunk/scrplugin/scrtask/DEPENDENCIES
    felix/trunk/scrplugin/scrtask/LICENSE
    felix/trunk/scrplugin/scrtask/NOTICE
Modified:
    felix/trunk/scrplugin/annotations/changelog.txt
    felix/trunk/scrplugin/annotations/pom.xml
    felix/trunk/scrplugin/annotations/src/main/resources/META-INF/services/org.apache.felix.scrplugin.annotations.AnnotationProcessor
    felix/trunk/scrplugin/ds-annotations/pom.xml
    felix/trunk/scrplugin/ds-annotations/src/main/resources/META-INF/services/org.apache.felix.scrplugin.annotations.AnnotationProcessor
    felix/trunk/scrplugin/generator/changelog.txt
    felix/trunk/scrplugin/generator/pom.xml
    felix/trunk/scrplugin/maven-scr-plugin/changelog.txt
    felix/trunk/scrplugin/maven-scr-plugin/pom.xml
    felix/trunk/scrplugin/scrtask/changelog.txt
    felix/trunk/scrplugin/scrtask/pom.xml

Modified: felix/trunk/scrplugin/annotations/changelog.txt
URL: http://svn.apache.org/viewvc/felix/trunk/scrplugin/annotations/changelog.txt?rev=1372268&r1=1372267&r2=1372268&view=diff
==============================================================================
--- felix/trunk/scrplugin/annotations/changelog.txt (original)
+++ felix/trunk/scrplugin/annotations/changelog.txt Mon Aug 13 06:10:37 2012
@@ -1,3 +1,21 @@
+Changes from 1.6.0 to 1.7.0
+---------------------------
+
+** Task
+    * [FELIX-3225] - Drop javadoc annotation support
+    * [FELIX-3247] - Change annotation retention from source to class
+    * [FELIX-3552] - Implement new features of DS 1.2
+    * [FELIX-3550] - Reimplement the SCR Generator
+    * [FELIX-3551] - Support the DS annotations
+
+** Bug
+    * [FELIX-3457] - Component annotation does not detect abstract class
+    * [FELIX-3077] - Abstract class is not detected as abstract
+
+** Improvement
+    * [FELIX-2689] - Upgrade Descriptor generator to new parent POM and adapt legal files
+
+
 Changes from 1.5.0 to 1.6.0
 ---------------------------
 

Modified: felix/trunk/scrplugin/annotations/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/scrplugin/annotations/pom.xml?rev=1372268&r1=1372267&r2=1372268&view=diff
==============================================================================
--- felix/trunk/scrplugin/annotations/pom.xml (original)
+++ felix/trunk/scrplugin/annotations/pom.xml Mon Aug 13 06:10:37 2012
@@ -20,10 +20,10 @@
 
     <modelVersion>4.0.0</modelVersion>
     <parent>
-        <artifactId>felix-parent</artifactId>
         <groupId>org.apache.felix</groupId>
-        <version>1.2.0</version>
-        <relativePath>../pom/pom.xml</relativePath>
+        <artifactId>felix-parent</artifactId>
+        <version>2.1</version>
+        <relativePath>../../pom/pom.xml</relativePath>
     </parent>
     
     <groupId>org.apache.felix</groupId>
@@ -53,20 +53,6 @@
     </dependencies>
 
     <build>
-        <resources>
-            <resource>
-                <directory>${basedir}/src/main/resources</directory>
-            </resource>
-            <resource>
-                <targetPath>META-INF</targetPath>
-                <directory>${basedir}</directory>
-                <includes>
-                    <include>LICENSE</include>
-                    <include>NOTICE</include>
-                    <include>DEPENDENCIES</include>
-                </includes>
-            </resource>
-        </resources>
         <plugins>
 
           <!-- JDK 1.5 needed for annotation support -->

Added: felix/trunk/scrplugin/annotations/src/main/appended-resources/META-INF/DEPENDENCIES
URL: http://svn.apache.org/viewvc/felix/trunk/scrplugin/annotations/src/main/appended-resources/META-INF/DEPENDENCIES?rev=1372268&view=auto
==============================================================================
--- felix/trunk/scrplugin/annotations/src/main/appended-resources/META-INF/DEPENDENCIES (added)
+++ felix/trunk/scrplugin/annotations/src/main/appended-resources/META-INF/DEPENDENCIES Mon
Aug 13 06:10:37 2012
@@ -0,0 +1,8 @@
+I. Included Third-Party Software
+
+
+II. Used Third-Party Software
+
+
+III. License Summary
+- Apache License 2.0

Modified: felix/trunk/scrplugin/annotations/src/main/resources/META-INF/services/org.apache.felix.scrplugin.annotations.AnnotationProcessor
URL: http://svn.apache.org/viewvc/felix/trunk/scrplugin/annotations/src/main/resources/META-INF/services/org.apache.felix.scrplugin.annotations.AnnotationProcessor?rev=1372268&r1=1372267&r2=1372268&view=diff
==============================================================================
--- felix/trunk/scrplugin/annotations/src/main/resources/META-INF/services/org.apache.felix.scrplugin.annotations.AnnotationProcessor
(original)
+++ felix/trunk/scrplugin/annotations/src/main/resources/META-INF/services/org.apache.felix.scrplugin.annotations.AnnotationProcessor
Mon Aug 13 06:10:37 2012
@@ -1,2 +1,20 @@
+#
+#  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.
+#
 org.apache.felix.scrplugin.processing.SCRAnnotationProcessor
 org.apache.felix.scrplugin.processing.SlingAnnotationProcessor

Modified: felix/trunk/scrplugin/ds-annotations/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/scrplugin/ds-annotations/pom.xml?rev=1372268&r1=1372267&r2=1372268&view=diff
==============================================================================
--- felix/trunk/scrplugin/ds-annotations/pom.xml (original)
+++ felix/trunk/scrplugin/ds-annotations/pom.xml Mon Aug 13 06:10:37 2012
@@ -20,10 +20,10 @@
 
     <modelVersion>4.0.0</modelVersion>
     <parent>
-        <artifactId>felix-parent</artifactId>
         <groupId>org.apache.felix</groupId>
-        <version>1.2.0</version>
-        <relativePath>../pom/pom.xml</relativePath>
+        <artifactId>felix-parent</artifactId>
+        <version>2.1</version>
+        <relativePath>../../pom/pom.xml</relativePath>
     </parent>
     
     <groupId>org.apache.felix</groupId>

Added: felix/trunk/scrplugin/ds-annotations/src/main/appended-resources/META-INF/DEPENDENCIES
URL: http://svn.apache.org/viewvc/felix/trunk/scrplugin/ds-annotations/src/main/appended-resources/META-INF/DEPENDENCIES?rev=1372268&view=auto
==============================================================================
--- felix/trunk/scrplugin/ds-annotations/src/main/appended-resources/META-INF/DEPENDENCIES
(added)
+++ felix/trunk/scrplugin/ds-annotations/src/main/appended-resources/META-INF/DEPENDENCIES
Mon Aug 13 06:10:37 2012
@@ -0,0 +1,13 @@
+I. Included Third-Party Software
+
+
+II. Used Third-Party Software
+
+This product uses software developed at
+The OSGi Alliance (http://www.osgi.org/).
+Copyright (c) OSGi Alliance (2000, 2009).
+Licensed under the Apache License 2.0. 
+
+
+III. License Summary
+- Apache License 2.0

Modified: felix/trunk/scrplugin/ds-annotations/src/main/resources/META-INF/services/org.apache.felix.scrplugin.annotations.AnnotationProcessor
URL: http://svn.apache.org/viewvc/felix/trunk/scrplugin/ds-annotations/src/main/resources/META-INF/services/org.apache.felix.scrplugin.annotations.AnnotationProcessor?rev=1372268&r1=1372267&r2=1372268&view=diff
==============================================================================
--- felix/trunk/scrplugin/ds-annotations/src/main/resources/META-INF/services/org.apache.felix.scrplugin.annotations.AnnotationProcessor
(original)
+++ felix/trunk/scrplugin/ds-annotations/src/main/resources/META-INF/services/org.apache.felix.scrplugin.annotations.AnnotationProcessor
Mon Aug 13 06:10:37 2012
@@ -1 +1,19 @@
+#
+#  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.
+#
 org.apache.felix.scrplugin.ds.DSAnnotationProcessor

Modified: felix/trunk/scrplugin/generator/changelog.txt
URL: http://svn.apache.org/viewvc/felix/trunk/scrplugin/generator/changelog.txt?rev=1372268&r1=1372267&r2=1372268&view=diff
==============================================================================
--- felix/trunk/scrplugin/generator/changelog.txt (original)
+++ felix/trunk/scrplugin/generator/changelog.txt Mon Aug 13 06:10:37 2012
@@ -1,3 +1,18 @@
+Changes from 1.1.4 to 1.2.0
+---------------------------
+
+** Task
+    * [FELIX-3225] - Drop javadoc annotation support
+    * [FELIX-3552] - Implement new features of DS 1.2
+    * [FELIX-3550] - Reimplement the SCR Generator
+
+** Bug
+    * [FELIX-3571] - "Comparison method violates general contract!" error in maven-scr-plugin
+
+** Improvement
+    * [FELIX-2689] - Upgrade Descriptor generator to new parent POM and adapt legal files
+
+
 Changes from 1.1.2 to 1.1.4
 ---------------------------
 

Modified: felix/trunk/scrplugin/generator/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/scrplugin/generator/pom.xml?rev=1372268&r1=1372267&r2=1372268&view=diff
==============================================================================
--- felix/trunk/scrplugin/generator/pom.xml (original)
+++ felix/trunk/scrplugin/generator/pom.xml Mon Aug 13 06:10:37 2012
@@ -20,10 +20,10 @@
 
     <modelVersion>4.0.0</modelVersion>
     <parent>
-        <artifactId>felix-parent</artifactId>
         <groupId>org.apache.felix</groupId>
-        <version>1.2.0</version>
-        <relativePath>../pom/pom.xml</relativePath>
+        <artifactId>felix-parent</artifactId>
+        <version>2.1</version>
+        <relativePath>../../pom/pom.xml</relativePath>
     </parent>
 
     <groupId>org.apache.felix</groupId>
@@ -65,20 +65,6 @@
     </dependencies>
     
     <build>
-        <resources>
-            <resource>
-                <directory>${basedir}/src/main/resources</directory>
-            </resource>
-            <resource>
-                <targetPath>META-INF</targetPath>
-                <directory>${basedir}</directory>
-                <includes>
-                    <include>LICENSE</include>
-                    <include>NOTICE</include>
-                    <include>DEPENDENCIES</include>
-                </includes>
-            </resource>
-        </resources>
         <plugins>
             <!-- JDK 1.5 needed for annotation support -->
             <plugin>

Added: felix/trunk/scrplugin/generator/src/main/appended-resources/META-INF/DEPENDENCIES
URL: http://svn.apache.org/viewvc/felix/trunk/scrplugin/generator/src/main/appended-resources/META-INF/DEPENDENCIES?rev=1372268&view=auto
==============================================================================
--- felix/trunk/scrplugin/generator/src/main/appended-resources/META-INF/DEPENDENCIES (added)
+++ felix/trunk/scrplugin/generator/src/main/appended-resources/META-INF/DEPENDENCIES Mon
Aug 13 06:10:37 2012
@@ -0,0 +1,18 @@
+I. Included Third-Party Software
+
+
+II. Used Third-Party Software
+
+This product uses software developed at
+The OSGi Alliance (http://www.osgi.org/).
+Copyright (c) OSGi Alliance (2000, 2012).
+Licensed under the Apache License 2.0. 
+
+This product uses software developed at http://asm.objectweb.org
+Copyright (c) 2000-2011 INRIA, France Telecom
+Licensed under the BSD License.
+
+
+III. License Summary
+- Apache License 2.0
+- BSD License

Added: felix/trunk/scrplugin/generator/src/main/appended-resources/META-INF/LICENSE
URL: http://svn.apache.org/viewvc/felix/trunk/scrplugin/generator/src/main/appended-resources/META-INF/LICENSE?rev=1372268&view=auto
==============================================================================
--- felix/trunk/scrplugin/generator/src/main/appended-resources/META-INF/LICENSE (added)
+++ felix/trunk/scrplugin/generator/src/main/appended-resources/META-INF/LICENSE Mon Aug 13
06:10:37 2012
@@ -0,0 +1,31 @@
+For the asm component:
+
+Copyright (c) 2000-2005 INRIA, France Telecom
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+1. Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+
+3. Neither the name of the copyright holders nor the names of its
+   contributors may be used to endorse or promote products derived from
+   this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+THE POSSIBILITY OF SUCH DAMAGE.
\ No newline at end of file

Propchange: felix/trunk/scrplugin/generator/src/main/appended-resources/META-INF/LICENSE
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: felix/trunk/scrplugin/maven-scr-plugin/changelog.txt
URL: http://svn.apache.org/viewvc/felix/trunk/scrplugin/maven-scr-plugin/changelog.txt?rev=1372268&r1=1372267&r2=1372268&view=diff
==============================================================================
--- felix/trunk/scrplugin/maven-scr-plugin/changelog.txt (original)
+++ felix/trunk/scrplugin/maven-scr-plugin/changelog.txt Mon Aug 13 06:10:37 2012
@@ -1,3 +1,19 @@
+Changes from 1.7.4 to 1.8.0
+---------------------------
+
+** Task
+    * [FELIX-3225] - Drop javadoc annotation support
+    * [FELIX-3552] - Implement new features of DS 1.2
+    * [FELIX-3550] - Reimplement the SCR Generator
+
+** Bug
+    * [FELIX-3571] - "Comparison method violates general contract!" error in maven-scr-plugin
+    * [FELIX-3555] - Maven SCR Plugin shoudn't attempt to run on modules of type POM
+
+** Improvement
+    * [FELIX-2689] - Upgrade Descriptor generator to new parent POM and adapt legal files
+
+
 Changes from 1.7.2 to 1.7.4
 ---------------------------
 

Modified: felix/trunk/scrplugin/maven-scr-plugin/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/scrplugin/maven-scr-plugin/pom.xml?rev=1372268&r1=1372267&r2=1372268&view=diff
==============================================================================
--- felix/trunk/scrplugin/maven-scr-plugin/pom.xml (original)
+++ felix/trunk/scrplugin/maven-scr-plugin/pom.xml Mon Aug 13 06:10:37 2012
@@ -20,10 +20,10 @@
 
     <modelVersion>4.0.0</modelVersion>
     <parent>
-        <artifactId>felix-parent</artifactId>
         <groupId>org.apache.felix</groupId>
-        <version>1.2.0</version>
-        <relativePath>../pom/pom.xml</relativePath>
+        <artifactId>felix-parent</artifactId>
+        <version>2.1</version>
+        <relativePath>../../pom/pom.xml</relativePath>
     </parent>
 
     <groupId>org.apache.felix</groupId>
@@ -69,20 +69,6 @@
     </dependencies>
     
     <build>
-        <resources>
-            <resource>
-                <directory>${basedir}/src/main/resources</directory>
-            </resource>
-            <resource>
-                <targetPath>META-INF</targetPath>
-                <directory>${basedir}</directory>
-                <includes>
-                    <include>LICENSE</include>
-                    <include>NOTICE</include>
-                    <include>DEPENDENCIES</include>
-                </includes>
-            </resource>
-        </resources>
         <plugins>
             <!-- JDK 1.5 needed for annotation support -->
             <plugin>

Added: felix/trunk/scrplugin/maven-scr-plugin/src/main/appended-resources/META-INF/DEPENDENCIES
URL: http://svn.apache.org/viewvc/felix/trunk/scrplugin/maven-scr-plugin/src/main/appended-resources/META-INF/DEPENDENCIES?rev=1372268&view=auto
==============================================================================
--- felix/trunk/scrplugin/maven-scr-plugin/src/main/appended-resources/META-INF/DEPENDENCIES
(added)
+++ felix/trunk/scrplugin/maven-scr-plugin/src/main/appended-resources/META-INF/DEPENDENCIES
Mon Aug 13 06:10:37 2012
@@ -0,0 +1,8 @@
+I. Included Third-Party Software
+
+
+II. Used Third-Party Software
+
+
+III. License Summary
+- Apache License 2.0

Modified: felix/trunk/scrplugin/scrtask/changelog.txt
URL: http://svn.apache.org/viewvc/felix/trunk/scrplugin/scrtask/changelog.txt?rev=1372268&r1=1372267&r2=1372268&view=diff
==============================================================================
--- felix/trunk/scrplugin/scrtask/changelog.txt (original)
+++ felix/trunk/scrplugin/scrtask/changelog.txt Mon Aug 13 06:10:37 2012
@@ -1,3 +1,20 @@
+Changes from 1.1.4 to 1.2.0
+---------------------------
+
+** Task
+    * [FELIX-3225] - Drop javadoc annotation support
+    * [FELIX-3552] - Implement new features of DS 1.2
+    * [FELIX-3550] - Reimplement the SCR Generator
+
+** Bug
+    * [FELIX-3571] - "Comparison method violates general contract!" error in maven-scr-plugin
+    * [FELIX-3510] - Non java files will be processed
+
+** Improvement
+    * [FELIX-3509] - Undocumented features "strictMode", "parseJavadoc" and "processAnnotations"
+    * [FELIX-2689] - Upgrade Descriptor generator to new parent POM and adapt legal files
+
+
 Changes from 1.1.2 to 1.1.4
 ---------------------------
 

Modified: felix/trunk/scrplugin/scrtask/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/scrplugin/scrtask/pom.xml?rev=1372268&r1=1372267&r2=1372268&view=diff
==============================================================================
--- felix/trunk/scrplugin/scrtask/pom.xml (original)
+++ felix/trunk/scrplugin/scrtask/pom.xml Mon Aug 13 06:10:37 2012
@@ -20,10 +20,10 @@
 
     <modelVersion>4.0.0</modelVersion>
     <parent>
-        <artifactId>felix-parent</artifactId>
         <groupId>org.apache.felix</groupId>
-        <version>1.2.0</version>
-        <relativePath>../pom/pom.xml</relativePath>
+        <artifactId>felix-parent</artifactId>
+        <version>2.1</version>
+        <relativePath>../../pom/pom.xml</relativePath>
     </parent>
 
     <groupId>org.apache.felix</groupId>
@@ -57,23 +57,27 @@
             <version>1.2.0-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
+        <dependency>
+            <groupId>org.apache.felix</groupId>
+            <artifactId>org.apache.felix.scr.annotations</artifactId>
+            <version>1.7.0-SNAPSHOT</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.felix</groupId>
+            <artifactId>org.apache.felix.scr.ds-annotations</artifactId>
+            <version>1.2.0-SNAPSHOT</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.ow2.asm</groupId>
+            <artifactId>asm-all</artifactId>
+            <version>4.0</version>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
     
     <build>
-        <resources>
-            <resource>
-                <directory>${basedir}/src/main/resources</directory>
-            </resource>
-            <resource>
-                <targetPath>META-INF</targetPath>
-                <directory>${basedir}</directory>
-                <includes>
-                    <include>LICENSE</include>
-                    <include>NOTICE</include>
-                    <include>DEPENDENCIES</include>
-                </includes>
-            </resource>
-        </resources>
         <plugins>
             <!-- unpack qdox, asm and annotations into bundle package -->
             <plugin>
@@ -85,13 +89,13 @@
                         </goals>
                         <configuration>
                             <includeArtifactIds>
-                                org.apache.felix.scr.generator,qdox,asm-all,org.apache.felix.scr.annotations
+                                org.apache.felix.scr.generator,asm-all,org.apache.felix.scr.annotations,org.apache.felix.scr.ds-annotations
                             </includeArtifactIds>
                             <outputDirectory>
                                 ${project.build.outputDirectory}
                             </outputDirectory>
                             <excludes>
-                                **/DEPENDENCIES,**/NOTICE,**/LICENSE,**/MANIFEST.MF
+                                **/MANIFEST.MF
                             </excludes>
                         </configuration>
                     </execution>

Added: felix/trunk/scrplugin/scrtask/src/main/appended-resources/META-INF/DEPENDENCIES
URL: http://svn.apache.org/viewvc/felix/trunk/scrplugin/scrtask/src/main/appended-resources/META-INF/DEPENDENCIES?rev=1372268&view=auto
==============================================================================
--- felix/trunk/scrplugin/scrtask/src/main/appended-resources/META-INF/DEPENDENCIES (added)
+++ felix/trunk/scrplugin/scrtask/src/main/appended-resources/META-INF/DEPENDENCIES Mon Aug
13 06:10:37 2012
@@ -0,0 +1,18 @@
+I. Included Third-Party Software
+
+This product includes software developed at http://asm.objectweb.org
+Copyright (c) 2000-2011 INRIA, France Telecom
+Licensed under the BSD License.
+
+
+II. Used Third-Party Software
+
+This product uses software developed at
+The OSGi Alliance (http://www.osgi.org/).
+Copyright (c) OSGi Alliance (2000, 2009).
+Licensed under the Apache License 2.0. 
+
+
+III. License Summary
+- Apache License 2.0
+- BSD License

Added: felix/trunk/scrplugin/scrtask/src/main/appended-resources/META-INF/LICENSE
URL: http://svn.apache.org/viewvc/felix/trunk/scrplugin/scrtask/src/main/appended-resources/META-INF/LICENSE?rev=1372268&view=auto
==============================================================================
--- felix/trunk/scrplugin/scrtask/src/main/appended-resources/META-INF/LICENSE (added)
+++ felix/trunk/scrplugin/scrtask/src/main/appended-resources/META-INF/LICENSE Mon Aug 13
06:10:37 2012
@@ -0,0 +1,31 @@
+For the asm component:
+
+Copyright (c) 2000-2005 INRIA, France Telecom
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+1. Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+
+3. Neither the name of the copyright holders nor the names of its
+   contributors may be used to endorse or promote products derived from
+   this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+THE POSSIBILITY OF SUCH DAMAGE.
\ No newline at end of file

Propchange: felix/trunk/scrplugin/scrtask/src/main/appended-resources/META-INF/LICENSE
------------------------------------------------------------------------------
    svn:eol-style = native

Copied: felix/trunk/scrplugin/scrtask/src/main/appended-resources/META-INF/NOTICE (from r1372257,
felix/trunk/scrplugin/scrtask/NOTICE)
URL: http://svn.apache.org/viewvc/felix/trunk/scrplugin/scrtask/src/main/appended-resources/META-INF/NOTICE?p2=felix/trunk/scrplugin/scrtask/src/main/appended-resources/META-INF/NOTICE&p1=felix/trunk/scrplugin/scrtask/NOTICE&r1=1372257&r2=1372268&rev=1372268&view=diff
==============================================================================
--- felix/trunk/scrplugin/scrtask/NOTICE (original)
+++ felix/trunk/scrplugin/scrtask/src/main/appended-resources/META-INF/NOTICE Mon Aug 13 06:10:37
2012
@@ -1,10 +1,7 @@
-Apache Felix SCR Ant Task
-Copyright 2010-2011 The Apache Software Foundation
-
 This product includes software developed at
 The Apache Software Foundation (http://www.apache.org/).
 Licensed under the Apache License 2.0.
 
-This product uses software developed at
-The Codehaus (http://www.codehaus.org)
-Licensed under the Apache License 2.0.
\ No newline at end of file
+This product includes software developed at http://asm.objectweb.org
+Copyright (c) 2000-2011 INRIA, France Telecom
+Licensed under the BSD License.

Propchange: felix/trunk/scrplugin/scrtask/src/main/appended-resources/META-INF/NOTICE
------------------------------------------------------------------------------
    svn:eol-style = native



Mime
View raw message