changeset 9:8660c12b2bce

Updated felix-scr and maven-scr-plugin spec, patches and sources
author Jie Kang <jkang@redhat.com>
date Thu, 11 Jun 2015 11:20:26 -0400
parents 2b8d2475bf67
children 07bab12cf4c9
files rpmbuild/SOURCES/felix-scr-fix.patch rpmbuild/SOURCES/fix-felix-scr.patch rpmbuild/SOURCES/maven-scr-plugin-1.20.0.tar.gz rpmbuild/SOURCES/maven-scr-plugin-1.21.0.tar.gz rpmbuild/SOURCES/remove-animal-sniffer-annotations.patch rpmbuild/SOURCES/use-felix-framework.patch rpmbuild/SPECS/felix-scr.spec rpmbuild/SPECS/maven-scr-plugin.spec
diffstat 8 files changed, 330 insertions(+), 255 deletions(-) [+]
line wrap: on
line diff
--- a/rpmbuild/SOURCES/felix-scr-fix.patch	Wed Jun 10 08:45:29 2015 -0400
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,247 +0,0 @@
-Index: pom.xml
-===================================================================
---- pom.xml	(revision 1681751)
-+++ pom.xml	(working copy)
-@@ -36,7 +36,7 @@
-         <developerConnection>scm:svn:https://svn.apache.org/repos/asf/felix/releases/org.apache.felix.scr-1.8.2</developerConnection>
-         <url>scm:svn:https://svn.apache.org/repos/asf/felix/releases/org.apache.felix.scr-1.8.2</url>
-     </scm>
--    
-+
-     <!--
-         A Note on Testing
-         =================
-@@ -72,20 +72,13 @@
-         </bundle.file.name>
-         <felix.ca.version>1.8.0</felix.ca.version>
-     </properties>
--    
--    
-+
-+
-     <dependencies>
-         <dependency>
--            <groupId>org.osgi</groupId>
--            <artifactId>org.osgi.core</artifactId>
--            <version>5.0.0</version>
--            <scope>provided</scope>
--            <exclusions>
--                <exclusion>
--                    <groupId>org.osgi</groupId>
--                    <artifactId>org.osgi.compendium</artifactId>
--                </exclusion>
--            </exclusions>
-+            <groupId>org.apache.felix</groupId>
-+            <artifactId>org.apache.felix.framework</artifactId>
-+            <version>4.6.0</version>
-         </dependency>
-         <dependency>
-             <groupId>org.osgi</groupId>
-@@ -138,7 +131,7 @@
-             <version>3.2.0</version>
-             <scope>test</scope>
-         </dependency>
--    
-+
-         <dependency>
-             <groupId>org.ops4j.pax.exam</groupId>
-             <artifactId>pax-exam-link-mvn</artifactId>
-@@ -145,7 +138,7 @@
-             <version>3.2.0</version>
-             <scope>test</scope>
-         </dependency>
--    
-+
-         <dependency>
-             <groupId>org.ops4j.pax.url</groupId>
-             <artifactId>pax-url-aether</artifactId>
-@@ -170,7 +163,7 @@
-             <version>1.6.3</version>
-             <scope>test</scope>
-         </dependency>
--    
-+
-         <dependency>
-             <groupId>ch.qos.logback</groupId>
-             <artifactId>logback-core</artifactId>
-@@ -177,7 +170,7 @@
-             <version>0.9.29</version>
-             <scope>test</scope>
-         </dependency>
--    
-+
-         <dependency>
-             <groupId>ch.qos.logback</groupId>
-             <artifactId>logback-classic</artifactId>
-@@ -220,12 +213,12 @@
-             <version>1.0.0</version>
-             <scope>test</scope>
-         </dependency>
--		<dependency>
--			<groupId>org.codehaus.mojo</groupId>
--			<artifactId>animal-sniffer-annotations</artifactId>
--			<version>1.9</version>
--			<scope>compile</scope>
--		</dependency>
-+        <dependency>
-+            <groupId>org.codehaus.mojo</groupId>
-+            <artifactId>animal-sniffer-annotations</artifactId>
-+            <version>1.9</version>
-+            <scope>compile</scope>
-+        </dependency>
-     </dependencies>
-     <build>
-         <directory>${bundle.build.name}</directory>
-@@ -251,7 +244,7 @@
-                         <Export-Package>
-                             org.apache.felix.scr;version=1.8,
-                             org.apache.felix.scr.component;version=1.0;
--                                mandatory:="status"; status="provisional",
-+                            mandatory:="status"; status="provisional",
-                             org.osgi.service.component
-                         </Export-Package>
-                         <Private-Package>
-@@ -275,12 +268,12 @@
-                                 optional import for Gogo annotations 
-                             -->
-                             org.apache.felix.service.command;resolution:=optional,
--                            
-+
-                             <!--
-                                 The Felix Shell support is optional 
-                             -->
-                             org.apache.felix.shell;provide:=true;resolution:=optional,
--                            
-+
-                             <!--
-                                 Framework version 1.4 (from R4.1) is required
-                                 because we depend on ServiceReference being
-@@ -288,7 +281,7 @@
-                                 being available.
-                             -->
-                             org.osgi.framework;version="[1.4,2)",
--                            
-+
-                             <!--
-                                 LogService is optional but if present the
-                                 R4.0 version 1.3 is sufficient.
-@@ -302,7 +295,7 @@
-                                 R4.0 version 1.2 is sufficient. 
-                             -->
-                             org.osgi.service.packageadmin;version="[1.2,2)";resolution:=optional,
--                            
-+
-                             <!--
-                                 SCR API is required (we also export it) and must
-                                 be of the same minor version as we export, because
-@@ -327,7 +320,7 @@
-                                 Configuration Admin version 1.2 (from R4.0) is enough
-                             -->
-                             org.osgi.service.cm;version="[1.2,2)",
--                            
-+
-                             <!--
-                                 Metatype is optional and if it is
-                                 present, version 1.1 (from R4.1) is enough  
-@@ -345,7 +338,7 @@
-                 Ensure not using too recent Java API
-                 - Ensure Java 5 API
-             -->
--             <plugin>
-+            <plugin>
-                 <groupId>org.codehaus.mojo</groupId>
-                 <artifactId>animal-sniffer-maven-plugin</artifactId>
-                 <version>1.7</version>
-@@ -394,17 +387,17 @@
-                 <artifactId>maven-failsafe-plugin</artifactId>
-                 <version>2.12</version>
-                 <executions>
--                  <execution>
--                    <goals>
--                      <goal>integration-test</goal>
--                      <goal>verify</goal>
--                    </goals>
--                  </execution>
-+                    <execution>
-+                        <goals>
-+                            <goal>integration-test</goal>
-+                            <goal>verify</goal>
-+                        </goals>
-+                    </execution>
-                 </executions>
-                 <configuration>
-                     <systemPropertyVariables>
-                         <project.bundle.file>${bundle.file.name}</project.bundle.file>
--                        <felix.ca.version>${felix.ca.version}</felix.ca.version>    
-+                        <felix.ca.version>${felix.ca.version}</felix.ca.version>
-                     </systemPropertyVariables>
-                     <excludes>
-                         <exclude>**/components/**</exclude>
-@@ -422,7 +415,7 @@
-                     <excludePackageNames>*.impl</excludePackageNames>
-                 </configuration>
-             </plugin>
--             <plugin>
-+            <plugin>
-                 <groupId>org.apache.aries.versioning</groupId>
-                 <artifactId>org.apache.aries.versioning.plugin</artifactId>
-                 <version>0.1.0</version>
-@@ -442,20 +435,6 @@
-         </plugins>
-     </build>
- 
--	<reporting>
--		<plugins>
--			<plugin>
--				<groupId>org.codehaus.mojo</groupId>
--				<artifactId>findbugs-maven-plugin</artifactId>
--				<version>2.5.2</version>
--				<configuration>
--					<effort>Max</effort>
--					<threshold>Low</threshold>
--				</configuration>
--			</plugin>
--		</plugins>
--	</reporting>
--
-     <profiles>
-         <!--
-             copy the package such that IDEs may easily use it without
-@@ -491,14 +470,6 @@
-             <activation>
-                 <activeByDefault>true</activeByDefault>
-             </activation>
--            <dependencies>
--                <dependency>
--                    <groupId>org.apache.felix</groupId>
--                    <artifactId>org.apache.felix.framework</artifactId>
--                    <version>4.0.2</version>
--                    <scope>test</scope>
--                </dependency>
--            </dependencies>
-         </profile>
-         <profile>
-             <id>equinox</id>
-@@ -520,5 +491,4 @@
-             </properties>
-         </profile>
-     </profiles>
--        
- </project>
-Index: src/main/java/org/apache/felix/scr/impl/manager/ThreadDump.java
-===================================================================
---- src/main/java/org/apache/felix/scr/impl/manager/ThreadDump.java	(revision 1681751)
-+++ src/main/java/org/apache/felix/scr/impl/manager/ThreadDump.java	(working copy)
-@@ -23,12 +23,9 @@
- import java.lang.management.ThreadMXBean;
- import java.util.concurrent.Callable;
- 
--import org.codehaus.mojo.animal_sniffer.IgnoreJRERequirement;
--
- public class ThreadDump implements Callable<String>
- {
- 
--    @IgnoreJRERequirement
-     public String call() throws Exception
-     {
-         ThreadMXBean threadMXBean = ManagementFactory.getThreadMXBean();
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rpmbuild/SOURCES/fix-felix-scr.patch	Thu Jun 11 11:20:26 2015 -0400
@@ -0,0 +1,247 @@
+Index: pom.xml
+===================================================================
+--- pom.xml	(revision 1681751)
++++ pom.xml	(working copy)
+@@ -36,7 +36,7 @@
+         <developerConnection>scm:svn:https://svn.apache.org/repos/asf/felix/releases/org.apache.felix.scr-1.8.2</developerConnection>
+         <url>scm:svn:https://svn.apache.org/repos/asf/felix/releases/org.apache.felix.scr-1.8.2</url>
+     </scm>
+-    
++
+     <!--
+         A Note on Testing
+         =================
+@@ -72,20 +72,13 @@
+         </bundle.file.name>
+         <felix.ca.version>1.8.0</felix.ca.version>
+     </properties>
+-    
+-    
++
++
+     <dependencies>
+         <dependency>
+-            <groupId>org.osgi</groupId>
+-            <artifactId>org.osgi.core</artifactId>
+-            <version>5.0.0</version>
+-            <scope>provided</scope>
+-            <exclusions>
+-                <exclusion>
+-                    <groupId>org.osgi</groupId>
+-                    <artifactId>org.osgi.compendium</artifactId>
+-                </exclusion>
+-            </exclusions>
++            <groupId>org.apache.felix</groupId>
++            <artifactId>org.apache.felix.framework</artifactId>
++            <version>4.6.0</version>
+         </dependency>
+         <dependency>
+             <groupId>org.osgi</groupId>
+@@ -138,7 +131,7 @@
+             <version>3.2.0</version>
+             <scope>test</scope>
+         </dependency>
+-    
++
+         <dependency>
+             <groupId>org.ops4j.pax.exam</groupId>
+             <artifactId>pax-exam-link-mvn</artifactId>
+@@ -145,7 +138,7 @@
+             <version>3.2.0</version>
+             <scope>test</scope>
+         </dependency>
+-    
++
+         <dependency>
+             <groupId>org.ops4j.pax.url</groupId>
+             <artifactId>pax-url-aether</artifactId>
+@@ -170,7 +163,7 @@
+             <version>1.6.3</version>
+             <scope>test</scope>
+         </dependency>
+-    
++
+         <dependency>
+             <groupId>ch.qos.logback</groupId>
+             <artifactId>logback-core</artifactId>
+@@ -177,7 +170,7 @@
+             <version>0.9.29</version>
+             <scope>test</scope>
+         </dependency>
+-    
++
+         <dependency>
+             <groupId>ch.qos.logback</groupId>
+             <artifactId>logback-classic</artifactId>
+@@ -220,12 +213,12 @@
+             <version>1.0.0</version>
+             <scope>test</scope>
+         </dependency>
+-		<dependency>
+-			<groupId>org.codehaus.mojo</groupId>
+-			<artifactId>animal-sniffer-annotations</artifactId>
+-			<version>1.9</version>
+-			<scope>compile</scope>
+-		</dependency>
++        <dependency>
++            <groupId>org.codehaus.mojo</groupId>
++            <artifactId>animal-sniffer-annotations</artifactId>
++            <version>1.9</version>
++            <scope>compile</scope>
++        </dependency>
+     </dependencies>
+     <build>
+         <directory>${bundle.build.name}</directory>
+@@ -251,7 +244,7 @@
+                         <Export-Package>
+                             org.apache.felix.scr;version=1.8,
+                             org.apache.felix.scr.component;version=1.0;
+-                                mandatory:="status"; status="provisional",
++                            mandatory:="status"; status="provisional",
+                             org.osgi.service.component
+                         </Export-Package>
+                         <Private-Package>
+@@ -275,12 +268,12 @@
+                                 optional import for Gogo annotations 
+                             -->
+                             org.apache.felix.service.command;resolution:=optional,
+-                            
++
+                             <!--
+                                 The Felix Shell support is optional 
+                             -->
+                             org.apache.felix.shell;provide:=true;resolution:=optional,
+-                            
++
+                             <!--
+                                 Framework version 1.4 (from R4.1) is required
+                                 because we depend on ServiceReference being
+@@ -288,7 +281,7 @@
+                                 being available.
+                             -->
+                             org.osgi.framework;version="[1.4,2)",
+-                            
++
+                             <!--
+                                 LogService is optional but if present the
+                                 R4.0 version 1.3 is sufficient.
+@@ -302,7 +295,7 @@
+                                 R4.0 version 1.2 is sufficient. 
+                             -->
+                             org.osgi.service.packageadmin;version="[1.2,2)";resolution:=optional,
+-                            
++
+                             <!--
+                                 SCR API is required (we also export it) and must
+                                 be of the same minor version as we export, because
+@@ -327,7 +320,7 @@
+                                 Configuration Admin version 1.2 (from R4.0) is enough
+                             -->
+                             org.osgi.service.cm;version="[1.2,2)",
+-                            
++
+                             <!--
+                                 Metatype is optional and if it is
+                                 present, version 1.1 (from R4.1) is enough  
+@@ -345,7 +338,7 @@
+                 Ensure not using too recent Java API
+                 - Ensure Java 5 API
+             -->
+-             <plugin>
++            <plugin>
+                 <groupId>org.codehaus.mojo</groupId>
+                 <artifactId>animal-sniffer-maven-plugin</artifactId>
+                 <version>1.7</version>
+@@ -394,17 +387,17 @@
+                 <artifactId>maven-failsafe-plugin</artifactId>
+                 <version>2.12</version>
+                 <executions>
+-                  <execution>
+-                    <goals>
+-                      <goal>integration-test</goal>
+-                      <goal>verify</goal>
+-                    </goals>
+-                  </execution>
++                    <execution>
++                        <goals>
++                            <goal>integration-test</goal>
++                            <goal>verify</goal>
++                        </goals>
++                    </execution>
+                 </executions>
+                 <configuration>
+                     <systemPropertyVariables>
+                         <project.bundle.file>${bundle.file.name}</project.bundle.file>
+-                        <felix.ca.version>${felix.ca.version}</felix.ca.version>    
++                        <felix.ca.version>${felix.ca.version}</felix.ca.version>
+                     </systemPropertyVariables>
+                     <excludes>
+                         <exclude>**/components/**</exclude>
+@@ -422,7 +415,7 @@
+                     <excludePackageNames>*.impl</excludePackageNames>
+                 </configuration>
+             </plugin>
+-             <plugin>
++            <plugin>
+                 <groupId>org.apache.aries.versioning</groupId>
+                 <artifactId>org.apache.aries.versioning.plugin</artifactId>
+                 <version>0.1.0</version>
+@@ -442,20 +435,6 @@
+         </plugins>
+     </build>
+ 
+-	<reporting>
+-		<plugins>
+-			<plugin>
+-				<groupId>org.codehaus.mojo</groupId>
+-				<artifactId>findbugs-maven-plugin</artifactId>
+-				<version>2.5.2</version>
+-				<configuration>
+-					<effort>Max</effort>
+-					<threshold>Low</threshold>
+-				</configuration>
+-			</plugin>
+-		</plugins>
+-	</reporting>
+-
+     <profiles>
+         <!--
+             copy the package such that IDEs may easily use it without
+@@ -491,14 +470,6 @@
+             <activation>
+                 <activeByDefault>true</activeByDefault>
+             </activation>
+-            <dependencies>
+-                <dependency>
+-                    <groupId>org.apache.felix</groupId>
+-                    <artifactId>org.apache.felix.framework</artifactId>
+-                    <version>4.0.2</version>
+-                    <scope>test</scope>
+-                </dependency>
+-            </dependencies>
+         </profile>
+         <profile>
+             <id>equinox</id>
+@@ -520,5 +491,4 @@
+             </properties>
+         </profile>
+     </profiles>
+-        
+ </project>
+Index: src/main/java/org/apache/felix/scr/impl/manager/ThreadDump.java
+===================================================================
+--- src/main/java/org/apache/felix/scr/impl/manager/ThreadDump.java	(revision 1681751)
++++ src/main/java/org/apache/felix/scr/impl/manager/ThreadDump.java	(working copy)
+@@ -23,12 +23,9 @@
+ import java.lang.management.ThreadMXBean;
+ import java.util.concurrent.Callable;
+ 
+-import org.codehaus.mojo.animal_sniffer.IgnoreJRERequirement;
+-
+ public class ThreadDump implements Callable<String>
+ {
+ 
+-    @IgnoreJRERequirement
+     public String call() throws Exception
+     {
+         ThreadMXBean threadMXBean = ManagementFactory.getThreadMXBean();
Binary file rpmbuild/SOURCES/maven-scr-plugin-1.20.0.tar.gz has changed
Binary file rpmbuild/SOURCES/maven-scr-plugin-1.21.0.tar.gz has changed
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rpmbuild/SOURCES/remove-animal-sniffer-annotations.patch	Thu Jun 11 11:20:26 2015 -0400
@@ -0,0 +1,34 @@
+Index: pom.xml
+===================================================================
+--- pom.xml	(revision 1681751)
++++ pom.xml	(working copy)
+@@ -220,12 +220,6 @@
+             <version>1.0.0</version>
+             <scope>test</scope>
+         </dependency>
+-		<dependency>
+-			<groupId>org.codehaus.mojo</groupId>
+-			<artifactId>animal-sniffer-annotations</artifactId>
+-			<version>1.9</version>
+-			<scope>compile</scope>
+-		</dependency>
+     </dependencies>
+     <build>
+         <directory>${bundle.build.name}</directory>
+Index: src/main/java/org/apache/felix/scr/impl/manager/ThreadDump.java
+===================================================================
+--- src/main/java/org/apache/felix/scr/impl/manager/ThreadDump.java	(revision 1681751)
++++ src/main/java/org/apache/felix/scr/impl/manager/ThreadDump.java	(working copy)
+@@ -23,12 +23,9 @@
+ import java.lang.management.ThreadMXBean;
+ import java.util.concurrent.Callable;
+ 
+-import org.codehaus.mojo.animal_sniffer.IgnoreJRERequirement;
+-
+ public class ThreadDump implements Callable<String>
+ {
+ 
+-    @IgnoreJRERequirement
+     public String call() throws Exception
+     {
+         ThreadMXBean threadMXBean = ManagementFactory.getThreadMXBean();
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rpmbuild/SOURCES/use-felix-framework.patch	Thu Jun 11 11:20:26 2015 -0400
@@ -0,0 +1,39 @@
+Index: pom.xml
+===================================================================
+--- pom.xml	(revision 1681751)
++++ pom.xml	(working copy)
+@@ -76,16 +76,9 @@
+     
+     <dependencies>
+         <dependency>
+-            <groupId>org.osgi</groupId>
+-            <artifactId>org.osgi.core</artifactId>
+-            <version>5.0.0</version>
+-            <scope>provided</scope>
+-            <exclusions>
+-                <exclusion>
+-                    <groupId>org.osgi</groupId>
+-                    <artifactId>org.osgi.compendium</artifactId>
+-                </exclusion>
+-            </exclusions>
++            <groupId>org.apache.felix</groupId>
++            <artifactId>org.apache.felix.framework</artifactId>
++            <version>4.6.0</version>
+         </dependency>
+         <dependency>
+             <groupId>org.osgi</groupId>
+@@ -491,14 +484,6 @@
+             <activation>
+                 <activeByDefault>true</activeByDefault>
+             </activation>
+-            <dependencies>
+-                <dependency>
+-                    <groupId>org.apache.felix</groupId>
+-                    <artifactId>org.apache.felix.framework</artifactId>
+-                    <version>4.0.2</version>
+-                    <scope>test</scope>
+-                </dependency>
+-            </dependencies>
+         </profile>
+         <profile>
+             <id>equinox</id>
--- a/rpmbuild/SPECS/felix-scr.spec	Wed Jun 10 08:45:29 2015 -0400
+++ b/rpmbuild/SPECS/felix-scr.spec	Thu Jun 11 11:20:26 2015 -0400
@@ -18,7 +18,8 @@
 # tar -cJvf org.apache.felix.scr-1.8.2.tar.gz org.apache.felix.scr-1.8.2
 Source0:	%{bundle}-%{version}.tar.gz	
 
-Patch0:         felix-scr-fix.patch
+Patch0:         use-felix-framework.patch
+Patch1:         remove-animal-sniffer-annotations.patch
 
 BuildArch:      noarch
 
@@ -30,6 +31,7 @@
 BuildRequires: mvn(org.apache.felix:felix-parent:pom:)
 BuildRequires: mvn(org.apache.felix:org.apache.felix.framework)
 BuildRequires: mvn(org.apache.felix:org.apache.felix.gogo.runtime)
+
 BuildRequires: mvn(org.apache.felix:org.apache.felix.shell)
 BuildRequires: mvn(org.apache.felix:org.apache.felix.utils)
 BuildRequires: mvn(org.apache.felix:maven-bundle-plugin)
@@ -41,7 +43,7 @@
 Requires:       java-headless >= 1:1.8.0
 
 %description
-Apache Felix' Service Component Runtime
+Apache Felix Service Component Runtime implementation of OSGi Declarative Services Specification
 
 %package javadoc
 Summary:       Javadoc for %{name}
@@ -53,11 +55,11 @@
 %prep
 %setup -q -n %{bundle}-%{version}
 %patch0
+%patch1
 %pom_remove_plugin :animal-sniffer-maven-plugin
 %pom_xpath_remove "pom:project/pom:dependencies/pom:dependency[pom:scope='test']"
 
 %pom_remove_dep org.ops4j.base:
-%pom_remove_dep org.codehaus.mojo:animal-sniffer-annotations
 
 %mvn_file :%{name} %{project}/%{name}
 
--- a/rpmbuild/SPECS/maven-scr-plugin.spec	Wed Jun 10 08:45:29 2015 -0400
+++ b/rpmbuild/SPECS/maven-scr-plugin.spec	Thu Jun 11 11:20:26 2015 -0400
@@ -1,5 +1,5 @@
 Name:           maven-scr-plugin
-Version:        1.20.0
+Version:        1.21.0
 Release:        1%{?dist}
 Summary:        Apache Felix Maven SCR Plugin	
 License:        Apache License V2.0
@@ -9,8 +9,8 @@
 # For building from version control
 # The source for this package was built from upstream's vcs. Use the following
 # commands to generate the tarball:
-# svn checkout http://svn.apache.org/repos/asf/felix/releases/maven-scr-plugin-1.20.0/
-# tar -cJvf maven-scr-plugin-1.20.0.tar.gz maven-scr-plugin-1.20.0
+# svn checkout http://svn.apache.org/repos/asf/felix/releases/maven-scr-plugin-1.21.0/
+# tar -cJvf maven-scr-plugin-1.21.0.tar.gz maven-scr-plugin-1.21.0
 Source0:        %{name}-%{version}.tar.gz	
 
 BuildRequires:	javapackages-tools
@@ -29,7 +29,7 @@
 Requires:       felix-osgi-compendium
 
 %description
-Apache Felix' Service Component Runtime
+Maven plugin for generating OSGi Declarative Services annotations
 
 %package javadoc
 Summary:       Javadoc for %{name}
@@ -45,7 +45,7 @@
 %mvn_file : %{name}
 
 %build
-%mvn_build -f
+%mvn_build
 
 %install
 %mvn_install