Fridrich Strba 2018-10-18 03:04:27 +00:00 committed by Git OBS Bridge
parent 16ffd069cb
commit 82d389ce81
11 changed files with 12 additions and 251 deletions

View File

@ -1,40 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project>
<!-- [MPG] POM Created by Mergere Pom Generator (beta). -->
<modelVersion>4.0.0</modelVersion>
<groupId>org.beanshell</groupId>
<artifactId>beanshell</artifactId>
<version>2.0b6</version>
<packaging>pom</packaging>
<name>BeanShell</name>
<description>BeanShell</description>
<organization>
<name>http://www.beanshell.org/</name>
</organization>
<licenses>
<license>
<name>GNU LESSER GENERAL PUBLIC LICENSE</name>
<url>http://www.gnu.org/licenses/lgpl.txt</url>
</license>
</licenses>
<dependencies>
<dependency>
<groupId>bsf</groupId>
<artifactId>bsf</artifactId>
<version>2.3.0</version>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
<version>2.4</version>
</dependency>
<dependency>
<groupId>asm</groupId>
<artifactId>asm</artifactId>
<version>1.5.3</version>
</dependency>
</dependencies>
</project>

View File

@ -1,27 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project>
<!-- [MPG] POM Created by Mergere Pom Generator (beta). -->
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.beanshell</groupId>
<artifactId>beanshell</artifactId>
<version>2.0b6</version>
</parent>
<artifactId>bsh-bsf</artifactId>
<name>BeanShell bsf</name>
<description>BeanShell bsf</description>
<dependencies>
<dependency>
<groupId>org.beanshell</groupId>
<artifactId>bsh-core</artifactId>
<version>2.0b6</version>
</dependency>
<dependency>
<groupId>bsf</groupId>
<artifactId>bsf</artifactId>
<version>2.3.0</version>
</dependency>
</dependencies>
</project>

View File

@ -1,22 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project>
<!-- [MPG] POM Created by Mergere Pom Generator (beta). -->
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.beanshell</groupId>
<artifactId>beanshell</artifactId>
<version>2.0b6</version>
</parent>
<artifactId>bsh-classgen</artifactId>
<name>BeanShell classgen</name>
<description>BeanShell classgen</description>
<dependencies>
<dependency>
<groupId>org.beanshell</groupId>
<artifactId>bsh-core</artifactId>
<version>2.0b6</version>
</dependency>
</dependencies>
</project>

View File

@ -1,22 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project>
<!-- [MPG] POM Created by Mergere Pom Generator (beta). -->
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.beanshell</groupId>
<artifactId>beanshell</artifactId>
<version>2.0b6</version>
</parent>
<artifactId>bsh-classpath</artifactId>
<name>BeanShell classpath</name>
<description>BeanShell classpath</description>
<dependencies>
<dependency>
<groupId>org.beanshell</groupId>
<artifactId>bsh-core</artifactId>
<version>2.0b6</version>
</dependency>
</dependencies>
</project>

View File

@ -1,22 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project>
<!-- [MPG] POM Created by Mergere Pom Generator (beta). -->
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.beanshell</groupId>
<artifactId>beanshell</artifactId>
<version>2.0b6</version>
</parent>
<artifactId>bsh-commands</artifactId>
<name>BeanShell commands</name>
<description>BeanShell commands</description>
<dependencies>
<dependency>
<groupId>org.beanshell</groupId>
<artifactId>bsh-core</artifactId>
<version>2.0b6</version>
</dependency>
</dependencies>
</project>

View File

@ -1,14 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project>
<!-- [MPG] POM Created by Mergere Pom Generator (beta). -->
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.beanshell</groupId>
<artifactId>beanshell</artifactId>
<version>2.0b6</version>
</parent>
<artifactId>bsh-core</artifactId>
<name>BeanShell core</name>
<description>BeanShell core</description>
</project>

View File

@ -1,22 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project>
<!-- [MPG] POM Created by Mergere Pom Generator (beta). -->
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.beanshell</groupId>
<artifactId>beanshell</artifactId>
<version>2.0b6</version>
</parent>
<artifactId>bsh-engine</artifactId>
<name>BeanShell engine</name>
<description>BeanShell engine</description>
<dependencies>
<dependency>
<groupId>org.beanshell</groupId>
<artifactId>bsh-core</artifactId>
<version>2.0b6</version>
</dependency>
</dependencies>
</project>

View File

@ -1,23 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project>
<!-- [MPG] POM Created by Mergere Pom Generator (beta). -->
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.beanshell</groupId>
<artifactId>beanshell</artifactId>
<version>2.0b6</version>
</parent>
<artifactId>bsh-reflect</artifactId>
<version>2.0b6</version>
<name>BeanShell reflect</name>
<description>BeanShell reflect</description>
<dependencies>
<dependency>
<groupId>org.beanshell</groupId>
<artifactId>bsh-core</artifactId>
<version>2.0b6</version>
</dependency>
</dependencies>
</project>

