[ws-jaxme] minor changes to update to current packaging guidelines, added maven poms
Hans de Goede
jwrdegoede at fedoraproject.org
Sat Sep 7 07:51:12 UTC 2013
commit fc3a4cc83bea5942ffc616066e39a52d41f33b9d
Author: gil <puntogil at libero.it>
Date: Fri Sep 6 19:08:56 2013 +0200
minor changes to update to current packaging guidelines, added maven poms
jaxme2-0.5.2.pom | 57 +++++++++++++++++++++++++++++++++++++++
jaxme2-rt-0.5.2.pom | 57 +++++++++++++++++++++++++++++++++++++++
jaxmeapi-0.5.2.pom | 40 ++++++++++++++++++++++++++++
jaxmejs-0.5.2.pom | 40 ++++++++++++++++++++++++++++
jaxmepm-0.5.2.pom | 47 ++++++++++++++++++++++++++++++++
jaxmexs-0.5.2.pom | 40 ++++++++++++++++++++++++++++
ws-jaxme.spec | 73 ++++++++++++++++++++++++++-------------------------
7 files changed, 318 insertions(+), 36 deletions(-)
---
diff --git a/jaxme2-0.5.2.pom b/jaxme2-0.5.2.pom
new file mode 100644
index 0000000..0fa0e82
--- /dev/null
+++ b/jaxme2-0.5.2.pom
@@ -0,0 +1,57 @@
+<?xml version="1.0"?><project>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.ws.jaxme</groupId>
+ <artifactId>jaxme2</artifactId>
+ <name>JaxMe 2</name>
+ <version>0.5.2</version>
+ <url>http://ws.apache.org/jaxme</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>
+ <organization>
+ <name>Apache Software Foundation</name>
+ <url>http://www.apache.org/</url>
+ </organization>
+ <repositories>
+ <repository>
+ <id>apache-maven-snapshots</id>
+ <name>Apache Maven Snapshot Repository</name>
+ <url>http://people.apache.org/repo/m2-snapshot-repository/</url>
+ </repository>
+ </repositories>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.ws.jaxme</groupId>
+ <artifactId>jaxmeapi</artifactId>
+ <version>0.5.2</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ws.jaxme</groupId>
+ <artifactId>jaxmexs</artifactId>
+ <version>0.5.2</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ws.jaxme</groupId>
+ <artifactId>jaxmejs</artifactId>
+ <version>0.5.2</version>
+ </dependency>
+ </dependencies>
+ <distributionManagement>
+ <repository>
+ <id>apache-maven</id>
+ <name>Apache Maven Repository</name>
+ <url>scp://people.apache.org/www/people.apache.org/repo/m2-ibiblio-rsync-repository</url>
+ </repository>
+ <snapshotRepository>
+ <uniqueVersion>false</uniqueVersion>
+ <id>apache-maven-snapshots</id>
+ <name>Apache Maven Snapshot Repository</name>
+ <url>scp://people.apache.org/www/people.apache.org/repo/m2-snapshot-repository</url>
+ </snapshotRepository>
+ <status>deployed</status>
+ </distributionManagement>
+</project>
\ No newline at end of file
diff --git a/jaxme2-rt-0.5.2.pom b/jaxme2-rt-0.5.2.pom
new file mode 100644
index 0000000..ed47142
--- /dev/null
+++ b/jaxme2-rt-0.5.2.pom
@@ -0,0 +1,57 @@
+<?xml version="1.0"?><project>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.ws.jaxme</groupId>
+ <artifactId>jaxme2-rt</artifactId>
+ <name>JaxMe 2 Runtime</name>
+ <version>0.5.2</version>
+ <url>http://ws.apache.org/jaxme</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>
+ <organization>
+ <name>Apache Software Foundation</name>
+ <url>http://www.apache.org/</url>
+ </organization>
+ <repositories>
+ <repository>
+ <id>apache-maven-snapshots</id>
+ <name>Apache Maven Snapshot Repository</name>
+ <url>http://people.apache.org/repo/m2-snapshot-repository/</url>
+ </repository>
+ </repositories>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.ws.jaxme</groupId>
+ <artifactId>jaxmeapi</artifactId>
+ <version>0.5.2</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ws.jaxme</groupId>
+ <artifactId>jaxmexs</artifactId>
+ <version>0.5.2</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ws.jaxme</groupId>
+ <artifactId>jaxmejs</artifactId>
+ <version>0.5.2</version>
+ </dependency>
+ </dependencies>
+ <distributionManagement>
+ <repository>
+ <id>apache-maven</id>
+ <name>Apache Maven Repository</name>
+ <url>scp://people.apache.org/www/people.apache.org/repo/m2-ibiblio-rsync-repository</url>
+ </repository>
+ <snapshotRepository>
+ <uniqueVersion>false</uniqueVersion>
+ <id>apache-maven-snapshots</id>
+ <name>Apache Maven Snapshot Repository</name>
+ <url>scp://people.apache.org/www/people.apache.org/repo/m2-snapshot-repository</url>
+ </snapshotRepository>
+ <status>deployed</status>
+ </distributionManagement>
+</project>
\ No newline at end of file
diff --git a/jaxmeapi-0.5.2.pom b/jaxmeapi-0.5.2.pom
new file mode 100644
index 0000000..3afc099
--- /dev/null
+++ b/jaxmeapi-0.5.2.pom
@@ -0,0 +1,40 @@
+<?xml version="1.0"?><project>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.ws.jaxme</groupId>
+ <artifactId>jaxmeapi</artifactId>
+ <name>JaxMe API</name>
+ <version>0.5.2</version>
+ <url>http://ws.apache.org/jaxme</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>
+ <organization>
+ <name>Apache Software Foundation</name>
+ <url>http://www.apache.org/</url>
+ </organization>
+ <repositories>
+ <repository>
+ <id>apache-maven-snapshots</id>
+ <name>Apache Maven Snapshot Repository</name>
+ <url>http://people.apache.org/repo/m2-snapshot-repository/</url>
+ </repository>
+ </repositories>
+ <distributionManagement>
+ <repository>
+ <id>apache-maven</id>
+ <name>Apache Maven Repository</name>
+ <url>scp://people.apache.org/www/people.apache.org/repo/m2-ibiblio-rsync-repository</url>
+ </repository>
+ <snapshotRepository>
+ <uniqueVersion>false</uniqueVersion>
+ <id>apache-maven-snapshots</id>
+ <name>Apache Maven Snapshot Repository</name>
+ <url>scp://people.apache.org/www/people.apache.org/repo/m2-snapshot-repository</url>
+ </snapshotRepository>
+ <status>deployed</status>
+ </distributionManagement>
+</project>
\ No newline at end of file
diff --git a/jaxmejs-0.5.2.pom b/jaxmejs-0.5.2.pom
new file mode 100644
index 0000000..dcdab11
--- /dev/null
+++ b/jaxmejs-0.5.2.pom
@@ -0,0 +1,40 @@
+<?xml version="1.0"?><project>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.ws.jaxme</groupId>
+ <artifactId>jaxmejs</artifactId>
+ <name>JaxMe Java Source framework</name>
+ <version>0.5.2</version>
+ <url>http://ws.apache.org/jaxme</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>
+ <organization>
+ <name>Apache Software Foundation</name>
+ <url>http://www.apache.org/</url>
+ </organization>
+ <repositories>
+ <repository>
+ <id>apache-maven-snapshots</id>
+ <name>Apache Maven Snapshot Repository</name>
+ <url>http://people.apache.org/repo/m2-snapshot-repository/</url>
+ </repository>
+ </repositories>
+ <distributionManagement>
+ <repository>
+ <id>apache-maven</id>
+ <name>Apache Maven Repository</name>
+ <url>scp://people.apache.org/www/people.apache.org/repo/m2-ibiblio-rsync-repository</url>
+ </repository>
+ <snapshotRepository>
+ <uniqueVersion>false</uniqueVersion>
+ <id>apache-maven-snapshots</id>
+ <name>Apache Maven Snapshot Repository</name>
+ <url>scp://people.apache.org/www/people.apache.org/repo/m2-snapshot-repository</url>
+ </snapshotRepository>
+ <status>deployed</status>
+ </distributionManagement>
+</project>
\ No newline at end of file
diff --git a/jaxmepm-0.5.2.pom b/jaxmepm-0.5.2.pom
new file mode 100644
index 0000000..a4bfbd9
--- /dev/null
+++ b/jaxmepm-0.5.2.pom
@@ -0,0 +1,47 @@
+<?xml version="1.0"?><project>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.ws.jaxme</groupId>
+ <artifactId>jaxmepm</artifactId>
+ <name>JaxMe Persistence Management</name>
+ <version>0.5.2</version>
+ <url>http://ws.apache.org/jaxme</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>
+ <organization>
+ <name>Apache Software Foundation</name>
+ <url>http://www.apache.org/</url>
+ </organization>
+ <repositories>
+ <repository>
+ <id>apache-maven-snapshots</id>
+ <name>Apache Maven Snapshot Repository</name>
+ <url>http://people.apache.org/repo/m2-snapshot-repository/</url>
+ </repository>
+ </repositories>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.ws.jaxme</groupId>
+ <artifactId>jaxme2</artifactId>
+ <version>0.5.2</version>
+ </dependency>
+ </dependencies>
+ <distributionManagement>
+ <repository>
+ <id>apache-maven</id>
+ <name>Apache Maven Repository</name>
+ <url>scp://people.apache.org/www/people.apache.org/repo/m2-ibiblio-rsync-repository</url>
+ </repository>
+ <snapshotRepository>
+ <uniqueVersion>false</uniqueVersion>
+ <id>apache-maven-snapshots</id>
+ <name>Apache Maven Snapshot Repository</name>
+ <url>scp://people.apache.org/www/people.apache.org/repo/m2-snapshot-repository</url>
+ </snapshotRepository>
+ <status>deployed</status>
+ </distributionManagement>
+</project>
\ No newline at end of file
diff --git a/jaxmexs-0.5.2.pom b/jaxmexs-0.5.2.pom
new file mode 100644
index 0000000..ded7704
--- /dev/null
+++ b/jaxmexs-0.5.2.pom
@@ -0,0 +1,40 @@
+<?xml version="1.0"?><project>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.ws.jaxme</groupId>
+ <artifactId>jaxmexs</artifactId>
+ <name>JaxMe parser for XML Schema</name>
+ <version>0.5.2</version>
+ <url>http://ws.apache.org/jaxme</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>
+ <organization>
+ <name>Apache Software Foundation</name>
+ <url>http://www.apache.org/</url>
+ </organization>
+ <repositories>
+ <repository>
+ <id>apache-maven-snapshots</id>
+ <name>Apache Maven Snapshot Repository</name>
+ <url>http://people.apache.org/repo/m2-snapshot-repository/</url>
+ </repository>
+ </repositories>
+ <distributionManagement>
+ <repository>
+ <id>apache-maven</id>
+ <name>Apache Maven Repository</name>
+ <url>scp://people.apache.org/www/people.apache.org/repo/m2-ibiblio-rsync-repository</url>
+ </repository>
+ <snapshotRepository>
+ <uniqueVersion>false</uniqueVersion>
+ <id>apache-maven-snapshots</id>
+ <name>Apache Maven Snapshot Repository</name>
+ <url>scp://people.apache.org/www/people.apache.org/repo/m2-snapshot-repository</url>
+ </snapshotRepository>
+ <status>deployed</status>
+ </distributionManagement>
+</project>
\ No newline at end of file
diff --git a/ws-jaxme.spec b/ws-jaxme.spec
index 57bbd44..28e2a41 100644
--- a/ws-jaxme.spec
+++ b/ws-jaxme.spec
@@ -32,17 +32,23 @@
Name: ws-jaxme
Version: 0.5.2
-Release: 9%{?dist}
+Release: 10%{?dist}
Epoch: 0
Summary: Open source implementation of JAXB
-
-Group: Development/Libraries/Java
License: ASL 2.0
-URL: http://ws.apache.org/jaxme/
+URL: http://ws.apache.org/
# svn export http://svn.apache.org/repos/asf/webservices/archive/jaxme/tags/R0_5_2/ ws-jaxme-0.5.2
# tar czf ws-jaxme-0.5.2-src.tar.gz ws-jaxme-0.5.2
Source0: ws-jaxme-0.5.2-src.tar.gz
Source1: ws-jaxme-bind-MANIFEST.MF
+
+Source2: http://repo1.maven.org/maven2/org/apache/ws/jaxme/jaxme2/%{version}/jaxme2-%{version}.pom
+Source3: http://repo1.maven.org/maven2/org/apache/ws/jaxme/jaxme2-rt/%{version}/jaxme2-rt-%{version}.pom
+Source4: http://repo1.maven.org/maven2/org/apache/ws/jaxme/jaxmeapi/%{version}/jaxmeapi-%{version}.pom
+Source5: http://repo1.maven.org/maven2/org/apache/ws/jaxme/jaxmejs/%{version}/jaxmejs-%{version}.pom
+Source6: http://repo1.maven.org/maven2/org/apache/ws/jaxme/jaxmepm/%{version}/jaxmepm-%{version}.pom
+Source7: http://repo1.maven.org/maven2/org/apache/ws/jaxme/jaxmexs/%{version}/jaxmexs-%{version}.pom
+
# generated docs with forrest-0.5.1
Patch0: ws-jaxme-docs_xml.patch
Patch1: ws-jaxme-catalog.patch
@@ -55,7 +61,7 @@ Patch6: ws-jaxme-remove-xmldb.patch
Patch7: ws-jaxme-0.5.2-class-version15.patch
BuildArch: noarch
BuildRequires: jpackage-utils >= 0:1.6
-BuildRequires: java-devel >= 1.6.0
+BuildRequires: java-devel >= 1.6.0
BuildRequires: ant >= 0:1.6
BuildRequires: ant-apache-resolver
BuildRequires: antlr
@@ -65,7 +71,7 @@ BuildRequires: hsqldb
BuildRequires: log4j
BuildRequires: xalan-j2
BuildRequires: xerces-j2
-BuildRequires: docbook-style-xsl
+BuildRequires: docbook-style-xsl
BuildRequires: docbook-dtds
BuildRequires: zip
Requires: antlr
@@ -93,25 +99,19 @@ a set of Java classes:
%package javadoc
Summary: Javadoc for %{name}
-Group: Documentation
-Requires: jpackage-utils
-Requires(postun): jpackage-utils
%description javadoc
%{summary}.
%package manual
Summary: Documents for %{name}
-Group: Documentation
%description manual
%{summary}.
%prep
%setup -q
-for j in $(find . -name "*.jar"); do
- mv $j $j.no
-done
+find . -name "*.jar" -print -delete
%patch0 -p0
%patch1 -p0
@@ -124,6 +124,8 @@ DOCBOOKX_DTD=`%{_bindir}/xmlcatalog %{_datadir}/sgml/docbook/xmlcatalog "-//OASI
%patch6 -p1
%patch7 -p1
+sed -i 's/\r//' NOTICE
+
%build
export CLASSPATH=$(build-classpath antlr hsqldb commons-codec junit log4j xerces-j2 xalan-j2 xalan-j2-serializer)
ant all Docs.all \
@@ -137,21 +139,17 @@ touch META-INF/MANIFEST.MF
zip -u dist/jaxmeapi-%{version}.jar META-INF/MANIFEST.MF
%install
-install -dm 755 $RPM_BUILD_ROOT%{_javadir}/%{base_name}
-for jar in dist/*.jar; do
- install -m 644 ${jar} $RPM_BUILD_ROOT%{_javadir}/%{base_name}/
+
+install -dm 755 $RPM_BUILD_ROOT%{_javadir}/%{base_name} $RPM_BUILD_ROOT%{_mavenpomdir}
+for jar in jaxme2 jaxme2-rt jaxmeapi jaxmejs jaxmepm jaxmexs; do
+ install -m 644 dist/${jar}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{base_name}/${jar}.jar
+ install -pm 644 %{_sourcedir}/${jar}-%{version}.pom $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.%{base_name}-${jar}.pom
+ %add_maven_depmap JPP.%{base_name}-${jar}.pom %{base_name}/${jar}.jar
+ (
+ cd $RPM_BUILD_ROOT%{_javadir}/%{base_name} &&
+ ln -sf ${jar}.jar ws-${jar}.jar
+ )
done
-(cd $RPM_BUILD_ROOT%{_javadir}/%{base_name} &&
- for jar in *-%{version}*;
- do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`;
- done
-)
-
-(cd $RPM_BUILD_ROOT%{_javadir}/%{base_name} &&
- for jar in *.jar;
- do ln -sf ${jar} ws-${jar};
- done
-)
#javadoc
install -dm 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}
@@ -159,14 +157,11 @@ cp -pr build/docs/src/documentation/content/apidocs \
$RPM_BUILD_ROOT%{_javadocdir}/%{name}
rm -rf build/docs/src/documentation/content/apidocs
-#manual
-install -dm 755 $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
-cp -pr build/docs/src/documentation/content/* $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
-install -pm 644 LICENSE $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
-
%files
%doc LICENSE NOTICE
%{_javadir}/%{base_name}
+%{_mavenpomdir}/*
+%{_mavendepmapfragdir}/*
%files javadoc
%doc LICENSE NOTICE
@@ -174,9 +169,15 @@ install -pm 644 LICENSE $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
%files manual
%doc LICENSE NOTICE
-%doc %{_docdir}/%{name}-%{version}
+%doc build/docs/src/documentation/content/manual
%changelog
+* Thu Sep 05 2013 gil cattaneo <puntogil at libero.it> - 0:0.5.2-10
+- minor changes to update to current packaging guidelines
+- added maven poms (rhbz#903694)
+- stop hardcoding docdir (rhbz#993889)
+- fix some rpmlint problems
+
* Sun Aug 04 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0:0.5.2-9
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
@@ -239,7 +240,7 @@ install -pm 644 LICENSE $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
* Mon Feb 12 2007 Deepak Bhole <dbhole at redhat.com> - 0:0.5.1-2jpp.1
- Update as per Fedora guidelines.
-* Wed May 04 2006 Ralph Apel <r.apel at r-apel.de> - 0:0.5.1-1jpp
+* Thu May 04 2006 Ralph Apel <r.apel at r-apel.de> - 0:0.5.1-1jpp
- First JPP-1.7 release
* Tue Dec 20 2005 Ralph Apel <r.apel at r-apel.de> - 0:0.5-1jpp
@@ -249,7 +250,7 @@ install -pm 644 LICENSE $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
- Fix version in changelog
- Upgrade to 0.3.1
-* Fri Aug 30 2004 Ralph Apel <r.apel at r-apel.de> - 0:2.0-0.b1.4jpp
+* Mon Aug 30 2004 Ralph Apel <r.apel at r-apel.de> - 0:2.0-0.b1.4jpp
- Build with ant-1.6.2
* Fri Aug 06 2004 Ralph Apel <r.apel at r-apel.de> - 0:2.0-0.b1.3jpp
@@ -258,5 +259,5 @@ install -pm 644 LICENSE $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
* Tue Jun 01 2004 Randy Watler <rwatler at finali.com> - 0:2.0-0.b1.2jpp
- Upgrade to Ant 1.6.X
-* Fri Mar 04 2004 Ralph Apel <r.apel at r-apel.de> - 0:2.0-0.b1.1jpp
+* Thu Mar 04 2004 Ralph Apel <r.apel at r-apel.de> - 0:2.0-0.b1.1jpp
- First JPackage release
More information about the scm-commits
mailing list