1
0
Fridrich Strba 2024-06-10 17:20:26 +00:00 committed by Git OBS Bridge
parent 8bf06992a8
commit ce20f5ef6e
3 changed files with 7 additions and 88 deletions

View File

@ -142,34 +142,6 @@
<copy file="pom.xml" tofile="${build.outputDir}/META-INF/maven/${project.groupId}/${project.artifactId}/pom.xml"/> <copy file="pom.xml" tofile="${build.outputDir}/META-INF/maven/${project.groupId}/${project.artifactId}/pom.xml"/>
</target> </target>
<!-- ====================================================================== -->
<!-- Target to generate Plexus component.xml -->
<!-- ====================================================================== -->
<target name="plexus"
depends="compile"
description="Generate Plexus component.xml">
<mkdir dir="${build.outputDir}/META-INF/plexus"/>
<java classname="org.codehaus.plexus.metadata.PlexusMetadataGeneratorCli"
failonerror="true"
fork="true">
<!-- <jvmarg value="-verbose"/> -->
<classpath>
<path refid="build.classpath"/>
<pathelement location="${build.outputDir}"/>
</classpath>
<arg value="-X"/>
<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"/>
</java>
</target>
<!-- ====================================================================== --> <!-- ====================================================================== -->
<!-- Sisu javax.inject.Named generation target --> <!-- Sisu javax.inject.Named generation target -->
<!-- ====================================================================== --> <!-- ====================================================================== -->
@ -197,7 +169,7 @@
<!-- ====================================================================== --> <!-- ====================================================================== -->
<target name="compile-tests" <target name="compile-tests"
depends="plexus" depends="compile"
description="Compile the test code" description="Compile the test code"
unless="test.skip"> unless="test.skip">
<mkdir dir="${build.testOutputDir}"/> <mkdir dir="${build.testOutputDir}"/>
@ -224,42 +196,12 @@
</copy> </copy>
</target> </target>
<!-- ====================================================================== -->
<!-- Target to generate Plexus component.xml -->
<!-- ====================================================================== -->
<target name="plexus-tests"
depends="compile-tests"
description="Generate Plexus component.xml for tests"
unless="test.skip">
<mkdir dir="${build.outputDir}/META-INF/plexus"/>
<java classname="org.codehaus.plexus.metadata.PlexusMetadataGeneratorCli"
failonerror="true"
fork="true">
<!-- <jvmarg value="-verbose"/> -->
<classpath>
<path refid="build.testclasspath"/>
<pathelement location="${build.outputDir}"/>
<pathelement location="${build.restOutputDir}"/>
</classpath>
<arg value="-X"/>
<arg value="-s"/>
<arg value="${build.testDir}"/>
<arg value="-c"/>
<arg value="${build.restOutputDir}"/>
<arg value="-m"/>
<arg value="${build.restOutputDir}/META-INF/plexus"/>
<arg value="-o"/>
<arg value="${build.restOutputDir}/META-INF/plexus/components.xml"/>
</java>
</target>
<!-- ====================================================================== --> <!-- ====================================================================== -->
<!-- Run all tests --> <!-- Run all tests -->
<!-- ====================================================================== --> <!-- ====================================================================== -->
<target name="test" <target name="test"
depends="plexus-tests, junit-missing" depends="junit-missing"
unless="junit.skipped" unless="junit.skipped"
description="Run the test cases"> description="Run the test cases">
<mkdir dir="${test.reports}"/> <mkdir dir="${test.reports}"/>
@ -355,7 +297,7 @@
<!-- Package target --> <!-- Package target -->
<!-- ====================================================================== --> <!-- ====================================================================== -->
<target name="package" depends="sisu,plexus,test" description="Package the application"> <target name="package" depends="sisu,test" description="Package the application">
<jar jarfile="${build.dir}/${build.finalName}.jar" <jar jarfile="${build.dir}/${build.finalName}.jar"
compress="true" compress="true"
index="false" index="false"

View File

@ -1,7 +1,9 @@
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Jun 10 16:33:19 UTC 2024 - Fridrich Strba <fstrba@suse.com> Mon Jun 10 16:33:19 UTC 2024 - Fridrich Strba <fstrba@suse.com>
- Add dependency on jakarta-inject, needed by google-guice 6.0.0 - Remove dependency on plexus-metadata-generator,
plexus-component-metadata and on their dependencies, since there
is no plexus @Component annotation any more
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Apr 2 17:26:28 UTC 2024 - Fridrich Strba <fstrba@suse.com> Tue Apr 2 17:26:28 UTC 2024 - Fridrich Strba <fstrba@suse.com>

View File

