Fridrich Strba 2023-10-25 15:16:11 +00:00 committed by Git OBS Bridge
parent 2fd40b2566
commit bde96e08c2
3 changed files with 13 additions and 11 deletions

View File

@ -9,20 +9,20 @@
<property file="maven-build.properties"/> <property file="maven-build.properties"/>
<property name="project.artifactId" value="plexus-cipher"/> <property name="project.artifactId" value="plexus-cipher"/>
<property name="project.groupId" value="org.sonatype.plexus"/> <property name="project.groupId" value="org.codehaus.plexus"/>
<property name="project.version" value="1.7"/> <property name="project.version" value="2.0"/>
<property name="project.name" value="Plexus Cipher: encryption/decryption Component"/> <property name="project.name" value="Plexus Cipher: encryption/decryption Component"/>
<property name="project.url" value="http://spice.sonatype.org/plexus-cipher"/> <property name="project.url" value="https://github.com/codehaus-plexus/plexus-cipher"/>
<property name="project.organization.name" value="Sonatype, Inc."/> <property name="project.organization.name" value="Sonatype, Inc."/>
<property name="compiler.source" value="1.6"/> <property name="compiler.release" value="8"/>
<property name="compiler.source" value="1.${compiler.release}"/>
<property name="compiler.target" value="${compiler.source}"/> <property name="compiler.target" value="${compiler.source}"/>
<property name="build.finalName" value="${project.artifactId}-${project.version}"/> <property name="build.finalName" value="${project.artifactId}-${project.version}"/>
<property name="build.dir" value="target"/> <property name="build.dir" value="target"/>
<property name="build.outputDir" value="${build.dir}/classes"/> <property name="build.outputDir" value="${build.dir}/classes"/>
<property name="build.srcDir" value="src/main/java"/> <property name="build.srcDir" value="src/main/java"/>
<property name="build.resourceDir" value="src/main/resources"/>
<property name="reporting.outputDirectory" value="${build.dir}/site"/> <property name="reporting.outputDirectory" value="${build.dir}/site"/>
<!-- ====================================================================== --> <!-- ====================================================================== -->
@ -31,7 +31,6 @@
<path id="build.classpath"> <path id="build.classpath">
<fileset dir="lib"> <fileset dir="lib">
<!-- cdi-api-1.0 jboss-interceptor-api-1.1 javax.inject-1 -->
<include name="**/*.jar"/> <include name="**/*.jar"/>
</fileset> </fileset>
</path> </path>
@ -55,6 +54,7 @@
debug="true" debug="true"
optimize="false" optimize="false"
deprecation="true" deprecation="true"
release="${compiler.release}"
target="${compiler.target}" target="${compiler.target}"
verbose="false" verbose="false"
fork="false" fork="false"
@ -64,9 +64,6 @@
</src> </src>
<classpath refid="build.classpath"/> <classpath refid="build.classpath"/>
</javac> </javac>
<copy todir="${build.outputDir}">
<fileset dir="${build.resourceDir}"/>
</copy>
</target> </target>
<!-- ====================================================================== --> <!-- ====================================================================== -->

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Wed Oct 25 15:16:02 UTC 2023 - Fridrich Strba <fstrba@suse.com>
- Build with source and target levels 8
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Jan 13 17:22:41 UTC 2022 - Fridrich Strba <fstrba@suse.com> Thu Jan 13 17:22:41 UTC 2022 - Fridrich Strba <fstrba@suse.com>

View File

@ -1,7 +1,7 @@
# #
# spec file for package plexus-cipher # spec file for package plexus-cipher
# #
# Copyright (c) 2022 SUSE LLC # Copyright (c) 2023 SUSE LLC
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -28,7 +28,7 @@ Source1: %{name}-build.xml
BuildRequires: ant BuildRequires: ant
BuildRequires: atinject BuildRequires: atinject
BuildRequires: fdupes BuildRequires: fdupes
BuildRequires: java-devel >= 1.7 BuildRequires: java-devel >= 1.8
BuildRequires: javapackages-local >= 6 BuildRequires: javapackages-local >= 6
BuildRequires: sisu-inject BuildRequires: sisu-inject
BuildArch: noarch BuildArch: noarch