Accepting request 1105126 from Java:packages

Clean up and distribute with maven metadata

OBS-URL: https://build.opensuse.org/request/show/1105126
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/jakarta-commons-modeler?expand=0&rev=22

commons-modeler-2.0.1.pom

@@ -0,0 +1,186 @@
+<?xml version="1.0" encoding="UTF-8"?><project>
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>commons-modeler</groupId>
+  <artifactId>commons-modeler</artifactId>
+  <name>Commons Modeler</name>
+  <version>2.0.1</version>
+  <description>Commons Modeler</description>
+  <url>http://jakarta.apache.org/commons/${pom.artifactId.substring(8)}/</url>
+  <issueManagement>
+    <url>http://issues.apache.org/jira/browse/${pom.artifactId.substring(8).toUpperCase()}</url>
+  </issueManagement>
+  <ciManagement>
+    <notifiers>
+      <notifier>
+        <configuration>
+          <address>commons-dev@jakarta.apache.org</address>
+        </configuration>
+      </notifier>
+    </notifiers>
+  </ciManagement>
+  <inceptionYear>2002</inceptionYear>
+  <mailingLists>
+    <mailingList>
+      <name>Commons Dev List</name>
+      <subscribe>commons-dev-subscribe@jakarta.apache.org</subscribe>
+      <unsubscribe>commons-dev-unsubscribe@jakarta.apache.org</unsubscribe>
+      <archive>http://mail-archives.apache.org/mod_mbox/jakarta-commons-dev/</archive>
+    </mailingList>
+    <mailingList>
+      <name>Commons User List</name>
+      <subscribe>commons-user-subscribe@jakarta.apache.org</subscribe>
+      <unsubscribe>commons-user-unsubscribe@jakarta.apache.org</unsubscribe>
+      <archive>http://mail-archives.apache.org/mod_mbox/jakarta-commons-user/</archive>
+    </mailingList>
+  </mailingLists>
+  <developers>
+    <developer>
+      <id>craigmcc</id>
+      <name>Craig McClanahan</name>
+      <email>craigmcc@apache.org</email>
+      <organization>Apache</organization>
+    </developer>
+    <developer>
+      <id>yoavs</id>
+      <name>Yoav Shapira</name>
+      <email>yoavs@apache.org</email>
+      <organization>Apache</organization>
+    </developer>
+    <developer>
+      <id>billbarker</id>
+      <name>Bill Barker</name>
+      <email>billbarker@apache.org</email>
+      <organization>Apache</organization>
+    </developer>
+    <developer>
+      <id>dims</id>
+      <name>Davanum Srinivas</name>
+      <email>dims@apache.org</email>
+      <organization>Apache</organization>
+    </developer>
+  </developers>
+  <licenses>
+    <license>
+      <name>The Apache Software License, Version 2.0</name>
+      <url>/LICENSE.txt</url>
+    </license>
+  </licenses>
+  <scm>
+    <connection>scm:svn:http://svn.apache.org/repos/asf/jakarta/commons/proper/${pom.artifactId.substring(8)}/trunk</connection>
+    <url>http://svn.apache.org/repos/asf/jakarta/commons/proper/${pom.artifactId.substring(8)}/trunk</url>
+  </scm>
+  <organization>
+    <name>The Apache Software Foundation</name>
+    <url>http://jakarta.apache.org</url>
+  </organization>
+  <build>
+    <sourceDirectory>src/java</sourceDirectory>
+    <testSourceDirectory>src/test</testSourceDirectory>
+    <resources>
+      <resource>
+        <targetPath>META-INF</targetPath>
+        <directory>.</directory>
+        <includes>
+          <include>NOTICE.txt</include>
+        </includes>
+      </resource>
+      <resource>
+        <targetPath>META-INF</targetPath>
+        <directory>src/java/org/apache/commons/modeler/ant</directory>
+        <includes>
+          <include>ant.properties</include>
+        </includes>
+      </resource>
+      <resource>
+        <directory>src/java</directory>
+        <includes>
+          <include>**/ant.properties</include>
+          <include>**/mbeans-descriptors.dtd</include>
+        </includes>
+      </resource>
+    </resources>
+    <testResources>
+      <testResource>
+        <directory>${pom.build.unitTestSourceDirectory}</directory>
+        <includes>
+          <include>**/*.xml</include>
+        </includes>
+      </testResource>
+    </testResources>
+    <plugins>
+      <plugin>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <configuration>
+          <includes>
+            <include>**/*TestCase.java</include>
+          </includes>
+        </configuration>
+      </plugin>
+      <plugin>
+        <artifactId>maven-changelog-plugin</artifactId>
+        <version>1.9.1</version>
+        <configuration>
+          <comment>&lt;strong>Site Only&lt;/strong> - v1.9.1 (minimum)
+              required for building the Site documentation.</comment>
+        </configuration>
+      </plugin>
+      <plugin>
+        <artifactId>maven-xdoc-plugin</artifactId>
+        <version>1.9.2</version>
+        <configuration>
+          <comment>&lt;strong>Site Only&lt;/strong> - v1.9.2 (minimum)
+              required for building the Site documentation.</comment>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+  <dependencies>
+    <dependency>
+      <groupId>commons-digester</groupId>
+      <artifactId>commons-digester</artifactId>
+      <version>1.4.1</version>
+    </dependency>
+    <dependency>
+      <groupId>commons-logging</groupId>
+      <artifactId>commons-logging-api</artifactId>
+      <version>1.0.4</version>
+    </dependency>
+    <dependency>
+      <groupId>mx4j</groupId>
+      <artifactId>mx4j-jmx</artifactId>
+      <version>2.1.1</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>xml-apis</groupId>
+      <artifactId>xml-apis</artifactId>
+      <version>2.0.2</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>3.7</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>ant</groupId>
+      <artifactId>ant</artifactId>
+      <version>1.5</version>
+      <optional>true</optional>
+    </dependency>
+  </dependencies>
+  <distributionManagement>
+    <repository>
+      <id>default</id>
+      <name>Default Repository</name>
+      <url>file:///www/jakarta.apache.org/builds/jakarta-commons/${pom.artifactId.substring(8)}/</url>
+    </repository>
+    <site>
+      <id>default</id>
+      <name>Default Site</name>
+      <url>scp://people.apache.org//www/jakarta.apache.org/commons/${pom.artifactId.substring(8)}/</url>
+    </site>
+    <status>converted</status>
+  </distributionManagement>
+</project>

