From a8572d22b370b8a723c4e23718c1c6d565500824 Mon Sep 17 00:00:00 2001
From: Andy Grimm <agrimm@gmail.com>
Date: Jul 31 2012 21:45:17 +0000
Subject: Replace POMs with newer upstream versions using

org.apache.axis groupId

---

diff --git a/axis-1.4.pom b/axis-1.4.pom
index 430d843..2b9640f 100644
--- a/axis-1.4.pom
+++ b/axis-1.4.pom
@@ -1,56 +1,10 @@
-<?xml version="1.0"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-   <modelVersion>4.0.0</modelVersion>
-   <groupId>axis</groupId>
-   <artifactId>axis</artifactId>
-   <version>1.4</version>
-   <packaging>jar</packaging>
-   <name>Axis Web Services</name>
-   <description>
-      An implementation of the SOAP ("Simple Object Access Protocol") submission to W3C.
-   </description>
-   <url>http://ws.apache.org/axis</url>
-   <licenses>
-      <license>
-         <name>The Apache Software License, Version 2.0</name>
-         <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-         <distribution>repo</distribution>
-      </license>
-   </licenses>
-   <scm>
-      <url>http://svn.apache.org/viewcvs/webservices/axis/trunk/java/</url>
-   </scm>
-   <dependencies>
-      <dependency><!-- depends on nothing; I think -->
-         <groupId>axis</groupId>
-         <artifactId>axis-jaxrpc</artifactId>
-         <version>1.4</version>
-      </dependency>
-      <dependency><!-- depends on nothing; I think -->
-         <groupId>axis</groupId>
-         <artifactId>axis-saaj</artifactId>
-         <version>1.4</version>
-      </dependency>
-      <dependency><!-- depends on nothing; I think -->
-         <groupId>axis</groupId>
-         <artifactId>axis-wsdl4j</artifactId>
-         <version>1.5.1</version><!-- version independent of axis -->
-         <scope>runtime</scope>
-         <!-- note: also at wsdl4j:wsdl4j (a sf.net project) -->
-      </dependency>
-      <dependency>
-         <groupId>commons-logging</groupId>
-         <artifactId>commons-logging</artifactId>
-         <version>1.0.4</version>
-         <scope>runtime</scope>
-      </dependency>
-      <dependency>
-         <groupId>commons-discovery</groupId>
-         <artifactId>commons-discovery</artifactId>
-         <version>0.2</version>
-         <scope>runtime</scope>
-      </dependency>
-      <!-- supposedly also depends on log4j 1.2.8 but that is unlikely given commons-logging -->
-   </dependencies>
+<?xml version="1.0" encoding="UTF-8"?><project>
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>org.apache.axis</groupId>
+  <artifactId>axis</artifactId>
+  <version>1.4</version>
+  <description>POM was created from deploy:deploy-file</description>
+  <distributionManagement>
+    <status>deployed</status>
+  </distributionManagement>
 </project>
\ No newline at end of file
diff --git a/axis-ant-1.4.pom b/axis-ant-1.4.pom
index 2c12f06..c955448 100644
--- a/axis-ant-1.4.pom
+++ b/axis-ant-1.4.pom
@@ -1,13 +1,10 @@
-<project>
+<?xml version="1.0" encoding="UTF-8"?><project>
   <modelVersion>4.0.0</modelVersion>
-  <groupId>axis</groupId>
+  <groupId>org.apache.axis</groupId>
   <artifactId>axis-ant</artifactId>
   <version>1.4</version>
-
+  <description>POM was created from deploy:deploy-file</description>
   <distributionManagement>
-    <relocation>
-      <groupId>org.apache.axis</groupId>
-    </relocation>
+    <status>deployed</status>
   </distributionManagement>
-
 </project>
\ No newline at end of file
diff --git a/axis-jaxrpc-1.4.pom b/axis-jaxrpc-1.4.pom
index a1a8f5d..ce00616 100644
--- a/axis-jaxrpc-1.4.pom
+++ b/axis-jaxrpc-1.4.pom
@@ -1,13 +1,10 @@
-<project>
+<?xml version="1.0" encoding="UTF-8"?><project>
   <modelVersion>4.0.0</modelVersion>
-  <groupId>axis</groupId>
+  <groupId>org.apache.axis</groupId>
   <artifactId>axis-jaxrpc</artifactId>
   <version>1.4</version>
-
+  <description>POM was created from deploy:deploy-file</description>
   <distributionManagement>
-    <relocation>
-      <groupId>org.apache.axis</groupId>
-    </relocation>
+    <status>deployed</status>
   </distributionManagement>
-
 </project>
\ No newline at end of file
diff --git a/axis-saaj-1.4.pom b/axis-saaj-1.4.pom
index 976254c..97f4fbd 100644
--- a/axis-saaj-1.4.pom
+++ b/axis-saaj-1.4.pom
@@ -1,13 +1,10 @@
-<project>
+<?xml version="1.0" encoding="UTF-8"?><project>
   <modelVersion>4.0.0</modelVersion>
-  <groupId>axis</groupId>
+  <groupId>org.apache.axis</groupId>
   <artifactId>axis-saaj</artifactId>
   <version>1.4</version>
