Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package jackson-annotations for
openSUSE:Factory checked in at 2021-04-26 16:39:23
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/jackson-annotations (Old)
and /work/SRC/openSUSE:Factory/.jackson-annotations.new.12324 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "jackson-annotations"
Mon Apr 26 16:39:23 2021 rev:6 rq:888371 version:2.10.5
Changes:
--------
--- /work/SRC/openSUSE:Factory/jackson-annotations/jackson-annotations.changes
2020-03-26 23:33:14.558774358 +0100
+++
/work/SRC/openSUSE:Factory/.jackson-annotations.new.12324/jackson-annotations.changes
2021-04-26 16:40:21.786148359 +0200
@@ -1,0 +2,11 @@
+Mon Apr 26 06:37:25 UTC 2021 - Fridrich Strba <[email protected]>
+
+- Rewrite to use ant for building in order to be able to use it
+ in packages that have to be built before maven
+
+-------------------------------------------------------------------
+Mon Jan 25 08:21:11 UTC 2021 - Fridrich Strba <[email protected]>
+
+- Update to 2.10.5
+
+-------------------------------------------------------------------
Old:
----
jackson-annotations-2.10.3.tar.gz
New:
----
jackson-annotations-2.10.5.tar.gz
jackson-annotations-build.xml
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ jackson-annotations.spec ++++++
--- /var/tmp/diff_new_pack.W8FHcr/_old 2021-04-26 16:40:22.198149036 +0200
+++ /var/tmp/diff_new_pack.W8FHcr/_new 2021-04-26 16:40:22.198149036 +0200
@@ -1,7 +1,7 @@
#
# spec file for package jackson-annotations
#
-# Copyright (c) 2020 SUSE LLC
+# Copyright (c) 2021 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -17,17 +17,17 @@
Name: jackson-annotations
-Version: 2.10.3
+Version: 2.10.5
Release: 0
Summary: Core annotations for Jackson data processor
License: Apache-2.0
Group: Development/Libraries/Java
URL: https://github.com/FasterXML/jackson-annotations/
Source0:
https://github.com/FasterXML/jackson-annotations/archive/%{name}-%{version}.tar.gz
+Source1: %{name}-build.xml
+BuildRequires: ant
BuildRequires: fdupes
-BuildRequires: maven-local
-BuildRequires: mvn(com.fasterxml.jackson:jackson-parent:pom:)
-BuildRequires: mvn(org.apache.felix:maven-bundle-plugin)
+BuildRequires: javapackages-local
BuildArch: noarch
%description
@@ -43,26 +43,39 @@
%prep
%setup -q -n %{name}-%{name}-%{version}
+cp %{SOURCE1} build.xml
+mkdir -p lib
+
+%pom_remove_parent
+#test scope
+%pom_remove_dep junit:junit
%pom_remove_plugin "org.moditect:moditect-maven-plugin"
%pom_remove_plugin "org.sonatype.plugins:nexus-staging-maven-plugin"
sed -i 's/\r//' LICENSE
-%{mvn_file} : %{name}
-
%build
-%{mvn_build} -f -- -Dsource=6
+%{ant} -Dtest.skip=true package javadoc
%install
-%mvn_install
+install -dm 0755 %{buildroot}%{_javadir}
+install -pm 0644 target/%{name}-%{version}.jar
%{buildroot}%{_javadir}/%{name}.jar
+
+install -dm 0755 %{buildroot}%{_mavenpomdir}
+install -pm 0644 pom.xml %{buildroot}%{_mavenpomdir}/%{name}.pom
+%add_maven_depmap %{name}.pom %{name}.jar
+
+install -dm 0755 %{buildroot}%{_javadocdir}
+cp -r target/site/apidocs %{buildroot}%{_javadocdir}/%{name}
%fdupes -s %{buildroot}%{_javadocdir}
%files -f .mfiles
%doc README.md release-notes/*
%license LICENSE
-%files javadoc -f .mfiles-javadoc
+%files javadoc
+%{_javadocdir}/%{name}
%license LICENSE
%changelog
++++++ jackson-annotations-2.10.3.tar.gz -> jackson-annotations-2.10.5.tar.gz
++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/jackson-annotations-jackson-annotations-2.10.3/pom.xml
new/jackson-annotations-jackson-annotations-2.10.5/pom.xml
--- old/jackson-annotations-jackson-annotations-2.10.3/pom.xml 2020-03-03
04:08:54.000000000 +0100
+++ new/jackson-annotations-jackson-annotations-2.10.5/pom.xml 2020-07-21
03:30:50.000000000 +0200
@@ -11,7 +11,7 @@
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId>
<name>Jackson-annotations</name>
- <version>2.10.3</version>
+ <version>2.10.5</version>
<packaging>bundle</packaging>
<description>Core annotations used for value types, used by Jackson data
binding package.
</description>
@@ -22,7 +22,7 @@
<connection>scm:git:[email protected]:FasterXML/jackson-annotations.git</connection>
<developerConnection>scm:git:[email protected]:FasterXML/jackson-annotations.git</developerConnection>
<url>http://github.com/FasterXML/jackson-annotations</url>
- <tag>jackson-annotations-2.10.3</tag>
+ <tag>jackson-annotations-2.10.5</tag>
</scm>
<properties>
++++++ jackson-annotations-build.xml ++++++
<?xml version="1.0" encoding="UTF-8"?>
<project name="jackson-annotations" default="package" basedir=".">
<!-- ======================================================================
-->
<!-- Build environment properties
-->
<!-- ======================================================================
-->
<property file="build.properties"/>
<property name="project.groupId" value="com.fasterxml.jackson.core"/>
<property name="project.artifactId" value="jackson-annotations"/>
<property name="project.name" value="Jackson-annotations"/>
<property name="project.version" value="2.10.5"/>
<property name="project.vendor" value="FasterXML"/>
<property name="project.description" value="Core annotations used for value
types, used by Jackson data binding package."/>
<property name="bundle.version" value="${project.version}"/>
<property name="compiler.source" value="1.6"/>
<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="build.testOutputDir" value="${build.dir}/test-classes"/>
<property name="build.testDir" value="src/test/java"/>
<property name="build.testResourceDir" value="src/test/resources"/>
<property name="test.reports" value="${build.dir}/test-reports"/>
<property name="reporting.outputDirectory" value="${build.dir}/site"/>
<!-- ======================================================================
-->
<!-- Defining classpaths
-->
<!-- ======================================================================
-->
<path id="build.classpath"/>
<path id="build.test.classpath">
<fileset dir="lib">
<include name="**/*.jar"/>
</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}"
nowarn="false"
debug="true"
optimize="false"
deprecation="true"
target="${compiler.target}"
verbose="false"
fork="false"
encoding="utf-8"
source="${compiler.source}">
<src>
<pathelement location="${build.srcDir}"/>
</src>
<classpath refid="build.classpath"/>
</javac>
<copy todir="${build.outputDir}">
<fileset dir="${build.resourceDir}"/>
</copy>
</target>
<!-- ======================================================================
-->
<!-- Test-compilation target
-->
<!-- ======================================================================
-->
<target name="compile-tests"
depends="compile"
description="Compile the test code"
unless="test.skip">
<mkdir dir="${build.testOutputDir}"/>
<javac destdir="${build.testOutputDir}"
nowarn="false"
debug="true"
optimize="false"
deprecation="true"
target="${compiler.target}"
verbose="false"
fork="false"
source="${compiler.source}">
<src>
<pathelement location="${build.testDir}"/>
</src>
<classpath>
<path refid="build.test.classpath"/>
<pathelement location="${build.outputDir}"/>
</classpath>
</javac>
</target>
<!-- ======================================================================
-->
<!-- Run all tests
-->
<!-- ======================================================================
-->
<target name="test"
depends="compile-tests, junit-missing"
unless="junit.skipped"
description="Run the test cases">
<mkdir dir="${test.reports}"/>
<junit printSummary="yes" haltonerror="true" haltonfailure="true"
fork="true" dir=".">
<sysproperty key="basedir" value="."/>
<formatter type="xml"/>
<formatter type="plain" usefile="false"/>
<classpath>
<path refid="build.test.classpath"/>
<pathelement location="${build.outputDir}"/>
<pathelement location="${build.testOutputDir}"/>
</classpath>
<batchtest todir="${test.reports}" unless="test">
<fileset dir="${build.testDir}">
<include name="**/Test*.java"/>
<include name="**/*Test.java"/>
<include name="**/*TestCase.java"/>
<exclude name="**/*Abstract*Test.java"/>
</fileset>
</batchtest>
<batchtest todir="${test.reports}" if="test">
<fileset dir="${build.testDir}">
<include name="**/${test}.java"/>
<exclude name="**/*Abstract*Test.java"/>
</fileset>
</batchtest>
</junit>
</target>
<target name="test-junit-present">
<available classname="junit.framework.Test" property="junit.present"
classpathref="build.test.classpath"/>
</target>
<target name="test-junit-status"
depends="test-junit-present">
<condition property="junit.missing">
<and>
<isfalse value="${junit.present}"/>
<isfalse value="${test.skip}"/>
</and>
</condition>
<condition property="junit.skipped">
<or>
<isfalse value="${junit.present}"/>
<istrue value="${test.skip}"/>
</or>
</condition>
</target>
<target name="junit-missing"
depends="test-junit-status"
if="junit.missing">
<echo>=================================== WARNING
===================================</echo>
<echo> JUnit is not present in the test classpath or your $ANT_HOME/lib
directory. Tests not executed.</echo>
<echo>===============================================================================</echo>
</target>
<!-- ======================================================================
-->
<!-- Javadoc target
-->
<!-- ======================================================================
-->
<target name="javadoc" description="Generates the Javadoc of the application">
<javadoc sourcepath="${build.srcDir}"
packagenames="*"
destdir="${reporting.outputDirectory}/apidocs"
access="protected"
source="${compiler.source}"
verbose="false"
version="true"
use="true"
author="true"
splitindex="false"
nodeprecated="false"
nodeprecatedlist="false"
notree="false"
noindex="false"
nohelp="false"
nonavbar="false"
serialwarn="false"
encoding="utf-8"
charset="utf-8"
linksource="false"
breakiterator="false"
maxmemory="1g">
</javadoc>
</target>
<!-- ======================================================================
-->
<!-- Package target
-->
<!-- ======================================================================
-->
<target name="package" depends="compile,test" 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-Description"
value="${project.description}"/>
<attribute name="Bundle-DocURL"
value="http://github.com/FasterXML/jackson"/>
<attribute name="Bundle-License"
value="http://www.apache.org/licenses/LICENSE-2.0.txt"/>
<attribute name="Bundle-ManifestVersion" value="2"/>
<attribute name="Bundle-Name" value="${project.name}"/>
<attribute name="Bundle-SymbolicName"
value="${project.groupId}.${project.artifactId}"/>
<attribute name="Bundle-Vendor" value="${project.vendor}"/>
<attribute name="Bundle-Version" value="${bundle.version}"/>
<attribute name="Export-Package"
value="com.fasterxml.jackson.annotation;version="${project.version}""/>
<attribute name="Implementation-Title" value="${project.name}"/>
<attribute name="Implementation-Vendor-Id"
value="${project.groupId}"/>
<attribute name="Implementation-Vendor"
value="${project.vendor}"/>
<attribute name="Implementation-Version"
value="${project.version}"/>
<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=1.6))""/>
<attribute name="Specification-Title" value="${project.name}"/>
<attribute name="Specification-Vendor"
value="${project.vendor}"/>
<attribute name="Specification-Version"
value="${project.version}"/>
</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>
