Hello community,
here is the log from the commit of package plexus-languages for
openSUSE:Factory checked in at 2019-11-26 16:55:24
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/plexus-languages (Old)
and /work/SRC/openSUSE:Factory/.plexus-languages.new.26869 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "plexus-languages"
Tue Nov 26 16:55:24 2019 rev:3 rq:750519 version:1.0.3
Changes:
--------
--- /work/SRC/openSUSE:Factory/plexus-languages/plexus-languages.changes
2019-04-05 12:05:29.898585733 +0200
+++
/work/SRC/openSUSE:Factory/.plexus-languages.new.26869/plexus-languages.changes
2019-11-26 16:56:08.912171487 +0100
@@ -1,0 +2,7 @@
+Thu Nov 21 19:33:41 UTC 2019 - Fridrich Strba <fst...@suse.com>
+
+- Upgrade to upstream version 1.0.3
+- Do not build the compile9 target even when building with modular
+ java.
+
+-------------------------------------------------------------------
Old:
----
plexus-languages-0.9.10.tar.xz
New:
----
plexus-languages-1.0.3.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ plexus-languages.spec ++++++
--- /var/tmp/diff_new_pack.kt0WpF/_old 2019-11-26 16:56:11.096170766 +0100
+++ /var/tmp/diff_new_pack.kt0WpF/_new 2019-11-26 16:56:11.100170764 +0100
@@ -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 @@
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 @@
%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
++++++ plexus-java-build.xml ++++++
--- /var/tmp/diff_new_pack.kt0WpF/_old 2019-11-26 16:56:11.144170750 +0100
+++ /var/tmp/diff_new_pack.kt0WpF/_new 2019-11-26 16:56:11.144170750 +0100
@@ -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"
++++++ plexus-languages-0.9.10.tar.xz -> plexus-languages-1.0.3.tar.xz ++++++
++++ 2504 lines of diff (skipped)
