[Jpackage-commits] dist/felix-framework/devel .cvsignore, 1.1, 1.2 felix-framework.demap, NONE, 1.1 felix-framework.spec, NONE, 1.1 org.apache.felix.framework-2.0.5~pom.xml.patch, NONE, 1.1 sources, 1.1, 1.2

David Walluck david at ryu.zarb.org
Thu Dec 23 23:43:19 CET 2010


Update of /home/projects/jpackage/cvs/dist/felix-framework/devel
In directory ryu.zarb.org:/tmp/cvs-serv5198/devel

Modified Files:
	.cvsignore sources 
Added Files:
	felix-framework.demap felix-framework.spec 
	org.apache.felix.framework-2.0.5~pom.xml.patch 
Log Message:
- initial import

Index: .cvsignore
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/felix-framework/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -C 2 -d -r1.1 -r1.2
*** .cvsignore	23 Dec 2010 22:42:08 -0000	1.1
--- .cvsignore	23 Dec 2010 22:43:17 -0000	1.2
***************
*** 0 ****
--- 1 ----
+ org.apache.felix.framework-2.0.5-project.tar.gz

Index: sources
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/felix-framework/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -C 2 -d -r1.1 -r1.2
*** sources	23 Dec 2010 22:42:08 -0000	1.1
--- sources	23 Dec 2010 22:43:17 -0000	1.2
***************
*** 0 ****
--- 1 ----
+ 961994c240406d373aef5932acc304cd  org.apache.felix.framework-2.0.5-project.tar.gz

--- NEW FILE: felix-framework.demap ---
<dependencies>
    <dependency>
      <maven>
        <groupId>org.osgi</groupId>
        <artifactId>org.osgi.core</artifactId>
        <version>4.2.0</version>
      </maven>
      <jpp>
        <groupId>JPP/felix</groupId>
        <artifactId>org.osgi.core</artifactId>
        <version>1.4.0</version>
      </jpp>
    </dependency>
    <dependency>
      <maven>
        <groupId>org.osgi</groupId>
        <artifactId>org.osgi.compendium</artifactId>
        <version>4.2.0</version>
      </maven>
      <jpp>
        <groupId>JPP/felix</groupId>
        <artifactId>org.osgi.compendium</artifactId>
        <version>1.4.0</version>
      </jpp>
    </dependency>
</dependencies>

--- NEW FILE: felix-framework.spec ---
# Prevent brp-java-repack-jars from being run.
%define __jar_repack %{nil}

%global project felix
%global bundle org.apache.felix.framework
%global groupId org.apache.felix
%global artifactId %{bundle}

Name:    %{project}-framework
Version: 2.0.5
Release: 3%{?dist}
Summary: Apache Felix Framework

Group:   Development/Libraries
License: ASL 2.0
URL:     http://felix.apache.org
Source0: http://www.apache.org/dist/felix/%{bundle}-%{version}-project.tar.gz
Source1: %{name}.demap

# Remove <parent>
# Remove rat-maven-plugin
Patch0: %{bundle}-%{version}~pom.xml.patch

BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch

BuildRequires: java-devel >= 1:1.6.0
BuildRequires: jpackage-utils
BuildRequires: felix-osgi-compendium
BuildRequires: felix-osgi-core
BuildRequires: maven2
BuildRequires:    maven-compiler-plugin
BuildRequires:    maven-install-plugin
BuildRequires:    maven-invoker-plugin
BuildRequires:    maven-jar-plugin
BuildRequires:    maven-javadoc-plugin
BuildRequires:    maven-release-plugin
BuildRequires:    maven-resources-plugin
# TODO check availability and use new names
#BuildRequires:    maven-surefire-plugin
#BuildRequires:    maven-bundle-plugin
# instead of
BuildRequires:    maven-plugin-bundle
BuildRequires:    maven-surefire-maven-plugin

Requires: felix-osgi-compendium
Requires: felix-osgi-core
Requires: java >= 1:1.6.0

