gil pushed to smack (master). "update to 4.0.7"
notifications at fedoraproject.org
notifications at fedoraproject.org
Fri Apr 10 15:02:40 UTC 2015
>From 22f85fb1a4224725b5c4811bc10cff6a589e5064 Mon Sep 17 00:00:00 2001
From: gil <puntogil at libero.it>
Date: Fri, 10 Apr 2015 17:02:14 +0200
Subject: update to 4.0.7
diff --git a/.gitignore b/.gitignore
index 81d38d4..695638d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,4 @@
/smack_src_3_2_2.tar.gz
/4.0.6.tar.gz
+/smack-4.0.7-poms.tar.xz
+/4.0.7.tar.gz
diff --git a/smack-bosh-4.0.6.pom b/smack-bosh-4.0.6.pom
deleted file mode 100644
index 9f33fc4..0000000
--- a/smack-bosh-4.0.6.pom
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.igniterealtime.smack</groupId>
- <artifactId>smack-bosh</artifactId>
- <version>4.0.6</version>
- <name>Smack</name>
- <description>Smack BOSH API.
-This API is considered beta quality.</description>
- <url>http://www.igniterealtime.org/projects/smack/</url>
- <inceptionYear>2003</inceptionYear>
- <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>
- <developers>
- <developer>
- <id>flow</id>
- <name>Florian Schmaus</name>
- <email>flow at igniterealtime.org</email>
- </developer>
- </developers>
- <issueManagement>
- <system>JIRA</system>
- <url>https://igniterealtime.org/issues/browse/SMACK</url>
- </issueManagement>
- <scm>
- <connection>scm:git:https://github.com/igniterealtime/Smack.git</connection>
- <developerConnection>scm:git:https://github.com/igniterealtime/Smack.git</developerConnection>
- <url>https://github.com/igniterealtime/Smack</url>
- </scm>
- <distributionManagement>
- <snapshotRepository>
- <id>smack.snapshot</id>
- <url>https://oss.sonatype.org/content/repositories/snapshots</url>
- </snapshotRepository>
- </distributionManagement>
- <dependencies>
- <dependency>
- <groupId>org.igniterealtime.jbosh</groupId>
- <artifactId>jbosh</artifactId>
- <version>0.8.0</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.igniterealtime.smack</groupId>
- <artifactId>smack-core</artifactId>
- <version>4.0.6</version>
- <scope>compile</scope>
- </dependency>
- </dependencies>
-</project>
diff --git a/smack-compression-jzlib-4.0.6.pom b/smack-compression-jzlib-4.0.6.pom
deleted file mode 100644
index 0f5d2d3..0000000
--- a/smack-compression-jzlib-4.0.6.pom
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.igniterealtime.smack</groupId>
- <artifactId>smack-compression-jzlib</artifactId>
- <version>4.0.6</version>
- <name>Smack</name>
- <description>Compression with jzlib
-Allow to compress the XMPP stream with help of jzlib.</description>
- <url>http://www.igniterealtime.org/projects/smack/</url>
- <inceptionYear>2003</inceptionYear>
- <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>
- <developers>
- <developer>
- <id>flow</id>
- <name>Florian Schmaus</name>
- <email>flow at igniterealtime.org</email>
- </developer>
- </developers>
- <issueManagement>
- <system>JIRA</system>
- <url>https://igniterealtime.org/issues/browse/SMACK</url>
- </issueManagement>
- <scm>
- <connection>scm:git:https://github.com/igniterealtime/Smack.git</connection>
- <developerConnection>scm:git:https://github.com/igniterealtime/Smack.git</developerConnection>
- <url>https://github.com/igniterealtime/Smack</url>
- </scm>
- <distributionManagement>
- <snapshotRepository>
- <id>smack.snapshot</id>
- <url>https://oss.sonatype.org/content/repositories/snapshots</url>
- </snapshotRepository>
- </distributionManagement>
- <dependencies>
- <dependency>
- <groupId>com.jcraft</groupId>
- <artifactId>jzlib</artifactId>
- <version>1.1.3</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.igniterealtime.smack</groupId>
- <artifactId>smack-core</artifactId>
- <version>4.0.6</version>
- <scope>compile</scope>
- </dependency>
- </dependencies>
-</project>
diff --git a/smack-core-4.0.6.pom b/smack-core-4.0.6.pom
deleted file mode 100644
index d0922b0..0000000
--- a/smack-core-4.0.6.pom
+++ /dev/null
@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.igniterealtime.smack</groupId>
- <artifactId>smack-core</artifactId>
- <version>4.0.6</version>
- <name>Smack</name>
- <description>Smack core components.</description>
- <url>http://www.igniterealtime.org/projects/smack/</url>
- <inceptionYear>2003</inceptionYear>
- <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>
- <developers>
- <developer>
- <id>flow</id>
- <name>Florian Schmaus</name>
- <email>flow at igniterealtime.org</email>
- </developer>
- </developers>
- <issueManagement>
- <system>JIRA</system>
- <url>https://igniterealtime.org/issues/browse/SMACK</url>
- </issueManagement>
- <scm>
- <connection>scm:git:https://github.com/igniterealtime/Smack.git</connection>
- <developerConnection>scm:git:https://github.com/igniterealtime/Smack.git</developerConnection>
- <url>https://github.com/igniterealtime/Smack</url>
- </scm>
- <distributionManagement>
- <snapshotRepository>
- <id>smack.snapshot</id>
- <url>https://oss.sonatype.org/content/repositories/snapshots</url>
- </snapshotRepository>
- </distributionManagement>
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.+</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>com.jamesmurty.utils</groupId>
- <artifactId>java-xmlbuilder</artifactId>
- <version>0.6+</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>xmlunit</groupId>
- <artifactId>xmlunit</artifactId>
- <version>1.5</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.powermock</groupId>
- <artifactId>powermock-module-junit4</artifactId>
- <version>1.5.+</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.powermock</groupId>
- <artifactId>powermock-api-mockito</artifactId>
- <version>1.5.+</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>xpp3</groupId>
- <artifactId>xpp3</artifactId>
- <version>1.1.4c</version>
- <scope>compile</scope>
- </dependency>
- </dependencies>
-</project>
diff --git a/smack-debug-4.0.6.pom b/smack-debug-4.0.6.pom
deleted file mode 100644
index 20d4d7e..0000000
--- a/smack-debug-4.0.6.pom
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.igniterealtime.smack</groupId>
- <artifactId>smack-debug</artifactId>
- <version>4.0.6</version>
- <name>Smack</name>
- <description>Smack GUI debugger.
-Inspect the exchanged XMPP stanzas.</description>
- <url>http://www.igniterealtime.org/projects/smack/</url>
- <inceptionYear>2003</inceptionYear>
- <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>
- <developers>
- <developer>
- <id>flow</id>
- <name>Florian Schmaus</name>
- <email>flow at igniterealtime.org</email>
- </developer>
- </developers>
- <issueManagement>
- <system>JIRA</system>
- <url>https://igniterealtime.org/issues/browse/SMACK</url>
- </issueManagement>
- <scm>
- <connection>scm:git:https://github.com/igniterealtime/Smack.git</connection>
- <developerConnection>scm:git:https://github.com/igniterealtime/Smack.git</developerConnection>
- <url>https://github.com/igniterealtime/Smack</url>
- </scm>
- <distributionManagement>
- <snapshotRepository>
- <id>smack.snapshot</id>
- <url>https://oss.sonatype.org/content/repositories/snapshots</url>
- </snapshotRepository>
- </distributionManagement>
- <dependencies>
- <dependency>
- <groupId>org.igniterealtime.smack</groupId>
- <artifactId>smack-core</artifactId>
- <version>4.0.6</version>
- <scope>compile</scope>
- </dependency>
- </dependencies>
-</project>
diff --git a/smack-experimental-4.0.6.pom b/smack-experimental-4.0.6.pom
deleted file mode 100644
index 258c49d..0000000
--- a/smack-experimental-4.0.6.pom
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.igniterealtime.smack</groupId>
- <artifactId>smack-experimental</artifactId>
- <version>4.0.6</version>
- <name>Smack</name>
- <description>Smack experimental extensions.
-Classes and methods for XEPs that are in status 'experimental' or that should
-otherwise carefully considered for deployment. The API may change even
-between patch versions.</description>
- <url>http://www.igniterealtime.org/projects/smack/</url>
- <inceptionYear>2003</inceptionYear>
- <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>
- <developers>
- <developer>
- <id>flow</id>
- <name>Florian Schmaus</name>
- <email>flow at igniterealtime.org</email>
- </developer>
- </developers>
- <issueManagement>
- <system>JIRA</system>
- <url>https://igniterealtime.org/issues/browse/SMACK</url>
- </issueManagement>
- <scm>
- <connection>scm:git:https://github.com/igniterealtime/Smack.git</connection>
- <developerConnection>scm:git:https://github.com/igniterealtime/Smack.git</developerConnection>
- <url>https://github.com/igniterealtime/Smack</url>
- </scm>
- <distributionManagement>
- <snapshotRepository>
- <id>smack.snapshot</id>
- <url>https://oss.sonatype.org/content/repositories/snapshots</url>
- </snapshotRepository>
- </distributionManagement>
- <dependencies>
- <dependency>
- <groupId>org.igniterealtime.smack</groupId>
- <artifactId>smack-extensions</artifactId>
- <version>4.0.6</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.igniterealtime.smack</groupId>
- <artifactId>smack-core</artifactId>
- <version>4.0.6</version>
- <scope>compile</scope>
- </dependency>
- </dependencies>
-</project>
diff --git a/smack-extensions-4.0.6.pom b/smack-extensions-4.0.6.pom
deleted file mode 100644
index 88831fb..0000000
--- a/smack-extensions-4.0.6.pom
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.igniterealtime.smack</groupId>
- <artifactId>smack-extensions</artifactId>
- <version>4.0.6</version>
- <name>Smack</name>
- <description>Smack extensions.
-Classes and methods that implement support for the various XMPP XEPs
-(Multi-User Chat, PubSub, …) and other XMPP extensions.</description>
- <url>http://www.igniterealtime.org/projects/smack/</url>
- <inceptionYear>2003</inceptionYear>
- <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>
- <developers>
- <developer>
- <id>flow</id>
- <name>Florian Schmaus</name>
- <email>flow at igniterealtime.org</email>
- </developer>
- </developers>
- <issueManagement>
- <system>JIRA</system>
- <url>https://igniterealtime.org/issues/browse/SMACK</url>
- </issueManagement>
- <scm>
- <connection>scm:git:https://github.com/igniterealtime/Smack.git</connection>
- <developerConnection>scm:git:https://github.com/igniterealtime/Smack.git</developerConnection>
- <url>https://github.com/igniterealtime/Smack</url>
- </scm>
- <distributionManagement>
- <snapshotRepository>
- <id>smack.snapshot</id>
- <url>https://oss.sonatype.org/content/repositories/snapshots</url>
- </snapshotRepository>
- </distributionManagement>
- <dependencies>
- <dependency>
- <groupId>org.igniterealtime.smack</groupId>
- <artifactId>smack-core</artifactId>
- <version>4.0.6</version>
- <scope>compile</scope>
- </dependency>
- </dependencies>
-</project>
diff --git a/smack-get-poms.sh b/smack-get-poms.sh
new file mode 100644
index 0000000..a740754
--- /dev/null
+++ b/smack-get-poms.sh
@@ -0,0 +1,58 @@
+#!/bin/bash
+
+if [ $# -ne 1 || $# -ne 2]; then
+ echo "Usage: ./create-sources VERSION"
+ exit 1
+fi
+
+VERSION=${1}
+
+
+mkdir -p smack
+rm -Rf smack/*
+cd smack
+for m in bosh \
+ compression-jzlib \
+ core \
+ debug \
+ experimental \
+ extensions \
+ legacy \
+ resolver-dnsjava \
+ resolver-javax \
+ resolver-minidns \
+ tcp; do
+
+ mkdir -p smack-${m}
+ (
+ cd smack-${m}
+ wget -O pom.xml http://repo1.maven.org/maven2/org/igniterealtime/smack/smack-${m}/${VERSION}/smack-${m}-${VERSION}.pom
+ )
+
+done
+
+if [ "$1" = "4.0.7" ]; then
+mkdir -p smack-jingle
+(
+ cd smack-jingle
+ wget -O pom.xml http://repo1.maven.org/maven2/org/igniterealtime/smack/smack-jingle/${VERSION}/smack-jingle-${VERSION}.pom
+)
+
+else
+ for m in android \
+ android-extensions \
+ debug-slf4j \
+ im \
+ java7 \
+ jingle-old \
+ sasl-javax \
+ sasl-provided; do
+ mkdir -p smack-${m}
+ (
+ cd smack-${m}
+ wget -O pom.xml http://repo1.maven.org/maven2/org/igniterealtime/smack/smack-${m}/${VERSION}/smack-${m}-${VERSION}.pom
+ )
+ done
+fi
+
+tar cJf ../smack-${VERSION}-poms.tar.xz *
\ No newline at end of file
diff --git a/smack-legacy-4.0.6.pom b/smack-legacy-4.0.6.pom
deleted file mode 100644
index ceaa037..0000000
--- a/smack-legacy-4.0.6.pom
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.igniterealtime.smack</groupId>
- <artifactId>smack-legacy</artifactId>
- <version>4.0.6</version>
- <name>Smack</name>
- <description>Smack legacy extensions.
-Usually XEPs in the state 'retracted', 'rejected', 'deprecated',
-'obsolete' or in a long standing 'deferred' state.</description>
- <url>http://www.igniterealtime.org/projects/smack/</url>
- <inceptionYear>2003</inceptionYear>
- <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>
- <developers>
- <developer>
- <id>flow</id>
- <name>Florian Schmaus</name>
- <email>flow at igniterealtime.org</email>
- </developer>
- </developers>
- <issueManagement>
- <system>JIRA</system>
- <url>https://igniterealtime.org/issues/browse/SMACK</url>
- </issueManagement>
- <scm>
- <connection>scm:git:https://github.com/igniterealtime/Smack.git</connection>
- <developerConnection>scm:git:https://github.com/igniterealtime/Smack.git</developerConnection>
- <url>https://github.com/igniterealtime/Smack</url>
- </scm>
- <distributionManagement>
- <snapshotRepository>
- <id>smack.snapshot</id>
- <url>https://oss.sonatype.org/content/repositories/snapshots</url>
- </snapshotRepository>
- </distributionManagement>
- <dependencies>
- <dependency>
- <groupId>org.igniterealtime.smack</groupId>
- <artifactId>smack-extensions</artifactId>
- <version>4.0.6</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.igniterealtime.smack</groupId>
- <artifactId>smack-core</artifactId>
- <version>4.0.6</version>
- <scope>compile</scope>
- </dependency>
- </dependencies>
-</project>
diff --git a/smack-resolver-dnsjava-4.0.6.pom b/smack-resolver-dnsjava-4.0.6.pom
deleted file mode 100644
index dfa11ed..0000000
--- a/smack-resolver-dnsjava-4.0.6.pom
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.igniterealtime.smack</groupId>
- <artifactId>smack-resolver-dnsjava</artifactId>
- <version>4.0.6</version>
- <name>Smack</name>
- <description>DNS SRV with dnsjava
-Use dnsjava for DNS SRV lookups. For platforms that don't provide the
-javax.naming API (e.g. Android).</description>
- <url>http://www.igniterealtime.org/projects/smack/</url>
- <inceptionYear>2003</inceptionYear>
- <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>
- <developers>
- <developer>
- <id>flow</id>
- <name>Florian Schmaus</name>
- <email>flow at igniterealtime.org</email>
- </developer>
- </developers>
- <issueManagement>
- <system>JIRA</system>
- <url>https://igniterealtime.org/issues/browse/SMACK</url>
- </issueManagement>
- <scm>
- <connection>scm:git:https://github.com/igniterealtime/Smack.git</connection>
- <developerConnection>scm:git:https://github.com/igniterealtime/Smack.git</developerConnection>
- <url>https://github.com/igniterealtime/Smack</url>
- </scm>
- <distributionManagement>
- <snapshotRepository>
- <id>smack.snapshot</id>
- <url>https://oss.sonatype.org/content/repositories/snapshots</url>
- </snapshotRepository>
- </distributionManagement>
- <dependencies>
- <dependency>
- <groupId>org.igniterealtime.smack</groupId>
- <artifactId>smack-core</artifactId>
- <version>4.0.6</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>dnsjava</groupId>
- <artifactId>dnsjava</artifactId>
- <version>2.1.+</version>
- <scope>compile</scope>
- </dependency>
- </dependencies>
-</project>
diff --git a/smack-resolver-javax-4.0.6.pom b/smack-resolver-javax-4.0.6.pom
deleted file mode 100644
index 4cc7ca8..0000000
--- a/smack-resolver-javax-4.0.6.pom
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.igniterealtime.smack</groupId>
- <artifactId>smack-resolver-javax</artifactId>
- <version>4.0.6</version>
- <name>Smack</name>
- <description>DNS SRV with Java7
-Use javax.naming for DNS SRV lookups. The javax.naming API is availabe in JavaSE
-since Java7.</description>
- <url>http://www.igniterealtime.org/projects/smack/</url>
- <inceptionYear>2003</inceptionYear>
- <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>
- <developers>
- <developer>
- <id>flow</id>
- <name>Florian Schmaus</name>
- <email>flow at igniterealtime.org</email>
- </developer>
- </developers>
- <issueManagement>
- <system>JIRA</system>
- <url>https://igniterealtime.org/issues/browse/SMACK</url>
- </issueManagement>
- <scm>
- <connection>scm:git:https://github.com/igniterealtime/Smack.git</connection>
- <developerConnection>scm:git:https://github.com/igniterealtime/Smack.git</developerConnection>
- <url>https://github.com/igniterealtime/Smack</url>
- </scm>
- <distributionManagement>
- <snapshotRepository>
- <id>smack.snapshot</id>
- <url>https://oss.sonatype.org/content/repositories/snapshots</url>
- </snapshotRepository>
- </distributionManagement>
- <dependencies>
- <dependency>
- <groupId>org.igniterealtime.smack</groupId>
- <artifactId>smack-core</artifactId>
- <version>4.0.6</version>
- <scope>compile</scope>
- </dependency>
- </dependencies>
-</project>
diff --git a/smack-resolver-minidns-4.0.6.pom b/smack-resolver-minidns-4.0.6.pom
deleted file mode 100644
index 045da64..0000000
--- a/smack-resolver-minidns-4.0.6.pom
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.igniterealtime.smack</groupId>
- <artifactId>smack-resolver-minidns</artifactId>
- <version>4.0.6</version>
- <name>Smack</name>
- <description>DNS SRV with minidns
-Use minidns for DNS SRV lookups. For platforms that don't provide the
-javax.naming API (e.g. Android).</description>
- <url>http://www.igniterealtime.org/projects/smack/</url>
- <inceptionYear>2003</inceptionYear>
- <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>
- <developers>
- <developer>
- <id>flow</id>
- <name>Florian Schmaus</name>
- <email>flow at igniterealtime.org</email>
- </developer>
- </developers>
- <issueManagement>
- <system>JIRA</system>
- <url>https://igniterealtime.org/issues/browse/SMACK</url>
- </issueManagement>
- <scm>
- <connection>scm:git:https://github.com/igniterealtime/Smack.git</connection>
- <developerConnection>scm:git:https://github.com/igniterealtime/Smack.git</developerConnection>
- <url>https://github.com/igniterealtime/Smack</url>
- </scm>
- <distributionManagement>
- <snapshotRepository>
- <id>smack.snapshot</id>
- <url>https://oss.sonatype.org/content/repositories/snapshots</url>
- </snapshotRepository>
- </distributionManagement>
- <dependencies>
- <dependency>
- <groupId>org.igniterealtime.jxmpp</groupId>
- <artifactId>jxmpp-util-cache</artifactId>
- <version>0.1.0</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.igniterealtime.smack</groupId>
- <artifactId>smack-core</artifactId>
- <version>4.0.6</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>de.measite.minidns</groupId>
- <artifactId>minidns</artifactId>
- <version>0.1.1</version>
- <scope>compile</scope>
- </dependency>
- </dependencies>
-</project>
diff --git a/smack-tcp-4.0.6.pom b/smack-tcp-4.0.6.pom
deleted file mode 100644
index 9072cdd..0000000
--- a/smack-tcp-4.0.6.pom
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.igniterealtime.smack</groupId>
- <artifactId>smack-tcp</artifactId>
- <version>4.0.6</version>
- <name>Smack</name>
- <description>Smack for standard XMPP connections over TCP.</description>
- <url>http://www.igniterealtime.org/projects/smack/</url>
- <inceptionYear>2003</inceptionYear>
- <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>
- <developers>
- <developer>
- <id>flow</id>
- <name>Florian Schmaus</name>
- <email>flow at igniterealtime.org</email>
- </developer>
- </developers>
- <issueManagement>
- <system>JIRA</system>
- <url>https://igniterealtime.org/issues/browse/SMACK</url>
- </issueManagement>
- <scm>
- <connection>scm:git:https://github.com/igniterealtime/Smack.git</connection>
- <developerConnection>scm:git:https://github.com/igniterealtime/Smack.git</developerConnection>
- <url>https://github.com/igniterealtime/Smack</url>
- </scm>
- <distributionManagement>
- <snapshotRepository>
- <id>smack.snapshot</id>
- <url>https://oss.sonatype.org/content/repositories/snapshots</url>
- </snapshotRepository>
- </distributionManagement>
- <dependencies>
- <dependency>
- <groupId>org.igniterealtime.smack</groupId>
- <artifactId>smack-core</artifactId>
- <version>4.0.6</version>
- <scope>compile</scope>
- </dependency>
- </dependencies>
-</project>
diff --git a/smack.spec b/smack.spec
index 3bd4b3c..d0df9d6 100644
--- a/smack.spec
+++ b/smack.spec
@@ -3,29 +3,17 @@
%bcond_with minidns
%endif
Name: smack
-Version: 4.0.6
+Version: 4.0.7
Release: 1%{?dist}
Summary: Open Source XMPP (Jabber) client library
License: ASL 2.0
URL: http://www.igniterealtime.org/projects/smack/index.jsp
Source0: https://github.com/igniterealtime/Smack/archive/%{version}.tar.gz
-Source1: http://repo1.maven.org/maven2/org/igniterealtime/smack/smack-core/%{version}/smack-core-%{version}.pom
-Source2: http://repo1.maven.org/maven2/org/igniterealtime/smack/smack-compression-jzlib/%{version}/smack-compression-jzlib-%{version}.pom
-Source3: http://repo1.maven.org/maven2/org/igniterealtime/smack/smack-debug/%{version}/smack-debug-%{version}.pom
-Source4: http://repo1.maven.org/maven2/org/igniterealtime/smack/smack-experimental/%{version}/smack-experimental-%{version}.pom
-Source5: http://repo1.maven.org/maven2/org/igniterealtime/smack/smack-extensions/%{version}/smack-extensions-%{version}.pom
-Source6: http://repo1.maven.org/maven2/org/igniterealtime/smack/smack-legacy/%{version}/smack-legacy-%{version}.pom
-Source7: http://repo1.maven.org/maven2/org/igniterealtime/smack/smack-resolver-dnsjava/%{version}/smack-resolver-dnsjava-%{version}.pom
-Source8: http://repo1.maven.org/maven2/org/igniterealtime/smack/smack-resolver-javax/%{version}/smack-resolver-javax-%{version}.pom
-Source9: http://repo1.maven.org/maven2/org/igniterealtime/smack/smack-tcp/%{version}/smack-tcp-%{version}.pom
-Source10: http://repo1.maven.org/maven2/org/igniterealtime/smack/smack-bosh/%{version}/smack-bosh-%{version}.pom
-Source11: http://repo1.maven.org/maven2/org/igniterealtime/smack/smack-resolver-minidns/%{version}/smack-resolver-minidns-%{version}.pom
-
-# http://repo1.maven.org/maven2/org/igniterealtime/smack/smack-jingle/4.0.6/smack-jingle-4.0.6.pom
-# smack-jingle use NON free javax.media:jmf:2.1.1e
-
+# sh smack-get-poms.sh < VERSION >
+Source1: smack-%{version}-poms.tar.xz
+Source2: smack-get-poms.sh
# Default use gradle
-Source12: smack-pom.xml
+Source10: smack-pom.xml
BuildRequires: maven-local
BuildRequires: mvn(com.jamesmurty.utils:java-xmlbuilder)
@@ -48,7 +36,6 @@ BuildRequires: mvn(org.igniterealtime.jbosh:jbosh)
%if %{with minidns}
# https://bugzilla.redhat.com/show_bug.cgi?id=1177451
BuildRequires: mvn(de.measite.minidns:minidns)
-# https://bugzilla.redhat.com/show_bug.cgi?id=1177453
BuildRequires: mvn(org.igniterealtime.jxmpp:jxmpp-util-cache)
%endif
@@ -61,6 +48,78 @@ into your applications to create anything from a full XMPP client
to simple XMPP integrations such as sending notification messages and
presence-enabling devices.
+%package bosh
+Summary: Smack BOSH API
+
+%description bosh
+Smack BOSH API.
+
+%package compression-jzlib
+Summary: Smack compression with jzlib
+
+%description compression-jzlib
+Allow to compress the XMPP stream with help of jzlib.
+
+%package debug
+Summary: Smack GUI debugger
+
+%description debug
+Inspect the exchanged XMPP stanzas.
+
+%package experimental
+Summary: Smack experimental extensions
+
+%description experimental
+Classes and methods for XEPs that are in status
+'experimental' or that should otherwise carefully
+considered for deployment. The API may change even
+between patch versions.
+
+%package extensions
+Summary: Smack extensions
+
+%description extensions
+Classes and methods that implement support for the
+various XMPP XEPs (Multi-User Chat, PubSub, …) and
+other XMPP extensions.
+
+%package legacy
+Summary: Smack legacy extensions
+
+%description legacy
+Usually XEPs in the state 'retracted', 'rejected',
+'deprecated', 'obsolete' or in a long standing
+'deferred' state.
+
+%package resolver-dnsjava
+Summary: DNS SRV with dnsjava
+
+%description resolver-dnsjava
+Use dnsjava for DNS SRV lookups. For platforms
+that don't provide the javax.naming API (e.g. Android).
+
+%package resolver-javax
+Summary: DNS SRV with Java7
+
+%description resolver-javax
+Use javax.naming for DNS SRV lookups. The
+javax.naming API is available in JavaSE
+since Java7.
+
+%package resolver-minidns
+Summary: DNS SRV with minidns
+
+%description resolver-minidns
+Use minidns for DNS SRV lookups.
+For platforms that don't provide the
+javax.naming API (e.g. Android).
+
+%package tcp
+Summary: Smack TCP
+
+%description tcp
+Smack for standard XMPP connections over TCP.
+
%package javadoc
Summary: Javadoc for %{name}
@@ -68,7 +127,7 @@ Summary: Javadoc for %{name}
This package contains javadoc for %{name}.
%prep
-%setup -q -n Smack-%{version}
+%setup -q -n Smack-%{version} -a1
# cleanup
find . -name "*.class" -print -delete
find . -name "*.dll" -print -delete
@@ -77,19 +136,7 @@ find . -name "*.jar" -print -delete
# remove prebuilt documentation
rm -rf javadoc/* documentation/*
-cp -p %{SOURCE1} %{name}-core/pom.xml
-cp -p %{SOURCE2} %{name}-compression-jzlib/pom.xml
-cp -p %{SOURCE3} %{name}-debug/pom.xml
-cp -p %{SOURCE4} %{name}-experimental/pom.xml
-cp -p %{SOURCE5} %{name}-extensions/pom.xml
-cp -p %{SOURCE6} %{name}-legacy/pom.xml
-cp -p %{SOURCE7} %{name}-resolver-dnsjava/pom.xml
-cp -p %{SOURCE8} %{name}-resolver-javax/pom.xml
-cp -p %{SOURCE9} %{name}-tcp/pom.xml
-cp -p %{SOURCE10} %{name}-bosh/pom.xml
-cp -p %{SOURCE11} %{name}-resolver-minidns/pom.xml
-
-cp -p %{SOURCE12} pom.xml
+cp -p %{SOURCE10} pom.xml
sed -i "s|@VERSION@|%{version}|" pom.xml
# Disabled for now. Unavailable deps
@@ -145,10 +192,30 @@ sed -i "s|name>Smack|name>Smack ${m}|" %{name}-${m}/pom.xml
done
+# Non standard service component location
+for m in experimental extensions legacy resolver-javax; do
+%pom_xpath_inject "pom:plugin[pom:artifactId = 'maven-bundle-plugin']/pom:configuration/pom:instructions" "
+<Service-Component>org.jivesoftware.smack/%{name}-${m}-components.xml</Service-Component>" %{name}-${m}
+done
+
# Fix test deps
+%pom_xpath_inject "pom:plugin[pom:artifactId = 'maven-jar-plugin']" "
+<executions>
+ <execution>
+ <goals>
+ <goal>test-jar</goal>
+ </goals>
+ </execution>
+</executions>" %{name}-core
+
+for m in debug experimental extensions legacy tcp; do
+%pom_add_dep org.igniterealtime.smack:smack-core:'${project.version}':test %{name}-${m} "<type>test-jar</type>"
+done
+
%pom_add_dep junit:junit::test %{name}-extensions
#%%pom_add_dep org.hamcrest:hamcrest-all::test %%{name}-extensions
%pom_add_dep com.jamesmurty.utils:java-xmlbuilder::test %{name}-extensions
+%pom_add_dep com.jamesmurty.utils:java-xmlbuilder::test %{name}-experimental
%pom_add_dep org.mockito:mockito-core::test %{name}-extensions
%pom_add_dep org.powermock:powermock-reflect::test %{name}-extensions
# org.powermock:powermock-api-mockito
@@ -194,22 +261,42 @@ for s in %{name}-core/src/main/java/org/jivesoftware/smack/util/dns/HostAddress.
native2ascii -encoding UTF8 ${s} ${s}
done
+%mvn_package :%{name}-core::tests: %{name}-core
+%mvn_package :%{name}-parent __noinstall
+
%build
-%mvn_package :%{name}-parent __noinstall
-%mvn_build -- -Dproject.build.sourceEncoding=UTF-8
+%mvn_build -s -- -Dproject.build.sourceEncoding=UTF-8
%install
%mvn_install
-%files -f .mfiles
+%files -f .mfiles-%{name}-core
%dir %{_javadir}/%{name}
%doc README.md resources/releasedocs/README.html resources/releasedocs/changelog.html
+%if %{with bosh}
+%files bosh -f .mfiles-%{name}-bosh
+%endif
+%files compression-jzlib -f .mfiles-%{name}-compression-jzlib
+%files debug -f .mfiles-%{name}-debug
+%files experimental -f .mfiles-%{name}-experimental
+%files extensions -f .mfiles-%{name}-extensions
+%files legacy -f .mfiles-%{name}-legacy
+%files resolver-dnsjava -f .mfiles-%{name}-resolver-dnsjava
+%files resolver-javax -f .mfiles-%{name}-resolver-javax
+%if %{with minidns}
+%files resolver-minidns -f .mfiles-%{name}-resolver-minidns
+%endif
+%files tcp -f .mfiles-%{name}-tcp
+
%files javadoc -f .mfiles-javadoc
%doc resources/releasedocs/README.html resources/releasedocs/changelog.html
%changelog
+* Fri Apr 10 2015 gil cattaneo <puntogil at libero.it> 4.0.7-1
+- update to 4.0.7
+
* Wed Dec 24 2014 gil cattaneo <puntogil at libero.it> 4.0.6-1
- update to 4.0.6
diff --git a/sources b/sources
index dda0246..58101fc 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
-a426619d7a4960d3e8bb7323baece0be 4.0.6.tar.gz
+69ef03a28ce251fc9717eeb241b0b842 smack-4.0.7-poms.tar.xz
+972300e8a53f91dfbccf632ab11f5c51 4.0.7.tar.gz
--
cgit v0.10.2
http://pkgs.fedoraproject.org/cgit/smack.git/commit/?h=master&id=22f85fb1a4224725b5c4811bc10cff6a589e5064
More information about the scm-commits
mailing list