@ -34,19 +34,13 @@ Source1: %{base_name}-build.xml
Patch0: %{base_name}-bootstrap-resources.patch Patch0: %{base_name}-bootstrap-resources.patch
Patch1: stale-data-encoding.patch Patch1: stale-data-encoding.patch
Patch2: no-override.patch Patch2: no-override.patch
BuildRequires: apache-commons-cli
BuildRequires: apache-commons-io
BuildRequires: apache-commons-lang3 BuildRequires: apache-commons-lang3
BuildRequires: apache-commons-text BuildRequires: apache-commons-text
BuildRequires: atinject BuildRequires: atinject
BuildRequires: fdupes BuildRequires: fdupes
BuildRequires: google-guice
BuildRequires: guava
BuildRequires: httpcomponents-client BuildRequires: httpcomponents-client
BuildRequires: httpcomponents-core BuildRequires: httpcomponents-core
BuildRequires: jakarta-inject
BuildRequires: javapackages-local BuildRequires: javapackages-local
BuildRequires: jdom2
BuildRequires: maven-archiver BuildRequires: maven-archiver
BuildRequires: maven-common-artifact-filters BuildRequires: maven-common-artifact-filters
BuildRequires: maven-doxia-core BuildRequires: maven-doxia-core
@ -62,11 +56,7 @@ BuildRequires: maven-resolver-api
BuildRequires: maven-resolver-util BuildRequires: maven-resolver-util
BuildRequires: maven-shared-utils BuildRequires: maven-shared-utils
BuildRequires: maven-wagon-provider-api BuildRequires: maven-wagon-provider-api
BuildRequires: objectweb-asm
BuildRequires: plexus-archiver BuildRequires: plexus-archiver
BuildRequires: plexus-classworlds
BuildRequires: plexus-cli
BuildRequires: plexus-containers-component-annotations
BuildRequires: plexus-interactivity-api BuildRequires: plexus-interactivity-api
BuildRequires: plexus-io BuildRequires: plexus-io
BuildRequires: plexus-languages BuildRequires: plexus-languages
@ -76,7 +66,6 @@ BuildRequires: qdox
BuildRequires: sisu-inject BuildRequires: sisu-inject
BuildRequires: sisu-plexus BuildRequires: sisu-plexus
BuildRequires: unzip BuildRequires: unzip
BuildRequires: xbean
BuildRequires: xmvn-install BuildRequires: xmvn-install
BuildRequires: xmvn-resolve BuildRequires: xmvn-resolve
BuildRequires: mvn(org.apache.maven.plugins:maven-plugins:pom:) BuildRequires: mvn(org.apache.maven.plugins:maven-plugins:pom:)
@ -85,7 +74,6 @@ BuildArch: noarch
Name: %{base_name}-bootstrap Name: %{base_name}-bootstrap
BuildRequires: ant BuildRequires: ant
BuildRequires: modello >= 2.0.0 BuildRequires: modello >= 2.0.0
BuildRequires: plexus-metadata-generator
%else %else
Name: %{base_name} Name: %{base_name}
BuildRequires: xmvn BuildRequires: xmvn
@ -97,7 +85,6 @@ BuildRequires: mvn(org.apache.maven.plugins:maven-plugins:pom:) >= 40
BuildRequires: mvn(org.apache.maven.plugins:maven-resources-plugin) BuildRequires: mvn(org.apache.maven.plugins:maven-resources-plugin)
BuildRequires: mvn(org.apache.maven.plugins:maven-surefire-plugin) BuildRequires: mvn(org.apache.maven.plugins:maven-surefire-plugin)
BuildRequires: mvn(org.codehaus.modello:modello-maven-plugin) BuildRequires: mvn(org.codehaus.modello:modello-maven-plugin)
BuildRequires: mvn(org.codehaus.plexus:plexus-component-metadata)
BuildRequires: mvn(org.eclipse.sisu:sisu-maven-plugin) BuildRequires: mvn(org.eclipse.sisu:sisu-maven-plugin)
Obsoletes: %{base_name}-bootstrap Obsoletes: %{base_name}-bootstrap
#!BuildRequires: maven-compiler-plugin-bootstrap #!BuildRequires: maven-compiler-plugin-bootstrap
@ -142,14 +129,8 @@ build-jar-repository -s lib \
apache-commons-lang3 \ apache-commons-lang3 \
apache-commons-text \ apache-commons-text \
atinject \ atinject \
commons-cli \
commons-io \
guava/guava \
guice/google-guice-no_aop \
httpcomponents/httpclient \ httpcomponents/httpclient \
httpcomponents/httpcore \ httpcomponents/httpcore \
jakarta-inject \
jdom2/jdom2 \
maven-archiver/maven-archiver \ maven-archiver/maven-archiver \
maven-common-artifact-filters/maven-common-artifact-filters \ maven-common-artifact-filters/maven-common-artifact-filters \
maven-doxia/doxia-core \ maven-doxia/doxia-core \
@ -171,21 +152,15 @@ build-jar-repository -s lib \
maven-reporting-api/maven-reporting-api \ maven-reporting-api/maven-reporting-api \
maven-shared-utils/maven-shared-utils \ maven-shared-utils/maven-shared-utils \
maven-wagon/provider-api \ maven-wagon/provider-api \
objectweb-asm/asm \
org.eclipse.sisu.inject \ org.eclipse.sisu.inject \
org.eclipse.sisu.plexus \ org.eclipse.sisu.plexus \
plexus/archiver \ plexus/archiver \
plexus-classworlds \
plexus/cli \
plexus-containers/plexus-component-annotations \
plexus/interactivity-api \ plexus/interactivity-api \
plexus/io \ plexus/io \
plexus-languages/plexus-java \ plexus-languages/plexus-java \
plexus-metadata-generator \
plexus/utils \ plexus/utils \
plexus/xml \ plexus/xml \
qdox \ qdox
xbean/xbean-reflect
%{ant} -Dtest.skip=true jar %{ant} -Dtest.skip=true jar
%else %else
xmvn --batch-mode --offline \ xmvn --batch-mode --offline \