-
+  <description>POM was created from deploy:deploy-file</description>
   <distributionManagement>
-    <relocation>
-      <groupId>org.apache.axis</groupId>
-    </relocation>
+    <status>deployed</status>
   </distributionManagement>
-
 </project>
\ No newline at end of file
diff --git a/axis-schema-1.4.pom b/axis-schema-1.4.pom
index 32f81c5..6f3a56f 100644
--- a/axis-schema-1.4.pom
+++ b/axis-schema-1.4.pom
@@ -1,6 +1,6 @@
 <project>
   <modelVersion>4.0.0</modelVersion>
-  <groupId>axis</groupId>
+  <groupId>org.apache.axis</groupId>
   <artifactId>axis-schema</artifactId>
   <version>1.4</version>
 </project>
diff --git a/axis.spec b/axis.spec
index 08ecbd8..a160896 100644
--- a/axis.spec
+++ b/axis.spec
@@ -1,6 +1,6 @@
 Name:          axis
 Version:       1.4
-Release:       17%{?dist}
+Release:       18%{?dist}
 Epoch:         0
 Summary:       SOAP implementation in Java
 License:       ASL 2.0
@@ -18,10 +18,11 @@ Source2: axis-MANIFEST.MF
 # cvs -d :pserver:anonymous@dev.eclipse.org:/cvsroot/tools export -r v1_3_0 org.eclipse.orbit/javax.xml.soap/META-INF/MANIFEST.MF
 # mv org.eclipse.orbit/javax.xml.soap/META-INF/MANIFEST.MF saaj-MANIFEST.MF
 Source3: saaj-MANIFEST.MF
-Source4: http://repo1.maven.org/maven2/axis/axis/1.4/axis-1.4.pom
-Source5: http://repo1.maven.org/maven2/axis/axis-ant/1.4/axis-ant-1.4.pom
-Source6: http://repo1.maven.org/maven2/axis/axis-jaxrpc/1.4/axis-jaxrpc-1.4.pom
-Source7: http://repo1.maven.org/maven2/axis/axis-saaj/1.4/axis-saaj-1.4.pom
+Source4: http://repo1.maven.org/maven2/org/apache/axis/axis/1.4/axis-1.4.pom
+Source5: http://repo1.maven.org/maven2/org/apache/axis/axis-ant/1.4/axis-ant-1.4.pom
+Source6: http://repo1.maven.org/maven2/org/apache/axis/axis-jaxrpc/1.4/axis-jaxrpc-1.4.pom
+Source7: http://repo1.maven.org/maven2/org/apache/axis/axis-saaj/1.4/axis-saaj-1.4.pom
+# This POM is not present upstream, so a placeholder was created
 Source8: axis-schema-1.4.pom
 Source9: axis-ant-MANIFEST.MF
 Patch0:        %{name}-java16.patch
@@ -116,7 +117,7 @@ for f in $(find . -name "*.class"); do mv $f $f.no; done
 
 cp %{SOURCE1} %{SOURCE2} %{SOURCE3} %{SOURCE4} .
 
-%patch2 -b .orig
+# %patch2 -b .orig
 
 %build
 pushd lib
@@ -194,15 +195,15 @@ install -m 644 build/axis.war \
 # POMs
 install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir}
 install -m 644 axis-1.4.pom $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.%{name}-axis.pom
-%add_maven_depmap JPP.%{name}-axis.pom %{name}/axis.jar
+%add_maven_depmap JPP.%{name}-axis.pom %{name}/axis.jar -a "axis:axis"
 install -m 644 %{S:5} $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.%{name}-axis-ant.pom
-%add_maven_depmap JPP.%{name}-axis-ant.pom %{name}/axis-ant.jar
+%add_maven_depmap JPP.%{name}-axis-ant.pom %{name}/axis-ant.jar -a "axis:axis-ant"
 install -m 644 %{S:6} $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.%{name}-jaxrpc.pom
-%add_maven_depmap JPP.%{name}-jaxrpc.pom %{name}/jaxrpc.jar
+%add_maven_depmap JPP.%{name}-jaxrpc.pom %{name}/jaxrpc.jar -a "axis:axis-jaxrpc"
 install -m 644 %{S:7} $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.%{name}-saaj.pom
-%add_maven_depmap JPP.%{name}-saaj.pom %{name}/saaj.jar
+%add_maven_depmap JPP.%{name}-saaj.pom %{name}/saaj.jar -a "axis:axis-saaj"
 install -m 644 %{S:8} $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.%{name}-axis-schema.pom
-%add_maven_depmap JPP.%{name}-axis-schema.pom %{name}/axis-schema.jar
+%add_maven_depmap JPP.%{name}-axis-schema.pom %{name}/axis-schema.jar -a "axis:axis-schema"
 
 %files
 %doc LICENSE README release-notes.html changelog.html
@@ -219,6 +220,9 @@ install -m 644 %{S:8} $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.%{name}-axis-schema.pom
 %doc docs/*
 
 %changelog
+* Tue Jul 31 2012 Andy Grimm <agrimm@gmail.com> - 0:1.4-18
+- replace POMs with newer upstream versions using org.apache.axis gid
+
 * Wed Jul 18 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0:1.4-17
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild