Hello community,
here is the log from the commit of package apache-commons-cli for
openSUSE:Factory checked in at 2018-10-31 13:21:19
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/apache-commons-cli (Old)
and /work/SRC/openSUSE:Factory/.apache-commons-cli.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "apache-commons-cli"
Wed Oct 31 13:21:19 2018 rev:10 rq:645582 version:1.4
Changes:
--------
--- /work/SRC/openSUSE:Factory/apache-commons-cli/apache-commons-cli.changes
2018-07-07 21:58:03.615343372 +0200
+++
/work/SRC/openSUSE:Factory/.apache-commons-cli.new/apache-commons-cli.changes
2018-10-31 13:22:05.331021089 +0100
@@ -1,0 +2,10 @@
+Tue Oct 23 17:55:39 UTC 2018 - Fridrich Strba <[email protected]>
+
+- Upgrade to version 1.4
+- Modify the build.xml.tar.bz2 to build with source/target 8 and
+ adapt for the commons-cli-1.4
+- Modified patch:
+ * commons-cli-1.2-jdk9.patch -> commons-cli-1.4-jdk9.patch
+ + Rediff the remaining hunk to the changed context of pom.xml
+
+-------------------------------------------------------------------
Old:
----
commons-cli-1.2-jdk9.patch
commons-cli-1.2-src.tar.gz
New:
----
commons-cli-1.4-jdk9.patch
commons-cli-1.4-src.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ apache-commons-cli.spec ++++++
--- /var/tmp/diff_new_pack.t3sMAe/_old 2018-10-31 13:22:06.191020289 +0100
+++ /var/tmp/diff_new_pack.t3sMAe/_new 2018-10-31 13:22:06.195020285 +0100
@@ -12,14 +12,14 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
%global base_name cli
%global short_name commons-%{base_name}
Name: apache-commons-cli
-Version: 1.2
+Version: 1.4
Release: 0
Summary: Command Line Interface Library for Java
License: Apache-2.0
@@ -27,7 +27,7 @@
Url: http://commons.apache.org/%{base_name}/
Source0:
http://www.apache.org/dist/commons/%{base_name}/source/%{short_name}-%{version}-src.tar.gz
Source1: build.xml.tar.bz2
-Patch0: commons-cli-1.2-jdk9.patch
+Patch0: commons-cli-1.4-jdk9.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildArch: noarch
BuildRequires: ant
@@ -39,8 +39,7 @@
Provides: jakarta-%{short_name} = %{version}-%{release}
Obsoletes: jakarta-%{short_name} < %{version}
Provides: apache-cli = %{version}
-Provides: java(commons-cli:commons-cli) = %{version}
-Obsoletes: apache-cli < 1.2
+Obsoletes: apache-cli < %{version}
%description
The CLI library provides a simple and easy to use API for working with the
@@ -70,14 +69,14 @@
%install
# jars
-install -Dpm 644 target/%{short_name}-%{version}.jar
%{buildroot}%{_javadir}/%{name}-%{version}.jar
-(cd %{buildroot}%{_javadir} && for jar in *-%{version}*; do ln -sf ${jar}
`echo $jar| sed "s|apache-||g"`; done)
-(cd %{buildroot}%{_javadir} && for jar in *-%{version}*; do ln -sf ${jar}
`echo $jar| sed "s|-%{version}||g"`; done)
+install -Dpm 644 target/%{short_name}-%{version}.jar
%{buildroot}%{_javadir}/%{short_name}-%{version}.jar
+(cd %{buildroot}%{_javadir} && for jar in *-%{version}*.jar; do ln -sf ${jar}
apache-${jar}; done)
+(cd %{buildroot}%{_javadir} && for jar in *-%{version}*.jar; do ln -sf ${jar}
`echo $jar| sed "s|-%{version}||g"`; done)
# pom
install -d -m 755 %{buildroot}%{_mavenpomdir}
-install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{short_name}.pom
-%add_maven_depmap JPP-%{short_name}.pom %{short_name}.jar
+install -pm 644 pom.xml
%{buildroot}%{_mavenpomdir}/%{short_name}-%{version}.pom
+%add_maven_depmap %{short_name}-%{version}.pom %{short_name}-%{version}.jar -a
"org.apache.commons:%{short_name}"
# javadoc
install -d -m 0755 %{buildroot}%{_javadocdir}/%{name}-%{version}
@@ -87,7 +86,7 @@
%files
%defattr(-,root,root)
-%doc LICENSE.txt NOTICE.txt README.txt RELEASE-NOTES.txt
+%doc LICENSE.txt NOTICE.txt README.md RELEASE-NOTES.txt CONTRIBUTING.md
%{_javadir}/*
%{_mavenpomdir}/*
%if %{defined _maven_repository}
++++++ build.xml.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/maven-build.properties new/maven-build.properties
--- old/maven-build.properties 2011-02-02 07:35:00.000000000 +0100
+++ new/maven-build.properties 2018-10-23 19:49:46.104236136 +0200
@@ -2,33 +2,33 @@
#Tue Feb 01 23:35:00 MST 2011
commons.manifestfile=target/osgi/MANIFEST.MF
maven.settings.offline=true
-maven.compile.target=1.4
-maven.build.finalName=commons-cli-1.2
-commons.release.name=commons-cli-1.2
+maven.compile.target=8
+maven.build.finalName=commons-cli-1.4
+commons.release.name=commons-cli-1.4
maven.build.resourceDir.0=.
maven.build.testOutputDir=${maven.build.dir}/test-classes
maven.build.testResourceDir.0=src/test/resources
maven.reporting.outputDirectory=${maven.build.dir}/site
commons.docEncoding=iso-8859-1
-maven.build.srcDir.0=src/java
+maven.build.srcDir.0=src/main/java
project.build.directory=${maven.build.dir}
maven.test.reports=${maven.build.dir}/test-reports
commons.binary.suffix=
commons.jira.pid=12310463
maven.build.dir=target
-commons.release.version=1.2
+commons.release.version=1.4
project.build.outputDirectory=${maven.build.outputDir}
commons.osgi.import=*
commons.encoding=iso-8859-1
commons.osgi.symbolicName=org.apache.commons.cli
-maven.compile.source=1.4
+maven.compile.source=8
organization.logo=http\://www.apache.org/images/asf_logo_wide.gif
commons.osgi.dynamicImport=
-maven.build.testDir.0=src/test
+maven.build.testDir.0=src/test/java
maven.settings.interactiveMode=true
commons.rc.version=RC7
commons.osgi.private=
-commons.osgi.export=org.apache.commons.*;version\=1.2
+commons.osgi.export=org.apache.commons.*;version\=1.4
maven.repo.local=${user.home}/.m2/repository
commons.componentid=cli
commons.deployment.protocol=scp
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/maven-build.xml new/maven-build.xml
--- old/maven-build.xml 2011-07-19 12:06:55.000000000 +0200
+++ new/maven-build.xml 2018-10-23 19:45:57.219015354 +0200
@@ -24,13 +24,13 @@
<property file="${user.home}/.m2/maven.properties"/>
<property file="maven-build.properties"/>
- <property name="maven.build.finalName" value="commons-cli-1.2"/>
+ <property name="maven.build.finalName" value="commons-cli-1.4"/>
<property name="maven.build.dir" value="target"/>
<property name="maven.build.outputDir" value="${maven.build.dir}/classes"/>
- <property name="maven.build.srcDir.0" value="src/java"/>
+ <property name="maven.build.srcDir.0" value="src/main/java"/>
<property name="maven.build.resourceDir.0" value="."/>
<property name="maven.build.testOutputDir"
value="${maven.build.dir}/test-classes"/>
- <property name="maven.build.testDir.0" value="src/test"/>
+ <property name="maven.build.testDir.0" value="src/test/java"/>
<property name="maven.build.testResourceDir.0" value="src/test/resources"/>
<property name="maven.test.reports" value="${maven.build.dir}/test-reports"/>
<property name="maven.reporting.outputDirectory"
value="${maven.build.dir}/site"/>
@@ -68,10 +68,10 @@
debug="true"
optimize="false"
deprecation="true"
- target="1.4"
+ target="8"
verbose="false"
fork="false"
- source="1.4">
+ source="8">
<src>
<pathelement location="${maven.build.srcDir.0}"/>
</src>
@@ -101,10 +101,10 @@
debug="true"
optimize="false"
deprecation="true"
- target="1.4"
+ target="8"
verbose="false"
fork="false"
- source="1.4">
+ source="8">
<src>
<pathelement location="${maven.build.testDir.0}"/>
</src>
@@ -202,7 +202,7 @@
nonavbar="false"
serialwarn="false"
charset="ISO-8859-1"
- source="1.4"
+ source="8"
linksource="true"
breakiterator="false">
<link href="http://java.sun.com/javase/6/docs/api/"/>
++++++ commons-cli-1.2-jdk9.patch -> commons-cli-1.4-jdk9.patch ++++++
--- /work/SRC/openSUSE:Factory/apache-commons-cli/commons-cli-1.2-jdk9.patch
2018-07-07 21:58:03.791343149 +0200
+++
/work/SRC/openSUSE:Factory/.apache-commons-cli.new/commons-cli-1.4-jdk9.patch
2018-10-31 13:22:05.363021060 +0100
@@ -1,70 +1,13 @@
---- commons-cli-1.2-src/maven-build.properties 2017-09-14 11:28:42.076085832
+0200
-+++ commons-cli-1.2-src/maven-build.properties 2017-09-14 11:30:28.515332100
+0200
-@@ -2,7 +2,7 @@
- #Tue Feb 01 23:35:00 MST 2011
- commons.manifestfile=target/osgi/MANIFEST.MF
- maven.settings.offline=true
--maven.compile.target=1.4
-+maven.compile.target=8
- maven.build.finalName=commons-cli-1.2
- commons.release.name=commons-cli-1.2
- maven.build.resourceDir.0=.
-@@ -21,7 +21,7 @@
- commons.osgi.import=*
- commons.encoding=iso-8859-1
- commons.osgi.symbolicName=org.apache.commons.cli
--maven.compile.source=1.4
-+maven.compile.source=8
- organization.logo=http\://www.apache.org/images/asf_logo_wide.gif
- commons.osgi.dynamicImport=
- maven.build.testDir.0=src/test
---- commons-cli-1.2-src/maven-build.xml 2017-09-14 11:28:42.076085832
+0200
-+++ commons-cli-1.2-src/maven-build.xml 2017-09-14 11:30:13.055332041
+0200
-@@ -68,10 +68,10 @@
- debug="true"
- optimize="false"
- deprecation="true"
-- target="1.4"
-+ target="8"
- verbose="false"
- fork="false"
-- source="1.4">
-+ source="8">
- <src>
- <pathelement location="${maven.build.srcDir.0}"/>
- </src>
-@@ -101,10 +101,10 @@
- debug="true"
- optimize="false"
- deprecation="true"
-- target="1.4"
-+ target="8"
- verbose="false"
- fork="false"
-- source="1.4">
-+ source="8">
- <src>
- <pathelement location="${maven.build.testDir.0}"/>
- </src>
-@@ -202,7 +202,7 @@
- nonavbar="false"
- serialwarn="false"
- charset="ISO-8859-1"
-- source="1.4"
-+ source="8"
- linksource="true"
- breakiterator="false">
- <link href="http://java.sun.com/javase/6/docs/api/"/>
---- commons-cli-1.2-src/pom.xml 2017-09-14 11:28:42.076085832 +0200
-+++ commons-cli-1.2-src/pom.xml 2017-09-14 11:30:04.343332008 +0200
-@@ -128,8 +128,8 @@
+--- commons-cli-1.4-src/pom.xml 2017-03-09 13:59:23.000000000 +0100
++++ commons-cli-1.4-src/pom.xml 2018-10-23 19:42:13.605822641 +0200
+@@ -163,8 +163,8 @@
</dependencies>
<properties>
-- <maven.compile.source>1.4</maven.compile.source>
-- <maven.compile.target>1.4</maven.compile.target>
-+ <maven.compile.source>8</maven.compile.source>
-+ <maven.compile.target>8</maven.compile.target>
+- <maven.compiler.source>1.5</maven.compiler.source>
+- <maven.compiler.target>1.5</maven.compiler.target>
++ <maven.compiler.source>8</maven.compiler.source>
++ <maven.compiler.target>8</maven.compiler.target>
<commons.componentid>cli</commons.componentid>
- <commons.release.version>1.2</commons.release.version>
+ <commons.release.version>1.4</commons.release.version>
<commons.release.name>commons-cli-${commons.release.version}</commons.release.name>
++++++ commons-cli-1.2-src.tar.gz -> commons-cli-1.4-src.tar.gz ++++++
++++ 24852 lines of diff (skipped)
