diff --git a/apache-commons-lang3.changes b/apache-commons-lang3.changes
index dc0b654..6b86b54 100644
--- a/apache-commons-lang3.changes
+++ b/apache-commons-lang3.changes
@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Mon Oct 22 10:24:43 UTC 2018 - Fridrich Strba <fstrba@suse.com>
+
+- Build commons-lang3-3.8.1 using modified build.xml and
+  default.properties from 3.4.
+- Removed patch:
+  * commons-lang3-3.4-javadoc.patch
+    - integrated in the build.xml
+- Use source and target version 1.7, since the code contains
+  diamond operator.
+
 -------------------------------------------------------------------
 Wed May  2 12:22:44 UTC 2018 - tchvatal@suse.com
 
diff --git a/apache-commons-lang3.spec b/apache-commons-lang3.spec
index 2667810..dabe3b4 100644
--- a/apache-commons-lang3.spec
+++ b/apache-commons-lang3.spec
@@ -12,25 +12,26 @@
 # 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/
 #
 
 
 %define base_name lang3
 %define short_name commons-%{base_name}
-Name:           apache-commons-lang3
-Version:        3.4
+Name:           apache-%{short_name}
+Version:        3.8.1
 Release:        0
 Summary:        Apache Commons Lang Package
 License:        Apache-2.0
 Group:          Development/Libraries/Java
 URL:            http://commons.apache.org/%{base_name}
 Source0:        http://archive.apache.org/dist/commons/lang/source/%{short_name}-%{version}-src.tar.gz
-Patch0:         commons-lang3-3.4-javadoc.patch
+Source1:        build.xml
+Source2:        default.properties
 BuildRequires:  ant
 BuildRequires:  ant-junit
 BuildRequires:  fdupes
-BuildRequires:  java-devel >= 1.6
+BuildRequires:  java-devel >= 1.7
 BuildRequires:  javapackages-local
 BuildRequires:  javapackages-tools
 BuildRequires:  junit
@@ -59,39 +60,49 @@ Javadoc for %{name}.
 
 %prep
 %setup -q -n %{short_name}-%{version}-src
-%patch0 -p1
+cp %{SOURCE1} .
+cp %{SOURCE2} .
 sed -i 's/\r//' *.txt
 
 %build
 export OPT_JAR_LIST=`cat %{_sysconfdir}/ant.d/junit`
 export CLASSPATH=
 ant \
-    -Dcompile.source=1.6 -Dcompile.target=1.6 \
+    -Dcompile.source=1.7 -Dcompile.target=1.7 \
     -Dfinal.name=%{short_name} \
      jar javadoc
 
 %install
+
 # jars
-mkdir -p %{buildroot}%{_javadir}
-cp -p target/%{short_name}.jar %{buildroot}%{_javadir}/%{name}.jar
-(cd %{buildroot}%{_javadir} && for jar in apache-*; do ln -sf ${jar} `echo $jar| sed "s|apache-||g"`; done)
+install -dm 755 %{buildroot}%{_javadir}
+install -m 0644  target/%{short_name}.jar %{buildroot}%{_javadir}/%{short_name}-%{version}.jar
+pushd %{buildroot}%{_javadir}
+  ln -s %{short_name}-%{version}.jar %{short_name}.jar
+  ln -s %{short_name}-%{version}.jar %{name}-%{version}.jar
+  ln -s %{name}-%{version}.jar %{name}.jar
+popd
 
 # pom
-mkdir -p %{buildroot}%{_mavenpomdir}
-cp -p pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
-%add_maven_depmap
+install -dm 755 %{buildroot}%{_mavenpomdir}
+install -m 0644  pom.xml %{buildroot}%{_mavenpomdir}/%{short_name}-%{version}.pom
+%add_maven_depmap %{short_name}-%{version}.pom %{short_name}-%{version}.jar
+
 # javadoc
