Compare commits

...

9 Commits

Author SHA256 Message Date
4afc044e16 Accepting request 1251179 from Java:packages
OBS-URL: https://build.opensuse.org/request/show/1251179
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/plexus-sec-dispatcher?expand=0&rev=9
2025-03-07 15:44:56 +00:00
dd5384a5d4 fix injection
OBS-URL: https://build.opensuse.org/package/show/Java:packages/plexus-sec-dispatcher?expand=0&rev=22
2025-03-07 11:38:01 +00:00
a4c7a35ce5 Accepting request 1174343 from Java:packages
Unnecessary dependency

OBS-URL: https://build.opensuse.org/request/show/1174343
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/plexus-sec-dispatcher?expand=0&rev=8
2024-05-16 15:15:49 +00:00
b31eb594a7 Accepting request 1164205 from Java:packages
OBS-URL: https://build.opensuse.org/request/show/1164205
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/plexus-sec-dispatcher?expand=0&rev=7
2024-04-03 15:19:45 +00:00
20dd1dae3a Accepting request 1120341 from Java:packages
source/target 8 == build with jdk 21

OBS-URL: https://build.opensuse.org/request/show/1120341
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/plexus-sec-dispatcher?expand=0&rev=6
2023-10-26 15:13:32 +00:00
cb04c82933 Accepting request 979215 from Java:packages
Sync changes with sle

OBS-URL: https://build.opensuse.org/request/show/979215
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/plexus-sec-dispatcher?expand=0&rev=5
2022-05-25 18:34:53 +00:00
9fe05b2dac Accepting request 977027 from Java:packages
Fix build with modello-2.0.0

OBS-URL: https://build.opensuse.org/request/show/977027
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/plexus-sec-dispatcher?expand=0&rev=4
2022-05-13 21:03:22 +00:00
721884ffd9 Accepting request 946192 from Java:packages
2.0

OBS-URL: https://build.opensuse.org/request/show/946192
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/plexus-sec-dispatcher?expand=0&rev=3
2022-01-13 22:21:36 +00:00
ede3c4ac95 Accepting request 735440 from Java:packages
avoid version-less dependencies that gradle does not like

OBS-URL: https://build.opensuse.org/request/show/735440
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/plexus-sec-dispatcher?expand=0&rev=2
2019-10-07 11:46:23 +00:00
3 changed files with 27 additions and 127 deletions

View File

@@ -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"/>
<property name="build.mdoDir" value="src/main/mdo"/>
@@ -39,15 +36,11 @@
<path id="build.classpath">
<fileset dir="lib">
<!-- plexus-utils-3.1.1 plexus-cipher-1.4 classworlds-1.1-alpha-2
plexus-container-default-1.0-alpha-9-stable-1.jar -->
<include name="**/*.jar"/>
</fileset>
</path>
<path id="build.test.classpath">
<fileset dir="lib">
<!-- plexus-utils-3.1.1 plexus-cipher-1.4 classworlds-1.1-alpha-2
plexus-container-default-1.0-alpha-9-stable-1.jar junit-3.8.2 -->
<include name="**/*.jar"/>
</fileset>
</path>
@@ -119,118 +112,25 @@
</target>
<!-- ====================================================================== -->
<!-- Plexus component.xml generation target -->
<!-- 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="**/*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>
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>
<!-- ====================================================================== -->
@@ -272,7 +172,7 @@
<!-- 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"

View File

@@ -1,3 +1,9 @@
-------------------------------------------------------------------
Fri Mar 7 11:35:37 UTC 2025 - Fridrich Strba <fstrba@suse.com>
- The injection is happening using javax.inject.Named index and
not by plexus metadata
-------------------------------------------------------------------
Thu May 16 05:04:40 UTC 2024 - Fridrich Strba <fstrba@suse.com>

View File

@@ -1,7 +1,7 @@
#
# spec file for package plexus-sec-dispatcher
#
# Copyright (c) 2024 SUSE LLC
# Copyright (c) 2025 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -16,7 +16,6 @@
#
%bcond_with tests
Name: plexus-sec-dispatcher
Version: 2.0
Release: 0
@@ -34,13 +33,10 @@ BuildRequires: java-devel >= 1.8
BuildRequires: javapackages-local >= 6
BuildRequires: modello >= 2.0.0
BuildRequires: plexus-cipher
BuildRequires: plexus-metadata-generator
BuildRequires: plexus-utils
BuildRequires: plexus-xml
BuildRequires: sisu-inject
BuildArch: noarch
%if %{with tests}
BuildRequires: ant-junit
%endif
%description
Plexus Security Dispatcher Component
@@ -66,11 +62,9 @@ build-jar-repository -s lib \
plexus/utils \
plexus/xml \
plexus/plexus-cipher \
org.eclipse.sisu.inject \
javax.inject
%{ant} \
%if %{without tests}
-Dtest.skip=true \
%endif
jar javadoc
%install