View File

@ -1,22 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project>
<!-- [MPG] POM Created by Mergere Pom Generator (beta). -->
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.beanshell</groupId>
<artifactId>beanshell</artifactId>
<version>2.0b6</version>
</parent>
<artifactId>bsh-util</artifactId>
<name>BeanShell util</name>
<description>BeanShell util</description>
<dependencies>
<dependency>
<groupId>org.beanshell</groupId>
<artifactId>bsh-classpath</artifactId>
<version>2.0b6</version>
</dependency>
</dependencies>
</project>

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Thu Oct 18 03:03:38 UTC 2018 - Fridrich Strba <fstrba@suse.com>
- Use the pom.xml file from the sources to generate maven provides
-------------------------------------------------------------------
Wed May 16 07:29:15 UTC 2018 - fstrba@suse.com

View File

@ -13,7 +13,7 @@
# 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/
#
@ -27,15 +27,6 @@ License: SPL-1.0 OR LGPL-2.0-or-later
Group: Development/Libraries/Java
Url: http://www.beanshell.org/
Source0: https://github.com/beanshell/beanshell/archive/%{fversion}.tar.gz
Source1: beanshell-2.0b5.pom
Source2: bsh-classpath-2.0b5.pom
Source3: bsh-commands-2.0b5.pom
Source4: bsh-core-2.0b5.pom
Source5: bsh-reflect-2.0b5.pom
Source6: bsh-util-2.0b5.pom
Source7: bsh-bsf-2.0b5.pom
Source8: bsh-classgen-2.0b5.pom
Source9: bsh-engine-2.0b5.pom
Patch1: %{name}-asm.patch
Patch2: %{name}-ClassGeneratorUtil.patch
#PATCH-FIX-OPENSUSE: use html output and JVM's built-in xmlns:redirect
@ -179,34 +170,9 @@ done
# poms
install -d -m 755 %{buildroot}%{_mavenpomdir}
install -m 644 %{SOURCE1} \
install -m 644 pom.xml \
%{buildroot}%{_mavenpomdir}/JPP.%{name}-bsh.pom
install -m 644 %{SOURCE2} \
%{buildroot}%{_mavenpomdir}/JPP.%{name}-bsh-classpath.pom
install -m 644 %{SOURCE3} \
%{buildroot}%{_mavenpomdir}/JPP.%{name}-bsh-commands.pom
install -m 644 %{SOURCE4} \
%{buildroot}%{_mavenpomdir}/JPP.%{name}-bsh-core.pom
install -m 644 %{SOURCE5} \
%{buildroot}%{_mavenpomdir}/JPP.%{name}-bsh-reflect.pom
install -m 644 %{SOURCE6} \
%{buildroot}%{_mavenpomdir}/JPP.%{name}-bsh-util.pom
install -m 644 %{SOURCE7} \
%{buildroot}%{_mavenpomdir}/JPP.%{name}-bsh-bsf.pom
install -m 644 %{SOURCE8} \
%{buildroot}%{_mavenpomdir}/JPP.%{name}-bsh-classgen.pom
install -m 644 %{SOURCE9} \
%{buildroot}%{_mavenpomdir}/JPP.%{name}-bsh-engine.pom
%add_maven_depmap JPP.%{name}-bsh.pom %{name}/bsh.jar -a org.beanshell:%{name}
%add_maven_depmap JPP.%{name}-bsh-classpath.pom %{name}/bsh-classpath.jar
%add_maven_depmap JPP.%{name}-bsh-commands.pom %{name}/bsh-commands.jar
%add_maven_depmap JPP.%{name}-bsh-core.pom %{name}/bsh-core.jar
%add_maven_depmap JPP.%{name}-bsh-reflect.pom %{name}/bsh-reflect.jar
%add_maven_depmap JPP.%{name}-bsh-util.pom %{name}/bsh-util.jar
%add_maven_depmap JPP.%{name}-bsh-bsf.pom %{name}/bsh-bsf.jar
%add_maven_depmap JPP.%{name}-bsh-classgen.pom %{name}/bsh-classgen.jar
%add_maven_depmap JPP.%{name}-bsh-engine.pom %{name}/bsh-engine.jar
%add_maven_depmap JPP.%{name}-bsh.pom %{name}/bsh.jar -a org.beanshell:%{name},:bsh,bsh:bsh,bsh:bsh-bsf,org.beanshell:bsh
# manual
find docs -name ".cvswrappers" -exec rm -f {} \;
@ -293,7 +259,11 @@ cat scripts/bshdoc.bsh >> %{buildroot}%{_bindir}/%{name}doc
%dir %{_datadir}/%{name}
%{_datadir}/%{name}/bshservlet
%{_mavenpomdir}/*
%if %{defined _maven_repository}
%{_mavendepmapfragdir}/%{name}
%else
%{_datadir}/maven-metadata/%{name}.xml*
%endif
%files bsf
%{_javadir}/%{name}/%{orig_name}-bsf*.jar