Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package felix-shell for openSUSE:Factory checked in at 2022-03-17 17:01:47 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/felix-shell (Old) and /work/SRC/openSUSE:Factory/.felix-shell.new.25692 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "felix-shell" Thu Mar 17 17:01:47 2022 rev:4 rq:962398 version:1.4.3 Changes: -------- --- /work/SRC/openSUSE:Factory/felix-shell/felix-shell.changes 2020-04-01 19:19:07.023552138 +0200 +++ /work/SRC/openSUSE:Factory/.felix-shell.new.25692/felix-shell.changes 2022-03-17 17:02:01.573709595 +0100 @@ -1,0 +2,7 @@ +Wed Mar 16 12:49:38 UTC 2022 - Fridrich Strba <fst...@suse.com> + +- Rewrite the build system to ant so that we can eventually avoid + build cycles with maven-plugin-bundle built against + felix-bundlerepository + +------------------------------------------------------------------- New: ---- org.apache.felix.shell-build.xml ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ felix-shell.spec ++++++ --- /var/tmp/diff_new_pack.oYUUOZ/_old 2022-03-17 17:02:02.133710024 +0100 +++ /var/tmp/diff_new_pack.oYUUOZ/_new 2022-03-17 17:02:02.141710030 +0100 @@ -1,7 +1,7 @@ # # spec file for package felix-shell # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2022 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -25,12 +25,14 @@ Group: Development/Libraries/Java URL: https://felix.apache.org Source0: http://archive.apache.org/dist/felix/%{bundle}-%{version}-source-release.tar.gz +Source1: %{bundle}-build.xml +BuildRequires: ant BuildRequires: fdupes -BuildRequires: maven-local -BuildRequires: mvn(org.apache.felix:felix-parent:pom:) -BuildRequires: mvn(org.apache.felix:maven-bundle-plugin) -BuildRequires: mvn(org.osgi:osgi.cmpn) -BuildRequires: mvn(org.osgi:osgi.core) +BuildRequires: javapackages-local +BuildRequires: osgi-compendium +BuildRequires: osgi-core +Requires: mvn(org.osgi:osgi.cmpn) +Requires: mvn(org.osgi:osgi.core) BuildArch: noarch %description @@ -45,6 +47,10 @@ %prep %setup -q -n %{bundle}-%{version} +cp %{SOURCE1} build.xml + +%pom_remove_parent +%pom_xpath_inject pom:project "<groupId>org.apache.felix</groupId>" %pom_remove_plugin org.codehaus.mojo:rat-maven-plugin @@ -52,25 +58,32 @@ %pom_change_dep :org.osgi.core org.osgi:osgi.core %pom_change_dep :org.osgi.compendium org.osgi:osgi.cmpn -%pom_add_dep junit:junit::test - -%{mvn_file} :%{bundle} "felix/%{bundle}" - %build -%{mvn_build} -f \ -%if %{?pkg_vcmp:%pkg_vcmp java-devel >= 9}%{!?pkg_vcmp:0} - -- -Dmaven.compiler.release=6 -%endif +mkdir -p lib +build-jar-repository -s lib osgi-core osgi-compendium +%ant jar javadoc %install -%mvn_install +# jar +install -d -m 755 %{buildroot}%{_javadir}/felix +install -m 644 target/%{bundle}-%{version}.jar %{buildroot}%{_javadir}/felix/%{bundle}.jar + +# pom +install -d -m 755 %{buildroot}%{_mavenpomdir}/felix +install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/felix/%{bundle}.pom +%add_maven_depmap felix/%{bundle}.pom felix/%{bundle}.jar + +# javadoc +install -d -m 755 %{buildroot}%{_javadocdir}/%{name} +cp -r target/site/apidocs/* %{buildroot}/%{_javadocdir}/%{name} %fdupes -s %{buildroot}%{_javadocdir} %files -f .mfiles %license LICENSE NOTICE %doc DEPENDENCIES -%files javadoc -f .mfiles-javadoc +%files javadoc +%{_javadocdir}/%{name} %license LICENSE NOTICE %changelog ++++++ org.apache.felix.shell-build.xml ++++++ <?xml version="1.0" encoding="UTF-8"?> <project name="org.apache.felix.shell" default="package" basedir="."> <!-- ====================================================================== --> <!-- Build environment properties --> <!-- ====================================================================== --> <property file="build.properties"/> <property name="project.groupId" value="org.apache.felix"/> <property name="project.artifactId" value="org.apache.felix.shell"/> <property name="project.version" value="1.4.3"/> <property name="compiler.source" value="1.8"/> <property name="compiler.target" value="${compiler.source}"/> <property name="build.finalName" value="${project.artifactId}-${project.version}"/> <property name="build.dir" value="target"/> <property name="build.outputDir" value="${build.dir}/classes"/> <property name="build.srcDir" value="src/main/java"/> <property name="build.resourceDir" value="src/main/resources"/> <property name="reporting.outputDirectory" value="${build.dir}/site"/> <!-- ====================================================================== --> <!-- Defining classpaths --> <!-- ====================================================================== --> <path id="build.classpath"> <fileset dir="lib"> <include name="**/*"/> </fileset> </path> <!-- ====================================================================== --> <!-- Cleaning up target --> <!-- ====================================================================== --> <target name="clean" description="Clean the output directory"> <delete dir="${build.dir}"/> </target> <!-- ====================================================================== --> <!-- Compilation target --> <!-- ====================================================================== --> <target name="compile" description="Compile the code"> <mkdir dir="${build.outputDir}"/> <javac destdir="${build.outputDir}" encoding="UTF-8" nowarn="false" debug="true" optimize="false" deprecation="true" target="${compiler.target}" verbose="false" fork="false" source="${compiler.source}"> <src> <pathelement location="${build.srcDir}"/> </src> <classpath refid="build.classpath"/> </javac> <copy todir="${build.outputDir}"> <fileset dir="${build.resourceDir}"/> </copy> </target> <!-- ====================================================================== --> <!-- Javadoc target --> <!-- ====================================================================== --> <target name="javadoc" description="Generates the Javadoc of the application"> <javadoc sourcepath="${build.srcDir}" packagenames="*" destdir="${reporting.outputDirectory}/apidocs" access="protected" verbose="false" encoding="UTF-8" version="true" use="true" author="true" splitindex="false" nodeprecated="false" nodeprecatedlist="false" notree="false" noindex="false" nohelp="false" nonavbar="false" serialwarn="false" charset="UTF-8" linksource="false" breakiterator="false" source="${compiler.source}"> <classpath refid="build.classpath"/> </javadoc> </target> <!-- ====================================================================== --> <!-- Package target --> <!-- ====================================================================== --> <target name="package" depends="compile" description="Package the application"> <jar jarfile="${build.dir}/${build.finalName}.jar" compress="true" index="false" basedir="${build.outputDir}" excludes="**/package.html"> <manifest> <attribute name="Bundle-Activator" value="org.apache.felix.shell.impl.Activator"/> <attribute name="Bundle-Description" value="A simple OSGi command shell service."/> <attribute name="Bundle-DocURL" value="https://www.apache.org/"/> <attribute name="Bundle-License" value="https://www.apache.org/licenses/LICENSE-2.0.txt"/> <attribute name="Bundle-ManifestVersion" value="2"/> <attribute name="Bundle-Name" value="Apache Felix Shell Service"/> <attribute name="Bundle-SymbolicName" value="${project.artifactId}"/> <attribute name="Bundle-Vendor" value="The Apache Software Foundation"/> <attribute name="Bundle-Version" value="${project.version}"/> <attribute name="Export-Package" value="org.apache.felix.shell;version="1.0.0";uses:="org.osgi.framework",org.osgi.service.log;version="1.4";uses:="org.osgi.framework",org.ungoverned.osgi.service.shell;version="1.0.0";uses:="org.osgi.framework""/> <attribute name="Export-Service" value="org.apache.felix.shell.ShellService,org.ungoverned.osgi.service.shell.ShellService"/> <attribute name="Import-Package" value="java.io,java.lang,java.net,java.security,java.text,java.util,org.apache.felix.shell;version="[1.0,2)",org.osgi.framework;version="[1.9,2)",org.osgi.service.log;version="[1.4,2)",org.osgi.service.packageadmin;version="[1.2,2)",org.osgi.service.startlevel;version="[1.1,2)",org.osgi.util.tracker;version="[1.5,2)",org.ungoverned.osgi.service.shell;version="[1.0,2)""/> <attribute name="Import-Service" value="org.osgi.service.packageadmin.PackageAdmin,org.osgi.service.startlevel.StartLevel"/> <attribute name="JavaPackages-ArtifactId" value="${project.artifactId}"/> <attribute name="JavaPackages-GroupId" value="${project.groupId}"/> <attribute name="JavaPackages-Version" value="${project.version}"/> <attribute name="Require-Capability" value="osgi.ee;filter:="(&(osgi.ee=JavaSE)(version=${compiler.target}))""/> </manifest> </jar> </target> <!-- ====================================================================== --> <!-- A dummy target for the package named after the type it creates --> <!-- ====================================================================== --> <target name="jar" depends="package" description="Builds the jar for the application"/> </project>