Requires(post):   jpackage-utils
Requires(postun): jpackage-utils

%description
Apache Felix Framework Interfaces and Classes.

%package javadoc
Group:          Documentation
Summary:        Javadoc for %{name}
Requires:       jpackage-utils

%description javadoc
API documentation for %{name}.

%global POM %{_mavenpomdir}/JPP.%{project}-%{name}.pom

%prep
%setup -q -n %{bundle}-%{version}
%patch0 -p1 -b .sav
# remove tests due to rat-maven-plugin is removed
%__rm -rf src/test/java/

%build
export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
%__mkdir_p $MAVEN_REPO_LOCAL
mvn-jpp -e \
        -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
        -Dmaven2.jpp.depmap.file="%{SOURCE1}" \
        install javadoc:javadoc

%install
%__rm -rf %{buildroot}

# jars
install -d -m 0755 %{buildroot}%{_javadir}/%{project}
install -m 644 target/%{bundle}-%{version}.jar \
        %{buildroot}%{_javadir}/%{project}/%{bundle}-%{version}.jar

# versionless symlinks to jars
(cd %{buildroot}%{_javadir}/%{project} && for jar in *-%{version}*.jar; \
    do %__ln_s -f $jar `echo $jar| sed "s|-%{version}||g"`; done)

%add_to_maven_depmap %{groupId} %{artifactId} %{version} JPP/%{project} %{bundle}

# poms
install -d -m 755 %{buildroot}%{_mavenpomdir}
install -pm 644 pom.xml %{buildroot}%{POM}

# javadoc
install -d -m 0755 %{buildroot}%{_javadocdir}/%{name}-%{version}
%__cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}-%{version}/
%__ln_s %{name}-%{version} %{buildroot}%{_javadocdir}/%{name}
%__rm -rf target/site/api*

%post
%update_maven_depmap

%postun
%update_maven_depmap

%clean
%__rm -rf %{buildroot}

%files
%defattr(-,root,root,-)
%doc LICENSE
%{_javadir}/%{project}/*
%{POM}
%config(noreplace) %{_mavendepmapfragdir}/%{name}

%files javadoc
%defattr(-,root,root,-)
%{_javadocdir}/%{name}-%{version}
%{_javadocdir}/%{name}
%doc LICENSE

%changelog
* Tue Jul 13 2010 Victor G. Vasilyev <victor.vasilyev at sun.com> 2.0.5-3
- BR: maven-invoker-plugin required for maven-javadoc-plugin
- Use new names of the maven plgins
- Add license file to independent subpackage javadoc

* Tue Jul 13 2010 Victor G. Vasilyev <victor.vasilyev at sun.com> 2.0.5-2
- Use maven instead of ant

* Tue Jun 22 2010 Victor G. Vasilyev <victor.vasilyev at sun.com> 2.0.5-1
- Release 2.0.5

--- NEW FILE: org.apache.felix.framework-2.0.5~pom.xml.patch ---
diff -Nur org.apache.felix.framework-2.0.5/pom.xml org.apache.felix.framework-2.0.5.new/pom.xml
--- org.apache.felix.framework-2.0.5/pom.xml	2010-04-12 03:54:11.000000000 +0400
+++ org.apache.felix.framework-2.0.5.new/pom.xml	2010-07-13 04:15:35.407689445 +0400
@@ -17,15 +17,10 @@
  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>1.2.0</version>
-    <relativePath>../pom/pom.xml</relativePath>
-  </parent>
   <modelVersion>4.0.0</modelVersion>
   <packaging>bundle</packaging>
   <name>Apache Felix Framework</name>
+  <groupId>org.apache.felix</groupId>
   <artifactId>org.apache.felix.framework</artifactId>
   <version>2.0.5</version>
   <dependencies>
@@ -64,22 +59,6 @@
           </instructions>
         </configuration>
       </plugin>
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>rat-maven-plugin</artifactId>
-        <version>1.0-alpha-3</version>
-        <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>
     </plugins>
   </build>
 




More information about the JPackage-commits mailing list