Accepting request 914520 from Java:packages
bsc#1189749, CVE-2021-37714 OBS-URL: https://build.opensuse.org/request/show/914520 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/jsr-305?expand=0&rev=19
This commit is contained in:
Dominique Leuenberger
Git OBS Bridge
commit
51f4cd775c
13
_service
Normal file
13
_service
Normal file
@ -0,0 +1,13 @@
|
||||
<services>
|
||||
<service name="tar_scm" mode="disabled">
|
||||
<param name="scm">git</param>
|
||||
<param name="url">https://github.com/amaembo/jsr-305.git</param>
|
||||
<param name="revision">d7734b13c61492982784560ed5b4f4bd6cf9bb2c</param>
|
||||
<param name="versionformat">3.0.2</param>
|
||||
</service>
|
||||
<service name="recompress" mode="disabled">
|
||||
<param name="file">*.tar</param>
|
||||
<param name="compression">xz</param>
|
||||
</service>
|
||||
<service name="set_version" mode="disabled"/>
|
||||
</services>
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:cc848a5aa60cb6e3fe0cc677df766a915057de11ac07940af3ba4471ee739517
|
||||
size 38557
|
||||
BIN
jsr-305-3.0.2.tar.xz
(Stored with Git LFS)
Normal file
BIN
jsr-305-3.0.2.tar.xz
(Stored with Git LFS)
Normal file
Binary file not shown.
@ -1,40 +1,115 @@
|
||||
<project name="JSR305-ri" default="build">
|
||||
<target name="build" depends="clean,classes,jar,javadoc"/>
|
||||
<target name="classes">
|
||||
<mkdir dir="src/main/java"/>
|
||||
<javac destdir="src/main/java" debug="on">
|
||||
<src path="src/main/java"/>
|
||||
<classpath>
|
||||
<pathelement location="src/main/java"/>
|
||||
</classpath>
|
||||
</javac>
|
||||
</target>
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
|
||||
<target name="jar" depends="classes">
|
||||
<jar destfile="jsr-305-${version}.jar" basedir="src/main/java">
|
||||
</jar>
|
||||
</target>
|
||||
<project name="jsr305" default="package" basedir=".">
|
||||
|
||||
<target name="javadoc">
|
||||
<mkdir dir="javadoc"/>
|
||||
<javadoc packagenames="javax.annotation.*"
|
||||
sourcepath="src/main/java"
|
||||
defaultexcludes="yes"
|
||||
destdir="javadoc"
|
||||
version="true"
|
||||
use="true"
|
||||
windowtitle="JSR 305: Annotations for Software Defect Detection in Java">
|
||||
</javadoc>
|
||||
</target>
|
||||
<!-- ====================================================================== -->
|
||||
<!-- Build environment properties -->
|
||||
<!-- ====================================================================== -->
|
||||
|
||||
<target name="clean">
|
||||
<fileset dir="src/main/java" includes="**/*.class"/>
|
||||
<fileset dir="." includes="jsr-305-${version}.jar"/>
|
||||
<delete dir="javadoc"/>
|
||||
</target>
|
||||
<property file="build.properties"/>
|
||||
|
||||
<property name="project.name" value="FindBugs-jsr305"/>
|
||||
<property name="project.groupId" value="com.google.code.findbugs"/>
|
||||
<property name="project.artifactId" value="jsr305"/>
|
||||
<property name="project.version" value="3.0.2"/>
|
||||
<property name="project.description" value="JSR305 Annotations for Findbugs"/>
|
||||
|
||||
<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="compiler.source" value="1.6"/>
|
||||
<property name="compiler.target" value="${compiler.source}"/>
|
||||
|
||||
<property name="reporting.outputDirectory" value="${build.dir}/site"/>
|
||||
|
||||
<!-- ====================================================================== -->
|
||||
<!-- 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"
|
||||
source="${compiler.source}">
|
||||
<src>
|
||||
<pathelement location="${build.srcDir}"/>
|
||||
</src>
|
||||
</javac>
|
||||
</target>
|
||||
|
||||
<!-- ====================================================================== -->
|
||||
<!-- Javadoc target -->
|
||||
<!-- ====================================================================== -->
|
||||
|
||||
<target name="javadoc" description="Generates the Javadoc of the application">
|
||||
<javadoc sourcepath="${build.srcDir}"
|
||||
packagenames="*"
|
||||
destdir="${reporting.outputDirectory}/apidocs"
|
||||
access="protected"
|
||||
old="false"
|
||||
verbose="false"
|
||||
version="true"
|
||||
use="true"
|
||||
author="true"
|
||||
splitindex="false"
|
||||
nodeprecated="false"
|
||||
nodeprecatedlist="false"
|
||||
notree="false"
|
||||
noindex="false"
|
||||
nohelp="false"
|
||||
nonavbar="false"
|
||||
serialwarn="false"
|
||||
source="${compiler.source}"
|
||||
charset="ISO-8859-1"
|
||||
linksource="false"
|
||||
breakiterator="false"/>
|
||||
</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-Description" value="${project.description}"/>
|
||||
<attribute name="Bundle-License" value="https://opensource.org/licenses/BSD-3-Clause"/>
|
||||
<attribute name="Bundle-ManifestVersion" value="2"/>
|
||||
<attribute name="Bundle-Name" value="${project.name}"/>
|
||||
<attribute name="Bundle-SymbolicName" value="org.jsr-305"/>
|
||||
<attribute name="Bundle-Version" value="${project.version}"/>
|
||||
<attribute name="Export-Package" value="javax.annotation.concurrent;version="${project.version}",javax.annotation.meta;uses:="javax.annotation";version="${project.version}""/>
|
||||
<attribute name="Import-Package" value="javax.annotation,javax.annotation.meta"/>
|
||||
<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>
|
||||
|
||||
<!-- vim:set ts=4: -->
|
||||
|
||||
@ -1,3 +1,10 @@
|
||||
-------------------------------------------------------------------
|
||||
Fri Aug 27 06:59:45 UTC 2021 - Fridrich Strba <fstrba@suse.com>
|
||||
|
||||
- Upgrade to upstream version 3.0.2
|
||||
* needed by the fix for bsc#1189749, CVE-2021-37714 in jsoup
|
||||
package
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sat Oct 5 12:51:38 UTC 2019 - Fridrich Strba <fstrba@suse.com>
|
||||
|
||||
|
||||
30
jsr-305.spec
30
jsr-305.spec
@ -1,7 +1,7 @@
|
||||
#
|
||||
# spec file for package jsr-305
|
||||
#
|
||||
# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
|
||||
# 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
|
||||
@ -16,23 +16,14 @@
|
||||
#
|
||||
|
||||
|
||||
%global svn_revision 51
|
||||
%global svn_date 20130910
|
||||
Name: jsr-305
|
||||
Version: 0.1+%{svn_date}
|
||||
Version: 3.0.2
|
||||
Release: 0
|
||||
Summary: Correctness annotations for Java code
|
||||
# The majority of code is BSD-licensed, but some Java sources
|
||||
# are licensed under CC-BY license, see: $ grep -r Creative .
|
||||
License: BSD-3-Clause
|
||||
Group: Development/Libraries/Java
|
||||
URL: http://code.google.com/p/jsr-305/
|
||||
# There has been no official release yet. This is a snapshot of the Subversion
|
||||
# repository as of 10 Sep 2013. Use the following commands to generate the
|
||||
# tarball:
|
||||
# svn export -r %{svn_revision} http://%{name}.googlecode.com/svn/trunk %{name}
|
||||
# tar -czvf %{name}-%{svn_date}svn.tgz %{name}
|
||||
Source0: jsr-305-%{svn_date}svn.tgz
|
||||
URL: https://code.google.com/p/jsr-305/
|
||||
Source0: %{name}-%{version}.tar.xz
|
||||
Source1: jsr-305-ri-build.xml
|
||||
# File containing URL to CC-BY license text
|
||||
Source2: NOTICE-CC-BY.txt
|
||||
@ -55,7 +46,7 @@ Detection.
|
||||
This package contains the API documentation for %{name}.
|
||||
|
||||
%prep
|
||||
%setup -q -n %{name}
|
||||
%setup -q
|
||||
cp -a %{SOURCE1} ri/build.xml
|
||||
cp %{SOURCE2} NOTICE-CC-BY
|
||||
dos2unix sampleUses/pom.xml
|
||||
@ -68,27 +59,24 @@ for module in ri tcl sampleUses proposedAnnotations; do
|
||||
done
|
||||
|
||||
%build
|
||||
export OPT_JAR_LIST=:
|
||||
export CLASSPATH=
|
||||
pushd ri
|
||||
%{ant} -Dant.build.javac.source=1.6 -Dant.build.javac.target=1.6 \
|
||||
-Dversion=%{version} -Djava.javadoc=%{_javadocdir}/java
|
||||
%{ant} jar javadoc
|
||||
popd
|
||||
|
||||
%install
|
||||
# jars
|
||||
install -dm 0755 %{buildroot}%{_javadir}
|
||||
install -pm 0644 ri/jsr-305-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar
|
||||
install -pm 0644 ri/target/jsr305-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar
|
||||
ln -s %{name}.jar %{buildroot}%{_javadir}/jsr305.jar
|
||||
|
||||
# poms
|
||||
install -dm 0755 %{buildroot}%{_mavenpomdir}/%{name}
|
||||
install -pm 0644 ri/pom.xml %{buildroot}%{_mavenpomdir}/%{name}.pom
|
||||
%add_maven_depmap %{name}.pom %{name}.jar -a com.google.code.findbugs:jsr305
|
||||
%add_maven_depmap %{name}.pom %{name}.jar
|
||||
|
||||
# javadoc
|
||||
install -dm 0755 %{buildroot}%{_javadocdir}/%{name}
|
||||
cp -pr ri/javadoc/* %{buildroot}%{_javadocdir}/%{name}
|
||||
cp -pr ri/target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}
|
||||
%fdupes -s %{buildroot}%{_javadocdir}
|
||||
|
||||
%files -f .mfiles
|
||||
|
||||
Loading…
Reference in New Issue
Block a user