felix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pa...@apache.org
Subject svn commit: r1174098 - in /felix/trunk/main: ./ src/main/appended-resources/ src/main/appended-resources/META-INF/
Date Thu, 22 Sep 2011 12:46:54 GMT
Author: pauls
Date: Thu Sep 22 12:46:54 2011
New Revision: 1174098

URL: http://svn.apache.org/viewvc?rev=1174098&view=rev
Log:
Update to latest parent pom 2.1

Added:
    felix/trunk/main/src/main/appended-resources/
    felix/trunk/main/src/main/appended-resources/META-INF/
    felix/trunk/main/src/main/appended-resources/META-INF/DEPENDENCIES   (contents, props
changed)
      - copied, changed from r1173984, felix/trunk/main/DEPENDENCIES
    felix/trunk/main/src/main/appended-resources/META-INF/LICENSE   (props changed)
      - copied unchanged from r1173984, felix/trunk/main/LICENSE
    felix/trunk/main/src/main/appended-resources/META-INF/NOTICE   (contents, props changed)
      - copied, changed from r1173984, felix/trunk/main/NOTICE
Removed:
    felix/trunk/main/DEPENDENCIES
    felix/trunk/main/LICENSE
    felix/trunk/main/NOTICE
Modified:
    felix/trunk/main/pom.xml

Modified: felix/trunk/main/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/main/pom.xml?rev=1174098&r1=1174097&r2=1174098&view=diff
==============================================================================
--- felix/trunk/main/pom.xml (original)
+++ felix/trunk/main/pom.xml Thu Sep 22 12:46:54 2011
@@ -20,7 +20,7 @@
  <parent>
     <groupId>org.apache.felix</groupId>
     <artifactId>felix-parent</artifactId>
-    <version>1.2.1</version>
+    <version>2.1</version>
     <relativePath>../pom/pom.xml</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
@@ -72,26 +72,10 @@
             <Private-Package>org.apache.felix.main.*</Private-Package>
             <Export-Package>!org.osgi.service.log, !org.osgi.service.obr,org.osgi.*</Export-Package>
             <Import-Package>!*</Import-Package>
-            <Include-Resource>META-INF/LICENSE=LICENSE,META-INF/NOTICE=NOTICE,META-INF/DEPENDENCIES=DEPENDENCIES,{src/main/resources/}</Include-Resource>
           </instructions>
         </configuration>
       </plugin>
       <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>rat-maven-plugin</artifactId>
-        <configuration>
-          <excludeSubProjects>false</excludeSubProjects>
-          <useEclipseDefaultExcludes>true</useEclipseDefaultExcludes>
-          <useMavenDefaultExcludes>true</useMavenDefaultExcludes>
-          <excludes>
-            <param>doc/*</param>
-            <param>maven-eclipse.xml</param>
-            <param>.checkstyle</param>
-            <param>.externalToolBuilders/*</param>
-          </excludes>
-        </configuration>
-      </plugin>
-      <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-dependency-plugin</artifactId>
         <executions>
@@ -167,15 +151,6 @@
         <directory>src/main/resources</directory>
         <filtering>true</filtering>
       </resource>
-      <resource>
-      <directory>.</directory>
-      <targetPath>META-INF</targetPath>
-      <includes>
-        <include>LICENSE*</include>
-        <include>NOTICE*</include>
-        <include>DEPENDENCIES*</include>
-      </includes>
-    </resource>
     </resources> 
   </build>
 </project>

Copied: felix/trunk/main/src/main/appended-resources/META-INF/DEPENDENCIES (from r1173984,
felix/trunk/main/DEPENDENCIES)
URL: http://svn.apache.org/viewvc/felix/trunk/main/src/main/appended-resources/META-INF/DEPENDENCIES?p2=felix/trunk/main/src/main/appended-resources/META-INF/DEPENDENCIES&p1=felix/trunk/main/DEPENDENCIES&r1=1173984&r2=1174098&rev=1174098&view=diff
==============================================================================
--- felix/trunk/main/DEPENDENCIES (original)
+++ felix/trunk/main/src/main/appended-resources/META-INF/DEPENDENCIES Thu Sep 22 12:46:54
2011
@@ -1,10 +1,3 @@
-Apache Felix Main
-Copyright 2011 The Apache Software Foundation
-
-This software was developed at the Apache Software Foundation
-(http://www.apache.org) and may have dependencies on other
-Apache software licensed under Apache License 2.0.
-
 I. Included Third-Party Software
 
 This product includes software developed at
@@ -19,9 +12,5 @@ The OSGi Alliance (http://www.osgi.org/)
 Copyright (c) OSGi Alliance (2000, 2009).
 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.
-
 III. License Summary
 - Apache License 2.0

Propchange: felix/trunk/main/src/main/appended-resources/META-INF/DEPENDENCIES
------------------------------------------------------------------------------
    svn:mergeinfo = 

Propchange: felix/trunk/main/src/main/appended-resources/META-INF/LICENSE
------------------------------------------------------------------------------
    svn:mergeinfo = 

Copied: felix/trunk/main/src/main/appended-resources/META-INF/NOTICE (from r1173984, felix/trunk/main/NOTICE)
URL: http://svn.apache.org/viewvc/felix/trunk/main/src/main/appended-resources/META-INF/NOTICE?p2=felix/trunk/main/src/main/appended-resources/META-INF/NOTICE&p1=felix/trunk/main/NOTICE&r1=1173984&r2=1174098&rev=1174098&view=diff
==============================================================================
--- felix/trunk/main/NOTICE (original)
+++ felix/trunk/main/src/main/appended-resources/META-INF/NOTICE Thu Sep 22 12:46:54 2011
@@ -1,10 +1,3 @@
-Apache Felix Main
-Copyright 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 includes software developed at
 The OSGi Alliance (http://www.osgi.org/).
 Copyright (c) OSGi Alliance (2000, 2009).

Propchange: felix/trunk/main/src/main/appended-resources/META-INF/NOTICE
------------------------------------------------------------------------------
    svn:mergeinfo = 



Mime
View raw message