jakarta-commons-modeler.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Aug 21 16:28:06 UTC 2023 - Fridrich Strba <fstrba@suse.com>
+
+- Clean the spec file a bit and distribute with proper maven
+  metadata
+
 -------------------------------------------------------------------
 Mon Mar 21 04:56:45 UTC 2022 - Fridrich Strba <fstrba@suse.com>
 

jakarta-commons-modeler.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package jakarta-commons-modeler
 #
-# Copyright (c) 2022 SUSE LLC
+# Copyright (c) 2023 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -27,25 +27,21 @@ Group:          Development/Libraries/Java
 URL:            https://commons.apache.org/dormant/commons-modeler/
 Source0:        https://archive.apache.org/dist/commons/%{base_name}/source/%{short_name}-%{version}-src.tar.gz
 Source1:        https://archive.apache.org/dist/commons/%{base_name}/source/%{short_name}-%{version}-src.tar.gz.asc
+Source10:       https://repo1.maven.org/maven2/%{short_name}/%{short_name}/%{version}/%{short_name}-%{version}.pom
 BuildRequires:  ant
 BuildRequires:  fdupes
 BuildRequires:  jakarta-commons-digester
+BuildRequires:  jakarta-commons-logging
 BuildRequires:  java-devel >= 1.8
-BuildRequires:  javapackages-tools
+BuildRequires:  javapackages-local >= 6
 BuildRequires:  junit
 BuildRequires:  mx4j
 BuildRequires:  xalan-j2
