Accepting request 973675 from Java:packages
3.1.0; fixes build with maven-shared-utils 3.3.3 OBS-URL: https://build.opensuse.org/request/show/973675 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/maven-invoker?expand=0&rev=4
This commit is contained in:
Dominique Leuenberger
Git OBS Bridge
commit
c1a19c44d2
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:067c02cf396a42388cb0804afcaf25225dd168526b2f283f2b4127de9002c33f
|
||||
size 85361
|
||||
BIN
maven-invoker-3.1.0-source-release.zip
(Stored with Git LFS)
Normal file
BIN
maven-invoker-3.1.0-source-release.zip
(Stored with Git LFS)
Normal file
Binary file not shown.
@ -10,7 +10,7 @@
|
||||
|
||||
<property name="project.groupId" value="org.apache.maven.shared"/>
|
||||
<property name="project.artifactId" value="maven-invoker"/>
|
||||
<property name="project.version" value="3.0.1"/>
|
||||
<property name="project.version" value="3.1.0"/>
|
||||
<property name="project.name" value="Apache Maven Invoker"/>
|
||||
<property name="project.organization.name" value="The Apache Software Foundation"/>
|
||||
|
||||
@ -22,10 +22,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"/>
|
||||
|
||||
<!-- ====================================================================== -->
|
||||
@ -37,11 +34,6 @@
|
||||
<include name="**/*.jar"/>
|
||||
</fileset>
|
||||
</path>
|
||||
<path id="build.test.classpath">
|
||||
<fileset dir="lib">
|
||||
<include name="**/*.jar"/>
|
||||
</fileset>
|
||||
</path>
|
||||
|
||||
<!-- ====================================================================== -->
|
||||
<!-- Cleaning up target -->
|
||||
@ -74,118 +66,25 @@
|
||||
</target>
|
||||
|
||||
<!-- ====================================================================== -->
|
||||
<!-- Target to generate Plexus component.xml -->
|
||||
<!-- Sisu javax.inject.Named generation target -->
|
||||
<!-- ====================================================================== -->
|
||||
|
||||
<target name="gen-meta"
|
||||
<target name="sisu"
|
||||
depends="compile"
|
||||
description="Generate Plexus component.xml">
|
||||
<mkdir dir="${build.outputDir}/META-INF/plexus"/>
|
||||
<exec executable="plexus-metadata-generator" failonerror="true">
|
||||
<env key="CLASSPATH" value="${build.outputDir}"/>
|
||||
<arg value="-s"/>
|
||||
<arg value="${build.srcDir}"/>
|
||||
<arg value="-c"/>
|
||||
<arg value="${build.outputDir}"/>
|
||||
<arg value="-m"/>
|
||||
<arg value="${build.outputDir}/META-INF/plexus"/>
|
||||
<arg value="-o"/>
|
||||
<arg value="${build.outputDir}/META-INF/plexus/components.xml"/>
|
||||
</exec>
|
||||
</target>
|
||||
|
||||
<!-- ====================================================================== -->
|
||||
<!-- Test-compilation target -->
|
||||
<!-- ====================================================================== -->
|
||||
|
||||
<target name="compile-tests"
|
||||
depends="gen-meta"
|
||||
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>
|
||||
<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="test-build-should*/**"/>
|
||||
</fileset>
|
||||
</batchtest>
|
||||
<batchtest todir="${test.reports}" if="test">
|
||||
<fileset dir="${build.testDir}">
|
||||
<include name="**/${test}.java"/>
|
||||
<exclude name="test-build-should*/**"/>
|
||||
</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>
|
||||
description="Generate javax.inject.Name index">
|
||||
<sequential>
|
||||
<java classname="org.eclipse.sisu.space.SisuIndex"
|
||||
failonerror="true"
|
||||
fork="true">
|
||||
<classpath>
|
||||
<path refid="build.classpath"/>
|
||||
</classpath>
|
||||
<arg value="${build.outputDir}"/>
|
||||
</java>
|
||||
<move todir="${build.outputDir}/META-INF">
|
||||
<fileset dir="META-INF"/>
|
||||
</move>
|
||||
</sequential>
|
||||
</target>
|
||||
|
||||
<!-- ====================================================================== -->
|
||||
@ -221,24 +120,24 @@
|
||||
<!-- Package target -->
|
||||
<!-- ====================================================================== -->
|
||||
|
||||
<target name="package" depends="gen-meta,test" description="Package the application">
|
||||
<target name="package" depends="sisu" description="Package the application">
|
||||
<jar jarfile="${build.dir}/${build.finalName}.jar"
|
||||
compress="true"
|
||||
index="false"
|
||||
basedir="${build.outputDir}"
|
||||
excludes="**/package.html">
|
||||
<manifest>
|
||||
<attribute name="Implementation-Title" value="${project.name}"/>
|
||||
<attribute name="Implementation-URL" value="http://maven.apache.org/shared/${project.artifactId}/"/>
|
||||
<attribute name="Implementation-Vendor" value="${project.organization.name}"/>
|
||||
<attribute name="Implementation-Vendor-Id" value="${project.groupId}"/>
|
||||
<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="Specification-Title" value="${project.name}"/>
|
||||
<attribute name="Specification-Vendor" value="${project.organization.name}"/>
|
||||
<attribute name="Specification-Version" value="${project.version}"/>
|
||||
<attribute name="Implementation-Title" value="${project.name}"/>
|
||||
<attribute name="Implementation-URL" value="http://maven.apache.org/shared/${project.artifactId}/"/>
|
||||
<attribute name="Implementation-Vendor" value="${project.organization.name}"/>
|
||||
<attribute name="Implementation-Vendor-Id" value="${project.groupId}"/>
|
||||
<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="Specification-Title" value="${project.name}"/>
|
||||
<attribute name="Specification-Vendor" value="${project.organization.name}"/>
|
||||
<attribute name="Specification-Version" value="${project.version}"/>
|
||||
</manifest>
|
||||
</jar>
|
||||
</target>
|
||||
|
||||
@ -1,3 +1,9 @@
|
||||
-------------------------------------------------------------------
|
||||
Mon Apr 25 18:38:03 UTC 2022 - Fridrich Strba <fstrba@suse.com>
|
||||
|
||||
- Upgrade to upstream version 3.1.0
|
||||
* Fixes build with maven-shared-utils 3.3.3
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sun Mar 20 19:33:22 UTC 2022 - Fridrich Strba <fstrba@suse.com>
|
||||
|
||||
|
||||
@ -16,36 +16,27 @@
|
||||
#
|
||||
|
||||
|
||||
%bcond_with tests
|
||||
Name: maven-invoker
|
||||
Version: 3.0.1
|
||||
Version: 3.1.0
|
||||
Release: 0
|
||||
Summary: An API for firing a maven build in a clean environment
|
||||
License: Apache-2.0
|
||||
Group: Development/Libraries/Java
|
||||
URL: http://maven.apache.org/shared/maven-invoker/
|
||||
Source0: http://repo1.maven.org/maven2/org/apache/maven/shared/%{name}/%{version}/%{name}-%{version}-source-release.zip
|
||||
URL: https://maven.apache.org/shared/maven-invoker/
|
||||
Source0: https://repo1.maven.org/maven2/org/apache/maven/shared/%{name}/%{version}/%{name}-%{version}-source-release.zip
|
||||
Source1: %{name}-build.xml
|
||||
# Patch rejected upstream
|
||||
Patch1: %{name}-MSHARED-279.patch
|
||||
BuildRequires: ant
|
||||
BuildRequires: atinject
|
||||
BuildRequires: fdupes
|
||||
BuildRequires: javapackages-local
|
||||
BuildRequires: maven-shared-utils
|
||||
BuildRequires: plexus-containers-component-annotations
|
||||
BuildRequires: plexus-metadata-generator
|
||||
BuildRequires: plexus-utils
|
||||
BuildRequires: maven-shared-utils >= 3.3.3
|
||||
BuildRequires: sisu-inject
|
||||
BuildRequires: unzip
|
||||
Requires: mvn(org.apache.maven.shared:maven-shared-utils)
|
||||
Requires: mvn(org.codehaus.plexus:plexus-component-annotations)
|
||||
Requires: mvn(org.codehaus.plexus:plexus-utils)
|
||||
Requires: mvn(org.eclipse.sisu:org.eclipse.sisu.inject)
|
||||
BuildArch: noarch
|
||||
%if %{with tests}
|
||||
BuildRequires: ant-junit
|
||||
BuildRequires: maven-local
|
||||
BuildRequires: mvn(org.apache.maven.plugins:maven-antrun-plugin)
|
||||
BuildRequires: mvn(org.apache.maven.plugins:maven-clean-plugin)
|
||||
%endif
|
||||
|
||||
%description
|
||||
This API is concerned with firing a Maven build in a new JVM. It accomplishes
|
||||
@ -67,23 +58,18 @@ API documentation for %{name}.
|
||||
|
||||
%prep
|
||||
%setup -q
|
||||
sed -i 's/\r$//' src/main/java/org/apache/maven/shared/invoker/MavenCommandLineBuilder.java
|
||||
cp %{SOURCE1} build.xml
|
||||
%patch1 -p1
|
||||
%pom_change_dep javax.inject:javax.inject:1 org.eclipse.sisu:org.eclipse.sisu.inject
|
||||
|
||||
%pom_remove_parent .
|
||||
%pom_xpath_inject pom:project "<groupId>org.apache.maven.shared</groupId>" .
|
||||
|
||||
%build
|
||||
mkdir -p lib
|
||||
build-jar-repository -s lib plexus/utils plexus-containers/plexus-component-annotations maven-shared-utils/maven-shared-utils
|
||||
%if %{with tests}
|
||||
export M2_HOME=%{_datadir}/xmvn
|
||||
%endif
|
||||
%{ant} \
|
||||
%if %{without tests}
|
||||
-Dtest.skip=true \
|
||||
%endif
|
||||
jar javadoc
|
||||
build-jar-repository -s lib maven-shared-utils org.eclipse.sisu.inject atinject
|
||||
%{ant} jar javadoc
|
||||
|
||||
%install
|
||||
# jar
|
||||
|
||||
Loading…
Reference in New Issue
Block a user