pool/plexus-languages
SHA256
4
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Accepting request 750519 from Java:packages

Browse Source 
1.0.3

OBS-URL: https://build.opensuse.org/request/show/750519
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/plexus-languages?expand=0&rev=3
This commit is contained in:
Dominique Leuenberger 2019-11-26 15:55:24 +00:00 committed by Git OBS Bridge
commit 76068834c0
5 changed files with 35 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
plexus-java-build.xml
View File

@ -10,7 +10,7 @@
<property name="project.groupId" value="org.codehaus.plexus"/>
<property name="project.artifactId" value="plexus-java"/>
<property name="project.version" value="0.9.10"/>
<property name="project.version" value="1.0.3"/>
<property name="compiler.source" value="1.7"/>
<property name="compiler.target" value="${compiler.source}"/>
@ -19,8 +19,6 @@
<property name="build.dir" value="target"/>
<property name="build.outputDir" value="${build.dir}/classes"/>
<property name="build.srcDir" value="src/main/java"/>
<property name="build.outputDir9" value="${build.outputDir}/META-INF/versions/9"/>
<property name="build.srcDir9" value="src/main/java9"/>
<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"/>
@ -83,44 +81,25 @@
</target>
<!-- ====================================================================== -->
<!-- Java 9 compilation target -->
<!-- Sisu javax.inject.Named generation target -->
<!-- ====================================================================== -->
<condition property="isJava9">
<not>
<or>
<equals arg1="${ant.java.version}" arg2="1.1"/>
<equals arg1="${ant.java.version}" arg2="1.2"/>
<equals arg1="${ant.java.version}" arg2="1.3"/>
<equals arg1="${ant.java.version}" arg2="1.4"/>
<equals arg1="${ant.java.version}" arg2="1.5"/>
<equals arg1="${ant.java.version}" arg2="1.6"/>
<equals arg1="${ant.java.version}" arg2="1.7"/>
<equals arg1="${ant.java.version}" arg2="1.8"/>
</or>
</not>
</condition>
<target name="compile9" depends="compile" description="Compile the java9 code" if="isJava9">
<mkdir dir="${build.outputDir9}"/>
<javac destdir="${build.outputDir9}"
nowarn="false"
debug="true"
encoding="utf-8"
optimize="false"
deprecation="true"
target="9"
verbose="false"
fork="false"
source="9">
<src>
<pathelement location="${build.srcDir9}"/>
</src>
<classpath>
<path refid="build.classpath"/>
<pathelement location="${build.outputDir}"/>
</classpath>
</javac>
<target name="sisu"
depends="compile"
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>
<!-- ====================================================================== -->
@ -251,7 +230,7 @@
<!-- Package target -->
<!-- ====================================================================== -->
<target name="package" depends="compile9,test" description="Package the application">
<target name="package" depends="sisu,test" description="Package the application">
<jar jarfile="${build.dir}/${build.finalName}.jar"
compress="true"
index="false"

3
plexus-languages-0.9.10.tar.xz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:4ef14d4b61618dd0a4a7bb5c8a325c73ff43bebadb190060ff3695a7e1404394
size 19628

3
plexus-languages-1.0.3.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:300bd9b38fdc7ac44ef0c2e4d2ffb75a80878486736785967610e74def6eebba
size 23440

7
plexus-languages.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Thu Nov 21 19:33:41 UTC 2019 - Fridrich Strba <fstrba@suse.com>
- Upgrade to upstream version 1.0.3
- Do not build the compile9 target even when building with modular
java.
-------------------------------------------------------------------
Tue Apr 2 13:22:51 UTC 2019 - Fridrich Strba <fstrba@suse.com>

10
plexus-languages.spec
View File

@ -1,7 +1,7 @@
#
# spec file for package plexus-languages
#
# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2019 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -17,7 +17,7 @@
Name: plexus-languages
Version: 0.9.10
Version: 1.0.3
Release: 0
Summary: Plexus Languages
License: Apache-2.0
@ -32,11 +32,12 @@ Source100: plexus-java-build.xml
BuildRequires: ant
BuildRequires: atinject
BuildRequires: fdupes
BuildRequires: java-devel
BuildRequires: java-devel >= 1.7
BuildRequires: javapackages-local
BuildRequires: objectweb-asm
BuildRequires: plexus-containers-component-annotations
BuildRequires: qdox >= 2
BuildRequires: sisu-inject
Requires: java >= 1.7
Requires: mvn(com.thoughtworks.qdox:qdox)
Requires: mvn(org.ow2.asm:asm)
@ -61,10 +62,11 @@ cp %{SOURCE100} plexus-java/build.xml
%pom_xpath_inject "pom:project" "<groupId>org.codehaus.plexus</groupId>" .
%pom_remove_parent .
%pom_xpath_remove pom:project/pom:profiles plexus-java
%build
mkdir -p lib
build-jar-repository -s lib qdox javax.inject plexus-containers/plexus-component-annotations objectweb-asm/asm
build-jar-repository -s lib qdox javax.inject plexus-containers/plexus-component-annotations objectweb-asm/asm org.eclipse.sisu.inject
pushd plexus-java
%{ant} -Dtest.skip=true package javadoc
popd