-mkdir -p %{buildroot}%{_javadocdir}/%{name}
+install -dm 755 %{buildroot}%{_javadocdir}/%{name}
 cp -pr target/apidocs/* %{buildroot}%{_javadocdir}/%{name}/
 %fdupes -s %{buildroot}%{_javadocdir}/%{name}/
 
 %files
 %license LICENSE.txt
 %doc NOTICE.txt RELEASE-NOTES.txt
-%{_javadir}/%{name}.jar
-%{_javadir}/%{short_name}.jar
+%{_javadir}/*.jar
 %{_mavenpomdir}/*
-%{_datadir}/maven-metadata/%{name}.xml
+%if %{defined _maven_repository}
+%{_mavendepmapfragdir}/%{name}
+%else
+%{_datadir}/maven-metadata/%{name}.xml*
+%endif
 
 %files javadoc
 %{_javadocdir}/%{name}
diff --git a/build.xml b/build.xml
new file mode 100644
index 0000000..236d1d5
--- /dev/null
+++ b/build.xml
@@ -0,0 +1,230 @@
+<!--
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+ -->
+<!--
+   "Lang" component of the Apache Commons Subproject
+   $Id: build.xml 1583140 2014-03-30 13:51:54Z britter $
+-->
+<project name="Lang" default="compile" basedir=".">
+
+    <!-- ========== Initialize Properties ===================================== -->
+    <property file="${user.home}/${component.name}.build.properties"/>
+    <property file="${user.home}/build.properties"/>
+    <property file="${basedir}/build.properties"/>
+    <property file="${basedir}/default.properties"/>
+    <property name="jdk.javadoc" value="http://docs.oracle.com/javase/6/docs/api/"/>
+    <property name="collections.javadoc" value="http://commons.apache.org/collections/api-release/"/>
+
+    <!-- ========== Construct compile classpath =============================== -->
+    <path id="compile.classpath">
+        <pathelement location="${build.home}/classes"/>
+    </path>
+
+    <!-- ========== Construct unit test classpath ============================= -->
+    <path id="test.classpath">
+        <pathelement location="${build.home}/classes"/>
+        <pathelement location="${build.home}/tests"/>
+        <pathelement location="${junit.jar}"/>
+        <pathelement location="${easymock.jar}"/>
+        <pathelement location="${commons-io.jar}"/>
+        <pathelement location="${hamcrest.jar}"/>
+    </path>
+
+    <!-- ========== Executable Targets ======================================== -->
+    <target name="init" description="Initialize and evaluate conditionals">
+        <echo message="-------- ${component.name} ${component.version} --------"/>
+        <filter token="name" value="${component.name}"/>
+        <filter token="package" value="${component.package}"/>
+        <filter token="version" value="${component.version}"/>
+        <filter token="compile.source" value="${compile.source}"/>
+        <filter token="compile.target" value="${compile.target}"/>
+        <mkdir dir="${build.home}"/>
+    </target>
+
+    <!-- ========== Compile Targets ========================================= -->
+    <target name="compile" depends="init" description="Compile shareable components">
+        <mkdir dir="${build.home}/classes"/>
+        <javac srcdir="${source.home}" destdir="${build.home}/classes" debug="${compile.debug}" deprecation="${compile.deprecation}" target="${compile.target}" source="${compile.source}" excludes="${compile.excludes}" optimize="${compile.optimize}" includeantruntime="false" encoding="${compile.encoding}">
+            <classpath refid="compile.classpath"/>
+        </javac>
+        <copy todir="${build.home}/classes" filtering="on">
+            <fileset dir="${source.home}" excludes="**/*.java,**/*.html"/>
+        </copy>
+    </target>
+
+    <target name="compile.tests" depends="compile" description="Compile unit test cases">
+        <mkdir dir="${build.home}/tests"/>
+        <javac srcdir="${test.home}" destdir="${build.home}/tests" debug="${compile.debug}" deprecation="off" target="${compile.target}" source="${compile.source}" optimize="${compile.optimize}" includeantruntime="false" encoding="${compile.encoding}">
+            <classpath refid="test.classpath"/>
+        </javac>
+        <copy todir="${build.home}/tests" filtering="on">
+            <fileset dir="${test.home}" excludes="**/*.java"/>
+        </copy>
+    </target>
+
+    <!-- ========== Unit Tests ========================================= -->
+    <target name="test" depends="compile.tests" description="Run all unit test cases">
+        <echo message="Running unit tests ..."/>
+        <mkdir dir="${build.home}/test-reports"/>
+        <junit printsummary="true" showoutput="true" fork="yes" haltonfailure="${test.failonerror}">
+            <classpath refid="test.classpath"/>
+            <formatter type="plain" usefile="true" />
+            <!-- If test.entry is defined, run a single test, otherwise run all valid tests -->
+            <test name="${test.entry}" todir="${build.home}/test-reports" if="test.entry"/>
+            <batchtest fork="yes" todir="${build.home}/test-reports" unless="test.entry">
+                <fileset dir="${test.home}">
+                    <include name="**/*Test.java"/>
+                    <exclude name="**/Abstract*Test.java"/>
+                </fileset>
+            </batchtest>
+        </junit>
+    </target>
+
+    <target name="clean" description="Clean build and distribution directories">
+        <delete dir="${build.home}"/>
+    </target>
+
+    <target name="all" depends="clean,test,compile" description="Clean and compile all components"/>
+
+    <!-- ========== JavaDocs ========================================= -->
+    <target name="javadoc" depends="compile" description="Create component Javadoc documentation">
+        <mkdir dir="${build.home}"/>
+        <mkdir dir="${build.home}/apidocs"/>
+        <tstamp>
+            <format property="current.year" pattern="yyyy"/>
+        </tstamp>
+        <javadoc sourcepath="${source.home}"
+                 destdir="${build.home}/apidocs"
+                 overview="${source.home}/org/apache/commons/lang3/overview.html"
+                 packagenames="org.apache.commons.*"
+                 excludepackagenames="${javadoc.excludepackagenames}"
+                 author="false"
+                 version="true"
+                 doctitle="&lt;h1&gt;Commons Lang ${component.version}&lt;/h1&gt;"
+                 windowtitle="Lang ${component.version}"
+                 bottom="Copyright &amp;copy; 2001-${current.year} - Apache Software Foundation"
+                 use="true"
+                 encoding="${compile.encoding}"
+                 source="${compile.source}">
+        </javadoc>
+    </target>
+
+    <!-- ========== Jar Targets ========================================= -->
+    <target name="jar" depends="compile" description="Create jar">
+        <mkdir dir="${build.home}/classes/META-INF"/>
+        <copy file="LICENSE.txt" tofile="${build.home}/classes/META-INF/LICENSE.txt"/>
+        <copy file="NOTICE.txt"  tofile="${build.home}/classes/META-INF/NOTICE.txt"/>
+        <jar jarfile="${build.home}/${final.name}.jar">
+            <manifest>
+                <attribute name="Specification-Title" value="Commons Lang"/>
+                <attribute name="Specification-Version" value="${component.version}"/>
+                <attribute name="Specification-Vendor" value="The Apache Software Foundation"/>
+                <attribute name="Implementation-Title" value="Commons Lang"/>
+                <attribute name="Implementation-Version" value="${component.version}"/>
+                <attribute name="Implementation-Vendor" value="The Apache Software Foundation"/>
+                <attribute name="Implementation-Vendor-Id" value="org.apache"/>
+                <attribute name="X-Compile-Source-JDK" value="${compile.source}"/>
+                <attribute name="X-Compile-Target-JDK" value="${compile.target}"/>
+            </manifest>
+            <fileset dir="${build.home}/classes">
+                <include name="**/*.class"/>
+                <include name="**/LICENSE.txt"/>
+                <include name="**/NOTICE.txt"/>
+            </fileset>
+        </jar>
+    </target>
+
+    <target name="javadoc-jar" depends="javadoc" description="Create JavaDoc jar">
+        <jar jarfile="${build.home}/${final.name}-javadoc.jar">
+            <manifest>
+                <attribute name="Specification-Title" value="Commons Lang API"/>
+                <attribute name="Specification-Version" value="${component.version}"/>
+                <attribute name="Specification-Vendor" value="The Apache Software Foundation"/>
+                <attribute name="Implementation-Title" value="Commons Lang API"/>
+                <attribute name="Implementation-Version" value="${component.version}"/>
+                <attribute name="Implementation-Vendor" value="The Apache Software Foundation"/>
+                <attribute name="Implementation-Vendor-Id" value="org.apache"/>
+            </manifest>
+            <fileset dir="${build.home}/apidocs"/>
+            <fileset dir="${basedir}">
+                <include name="LICENSE.txt"/>
+                <include name="NOTICE.txt"/>
+            </fileset>
+        </jar>
+    </target>
+
+    <target name="source-jar" depends="init" description="Create JavaDoc jar">
+        <jar jarfile="${build.home}/${final.name}-sources.jar">
+            <manifest>
+                <attribute name="Specification-Title" value="Commons Lang Source"/>
+                <attribute name="Specification-Version" value="${component.version}"/>
+                <attribute name="Specification-Vendor" value="The Apache Software Foundation"/>
+                <attribute name="Implementation-Title" value="Commons Lang Source"/>
+                <attribute name="Implementation-Version" value="${component.version}"/>
+                <attribute name="Implementation-Vendor" value="The Apache Software Foundation"/>
+                <attribute name="Implementation-Vendor-Id" value="org.apache"/>
+            </manifest>
+            <fileset dir="${source.home}">
+                <include name="**/*.java"/>
+            </fileset>
+            <fileset dir="${basedir}">
+                <include name="LICENSE.txt"/>
+                <include name="NOTICE.txt"/>
+            </fileset>
+        </jar>
+    </target>
+
+    <!-- ========== Distribution ========================================= -->
+    <target name="dist" depends="clean,jar,source-jar,javadoc-jar" description="Create binary distribution">
+
+        <!-- binary distro -->
+        <zip destfile="${build.home}/${final.name}.zip">
+            <zipfileset dir="${basedir}" prefix="${final.name}"
+                      includes="LICENSE.txt,
+                                NOTICE.txt,
+                                RELEASE-NOTES.txt"
+             />
+            <zipfileset dir="${build.home}" includes="*.jar," prefix="${final.name}"/>
+            <zipfileset dir="${build.home}/apidocs" prefix="${final.name}/apidocs"/>
+        </zip>
+        <tar destfile="${build.home}/${final.name}.tar.gz" compression="gzip">
+            <zipfileset src="${build.home}/${final.name}.zip"/>
+        </tar>
+
+        <!-- source distro -->
+        <zip destfile="${build.home}/${final.name}-src.zip">
+            <zipfileset dir="${basedir}" prefix="${final.name}-src"
+                      includes="build.xml,
+                                build.xml,
+                                checkstyle.xml,
+                                default.properties,
+                                LICENSE.txt,
+                                NOTICE.txt,
+                                pom.xml,
+                                RELEASE-NOTES.txt"
+             />
+            <zipfileset dir="${basedir}/src"   prefix="${final.name}-src/src"/>
+        </zip>
+        <tar destfile="${build.home}/${final.name}-src.tar.gz" compression="gzip">
+            <zipfileset src="${build.home}/${final.name}-src.zip"/>
+        </tar>
+
+    </target>
+</project>
diff --git a/commons-lang3-3.4-javadoc.patch b/commons-lang3-3.4-javadoc.patch
deleted file mode 100644
index 7a481f4..0000000
--- a/commons-lang3-3.4-javadoc.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- commons-lang3-3.4-src/build.xml	2015-04-03 14:28:37.000000000 +0200
-+++ commons-lang3-3.4-src/build.xml	2017-10-09 08:38:44.281345802 +0200
-@@ -123,9 +123,6 @@
-                  use="true"
-                  encoding="${compile.encoding}"
-                  source="${compile.source}">
--            <classpath refid="compile.classpath"/>
--            <link href="${jdk.javadoc}"/>
--            <link href="${collections.javadoc}"/>
-         </javadoc>
-     </target>
- 
diff --git a/commons-lang3-3.4-src.tar.gz b/commons-lang3-3.4-src.tar.gz
deleted file mode 100644
index 97197cd..0000000
--- a/commons-lang3-3.4-src.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:6f9a16e264aec59e4c7148763223480171f756f020d7a30aa617caabd382fa76
-size 771275
diff --git a/commons-lang3-3.8.1-src.tar.gz b/commons-lang3-3.8.1-src.tar.gz
new file mode 100644
index 0000000..f7c3a83
--- /dev/null
+++ b/commons-lang3-3.8.1-src.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:9682e67375b6f03700e5bbaa2acceac60bc2f9049e11cafae3ce411ccaf633fb
+size 965924
diff --git a/default.properties b/default.properties
new file mode 100644
index 0000000..1814af2
--- /dev/null
+++ b/default.properties
@@ -0,0 +1,90 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+# $Id: default.properties 1671054 2015-04-03 12:28:16Z britter $
+
+# The location of the "junit.jar" JAR file
+junit.jar = ${junit.home}/junit-4.12.jar
+
+# The location of the Easymock jar
+easymock.jar = ${easymock.home}/easymock-3.3.1.jar
+
+# The location of the Commons-IO jar
+commons-io.jar = ${commons-io.home}/commons-io-2.4.jar
+
+# The location of Hamcrest jar
+hamcrest.jar = ${hamcrest.home}/hamcrest-all-1.3.jar
+
+# Whether or not to fork tests
+junit.fork = true
+
+# The name of this component
+component.name = commons-lang3
+
+# The primary package name of this component
+component.package = org.apache.commons.lang3
+
+# The title of this component
+component.title = Core Language Utilities
+
+# The current version number of this component
+component.version = 3.8.1
+
+# The name that is used to create the jar file
+final.name = ${component.name}-${component.version}
+
+# The base directory for compilation targets
+build.home = target
+
+# The base directory for component configuration files
+conf.home = src/conf
+
+# The base directory for component sources
+source.home = src/main/java
+
+# The base directory for unit test sources
+test.home = src/test/java
+
+# Should Java compilations set the 'debug' compiler option?
+compile.debug = true
+
+# Should Java compilations set the 'deprecation' compiler option?
+compile.deprecation = true
+
+# Should Java compilations set the 'optimize' compiler option?
+compile.optimize = true
+
+# Generate class files for specific VM version (e.g., 1.1 or 1.2).
+# Note that the default value depends on the JVM that is running Ant.
+# In particular, if you use JDK 1.4+ the generated classes will not be usable
+# for a 1.1 Java VM unless you explicitly set this attribute to the value 1.1
+# (which is the default value for JDK 1.1 to 1.3).
+compile.target = 1.7
+
+# Specifies the source version for the Java compiler.
+# Corresponds to the source attribute for the ant javac task.
+# Valid values are 1.3, 1.4, 1.5.
+compile.source = 1.7
+
+# Specifies the source encoding.
+compile.encoding = ISO-8859-1
+
+# Should all tests fail if one does?
+test.failonerror = true
+
+# The test runner to execute
+test.runner = junit.textui.TestRunner