Accepting request 973698 from Java:packages
3.2.0 OBS-URL: https://build.opensuse.org/request/show/973698 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/maven-filtering?expand=0&rev=4
This commit is contained in:
Dominique Leuenberger
Git OBS Bridge
commit
d3cab80db9
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:df17c02da9c0dee03efa89a9273d4e4185bd80ca607c020d15ed6b0b196c9927
|
||||
size 152814
|
||||
3
maven-filtering-3.2.0-source-release.zip
Normal file
3
maven-filtering-3.2.0-source-release.zip
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:c7655bfb5c653ab04289efbf63e9606bf1fa44f3a0b9e07bc5ad76118c33e13b
|
||||
size 161793
|
||||
@ -10,11 +10,11 @@
|
||||
|
||||
<property name="project.groupId" value="org.apache.maven.shared"/>
|
||||
<property name="project.artifactId" value="maven-filtering"/>
|
||||
<property name="project.version" value="3.1.1"/>
|
||||
<property name="project.version" value="3.2.0"/>
|
||||
<property name="project.name" value="Apache Maven Filtering"/>
|
||||
<property name="project.organization.name" value="The Apache Software Foundation"/>
|
||||
|
||||
<property name="spec.version" value="3.1"/>
|
||||
<property name="spec.version" value="3.2"/>
|
||||
|
||||
<property name="compiler.source" value="1.8"/>
|
||||
<property name="compiler.target" value="${compiler.source}"/>
|
||||
@ -24,10 +24,7 @@
|
||||
<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"/>
|
||||
|
||||
<!-- ====================================================================== -->
|
||||
@ -39,11 +36,6 @@
|
||||
<include name="**/*.jar"/>
|
||||
</fileset>
|
||||
</path>
|
||||
<path id="build.test.classpath">
|
||||
<fileset dir="lib">
|
||||
<include name="**/*.jar"/>
|
||||
</fileset>
|
||||
</path>
|
||||
|
||||
<!-- ====================================================================== -->
|
||||
<!-- Cleaning up target -->
|
||||
@ -104,101 +96,6 @@
|
||||
</java>
|
||||
</target>
|
||||
|
||||
<!-- ====================================================================== -->
|
||||
<!-- Test-compilation target -->
|
||||
<!-- ====================================================================== -->
|
||||
|
||||
<target name="compile-tests"
|
||||
depends="plexus"
|
||||
description="Compile the test code"
|
||||
unless="test.skip">
|
||||
<mkdir dir="${build.testOutputDir}"/>
|
||||
<javac destdir="${build.testOutputDir}"
|
||||
nowarn="false"
|
||||
debug="true"
|
||||
encoding="UTF-8"
|
||||
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>
|
||||
<copy todir="${build.testOutputDir}">
|
||||
<fileset dir="${build.testResourceDir}"/>
|
||||
</copy>
|
||||
</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 -->
|
||||
<!-- ====================================================================== -->
|
||||
@ -232,7 +129,7 @@
|
||||
<!-- Package target -->
|
||||
<!-- ====================================================================== -->
|
||||
|
||||
<target name="package" depends="plexus,test" description="Package the application">
|
||||
<target name="package" depends="plexus" description="Package the application">
|
||||
<jar jarfile="${build.dir}/${build.finalName}.jar"
|
||||
compress="true"
|
||||
index="false"
|
||||
|
||||
@ -1,3 +1,9 @@
|
||||
-------------------------------------------------------------------
|
||||
Thu Apr 28 11:53:54 UTC 2022 - Fridrich Strba <fstrba@suse.com>
|
||||
|
||||
- Upgrade to version 3.2.0
|
||||
* needed by maven-resources-plugin 3.2.0
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sun Mar 20 20:12:41 UTC 2022 - Fridrich Strba <fstrba@suse.com>
|
||||
|
||||
|
||||
@ -17,16 +17,17 @@
|
||||
|
||||
|
||||
Name: maven-filtering
|
||||
Version: 3.1.1
|
||||
Version: 3.2.0
|
||||
Release: 0
|
||||
Summary: Shared component providing resource filtering
|
||||
License: Apache-2.0
|
||||
Group: Development/Libraries/Java
|
||||
URL: http://maven.apache.org/shared/%{name}/index.html
|
||||
Source0: http://repo1.maven.org/maven2/org/apache/maven/shared/%{name}/%{version}/%{name}-%{version}-source-release.zip
|
||||
URL: https://maven.apache.org/shared/%{name}/index.html
|
||||
Source0: https://repo1.maven.org/maven2/org/apache/maven/shared/%{name}/%{version}/%{name}-%{version}-source-release.zip
|
||||
Source1: %{name}-build.xml
|
||||
BuildRequires: ant
|
||||
BuildRequires: apache-commons-cli
|
||||
BuildRequires: apache-commons-io
|
||||
BuildRequires: atinject
|
||||
BuildRequires: fdupes
|
||||
BuildRequires: google-guice
|
||||
@ -48,7 +49,6 @@ BuildRequires: qdox
|
||||
BuildRequires: sisu-inject
|
||||
BuildRequires: sisu-plexus
|
||||
BuildRequires: unzip
|
||||
BuildRequires: xbean
|
||||
BuildRequires: xmvn-install
|
||||
BuildRequires: xmvn-resolve
|
||||
BuildRequires: mvn(org.apache.maven.shared:maven-shared-components:pom:)
|
||||
@ -73,32 +73,32 @@ cp %{SOURCE1} build.xml
|
||||
%build
|
||||
mkdir -p lib
|
||||
build-jar-repository -s lib \
|
||||
maven/maven-core \
|
||||
maven/maven-model \
|
||||
maven/maven-settings \
|
||||
org.eclipse.sisu.plexus \
|
||||
plexus-containers/plexus-component-annotations \
|
||||
maven-shared-utils/maven-shared-utils \
|
||||
plexus/utils \
|
||||
plexus/interpolation \
|
||||
plexus/plexus-build-api \
|
||||
commons-io \
|
||||
jsr-305 \
|
||||
\
|
||||
atinject \
|
||||
commons-cli \
|
||||
guava/guava \
|
||||
guice/google-guice-no_aop \
|
||||
jdom2/jdom2 \
|
||||
jsr-305 \
|
||||
maven/maven-core \
|
||||
maven/maven-model \
|
||||
maven/maven-settings \
|
||||
maven-shared-utils/maven-shared-utils \
|
||||
objectweb-asm/asm \
|
||||
org.eclipse.sisu.inject \
|
||||
org.eclipse.sisu.plexus \
|
||||
plexus-classworlds \
|
||||
plexus/cli \
|
||||
plexus-containers/plexus-component-annotations \
|
||||
plexus/interpolation \
|
||||
plexus-metadata-generator \
|
||||
plexus/plexus-build-api \
|
||||
plexus/utils \
|
||||
qdox \
|
||||
xbean/xbean-reflect
|
||||
plexus/cli \
|
||||
qdox
|
||||
|
||||
# Tests use a package that is no longer present in plexus-build-api (v0.0.7)
|
||||
%{ant} \
|
||||
-Dtest.skip=true \
|
||||
jar javadoc
|
||||
|
||||
%{mvn_artifact} pom.xml target/%{name}-%{version}.jar
|
||||
|
||||
Loading…
Reference in New Issue
Block a user