+BuildRequires:  xerces-j2
 BuildRequires:  xml-commons-apis
-Requires:       jakarta-commons-beanutils >= 1.3
-Requires:       jakarta-commons-collections >= 2.0
-Requires:       jakarta-commons-digester >= 1.2
-Requires:       jakarta-commons-logging >= 1.0
-Requires:       jaxp_parser_impl
-Requires:       jaxp_transform_impl
-Requires:       mx4j
-Requires:       xml-commons-apis
 Provides:       %{short_name} = %{version}-%{release}
 Obsoletes:      %{short_name} < %{version}-%{release}
+Provides:       apache-%{short_name} = %{version}-%{release}
 BuildArch:      noarch
 
 %description
@@ -69,14 +65,18 @@ Modeler Package.
 
 %prep
 %setup -q -n %{short_name}-%{version}-src
-# remove all binary libs
+
-find . -name "*.jar" -exec rm -f {} \;
+# convert DOS lineenedings to unix
+sed -i 's/\r$//' NOTICE.txt
+sed -i 's/\r$//' RELEASE-NOTES.txt
+sed -i 's/\r$//' xdocs/*.xml
+sed -i 's/\r$//' xdocs/style/*.css
 
 %build
-ant \
+%{ant} \
     -Dant.jar=$(build-classpath ant) \
-    -Djaxp.parser.jar=$(build-classpath jaxp_parser_impl) \
+    -Djaxp.parser.jar=$(build-classpath xerces-j2) \
-    -Djaxp.xalan.jar=$(build-classpath jaxp_trasform_impl) \
+    -Djaxp.xalan.jar=$(build-classpath xalan-j2) \
     -Djmx.jar=$(build-classpath mx4j/mx4j-jmx) \
     -Djunit.jar=$(build-classpath junit) \
     -Dcommons-digester.jar=$(build-classpath commons-digester) \
@@ -85,26 +85,26 @@ ant \
     dist
 
 %install
-# jars
+
-mkdir -p %{buildroot}%{_javadir}
+# jar
-cp -a dist/%{short_name}.jar %{buildroot}%{_javadir}/%{name}-%{version}.jar
+install -dm 0755 %{buildroot}%{_javadir}
-(cd %{buildroot}%{_javadir} && for jar in *-%{version}*; do ln -s ${jar} `echo $jar| sed  "s|jakarta-||g"`; done)
+install -pm 0644 dist/%{short_name}.jar %{buildroot}%{_javadir}/%{name}.jar
-(cd %{buildroot}%{_javadir} && for jar in *-%{version}*; do ln -s ${jar} `echo $jar| sed  "s|-%{version}||g"`; done)
+ln -sf %{name}.jar %{buildroot}%{_javadir}/%{short_name}.jar
+
+# pom
+install -dm 0755 %{buildroot}%{_mavenpomdir}
+%{mvn_install_pom} %{SOURCE10} %{buildroot}%{_mavenpomdir}/%{name}.pom
+%add_maven_depmap %{name}.pom %{name}.jar
+
 # javadoc
-mkdir -p %{buildroot}%{_javadocdir}/%{name}
+install -dm 0755 %{buildroot}%{_javadocdir}/%{name}
 cp -a dist/docs/* %{buildroot}%{_javadocdir}/%{name}
 %fdupes -s %{buildroot}%{_javadocdir}/%{name}
 
-# convert DOS lineenedings to unix
+%files -f .mfiles
-sed -i 's/\r$//' NOTICE.txt
-sed -i 's/\r$//' RELEASE-NOTES.txt
-sed -i 's/\r$//' xdocs/*.xml
-sed -i 's/\r$//' xdocs/style/*.css
-
-%files
 %doc NOTICE.txt RELEASE-NOTES.txt xdocs
 %license LICENSE.txt
-%{_javadir}/*
+%{_javadir}/%{short_name}.jar
 
 %files javadoc
 %{_javadocdir}/%{name}