[mongo-java-driver] 01/02: Revert "Install POMs" - No longer required for g-d-h>=1.4
Christopher Stuart Hoskin
mans0954 at moszumanska.debian.org
Sat Aug 12 18:47:34 UTC 2017
This is an automated email from the git hooks/post-receive script.
mans0954 pushed a commit to branch master
in repository mongo-java-driver.
commit f435b8eae10a1b6891b692806b8c13d90a198dec
Author: Christopher Hoskin <christopher.hoskin at gmail.com>
Date: Sat Aug 12 10:27:45 2017 +0100
Revert "Install POMs" - No longer required for g-d-h>=1.4
This reverts commit d6157b3802e0de2b13f23d4cc47f2c44702eccbe.
---
debian/changelog | 1 -
debian/control | 1 -
debian/libmongodb-java.poms | 6 +--
debian/poms/bson-3.3.0.pom | 38 -----------------
debian/poms/mongodb-driver-3.3.0.pom | 50 ----------------------
debian/poms/mongodb-driver-async-3.3.0.pom | 50 ----------------------
debian/poms/mongodb-driver-core-3.3.0.pom | 66 ------------------------------
debian/rules | 15 +------
8 files changed, 3 insertions(+), 224 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 4663ba1..4b7372c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,7 +13,6 @@ mongo-java-driver (3.3.0-1) UNRELEASED; urgency=medium
* Add DEP-3 headers to test.patch
* Add myself to uploaders, use secure VCS, bump standards version to
3.9.8 (no change required)
- * Install POMs
-- Christopher Hoskin <christopher.hoskin at gmail.com> Fri, 19 Aug 2016 13:50:19 +0100
diff --git a/debian/control b/debian/control
index 3cee902..6543ae7 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,6 @@ Priority: optional
Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
Uploaders: Emmanuel Bourg <ebourg at apache.org>, Christopher Hoskin <christopher.hoskin at gmail.com>
Build-Depends: debhelper (>= 9), default-jdk, gradle-debian-helper, javahelper, libnetty-java,
- maven-repo-helper,
# Required for tests
libcodenarc-groovy-java, libspock-java, iproute2, mongodb-server
Standards-Version: 3.9.8
diff --git a/debian/libmongodb-java.poms b/debian/libmongodb-java.poms
index f993501..0417132 100644
--- a/debian/libmongodb-java.poms
+++ b/debian/libmongodb-java.poms
@@ -25,8 +25,4 @@
# --site-xml=<location>: Optional, the location for site.xml if it needs to be installed.
# Empty by default. [mh_install]
#
-#pom.xml --has-package-version
-debian/poms/bson-3.3.0.pom --has-package-version --usj-name=bson
-debian/poms/mongodb-driver-3.3.0.pom --has-package-version --usj-name=mongodb-driver
-debian/poms/mongodb-driver-async-3.3.0.pom --has-package-version --usj-name=mongodb-driver-async
-debian/poms/mongodb-driver-core-3.3.0.pom --has-package-version --usj-name=mongodb-driver-core
+pom.xml --has-package-version
diff --git a/debian/poms/bson-3.3.0.pom b/debian/poms/bson-3.3.0.pom
deleted file mode 100644
index 2a6e725..0000000
--- a/debian/poms/bson-3.3.0.pom
+++ /dev/null
@@ -1,38 +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.mongodb</groupId>
- <artifactId>bson</artifactId>
- <version>3.3.0</version>
- <name>BSON</name>
- <description>The BSON library</description>
- <url>http://bsonspec.org</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>
- <developers>
- <developer>
- <name>Various</name>
- <organization>MongoDB</organization>
- </developer>
- </developers>
- <scm>
- <connection>scm:https://github.com/mongodb/mongo-java-driver.git</connection>
- <developerConnection>scm:git at github.com:mongodb/mongo-java-driver.git</developerConnection>
- <url>https://github.com/mongodb/mongo-java-driver</url>
- </scm>
- <dependencies>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- <version>1.7.6</version>
- <scope>compile</scope>
- <optional>true</optional>
- </dependency>
- </dependencies>
-</project>
diff --git a/debian/poms/mongodb-driver-3.3.0.pom b/debian/poms/mongodb-driver-3.3.0.pom
deleted file mode 100644
index 9f8783f..0000000
--- a/debian/poms/mongodb-driver-3.3.0.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.mongodb</groupId>
- <artifactId>mongodb-driver</artifactId>
- <version>3.3.0</version>
- <name>MongoDB Driver</name>
- <description>The MongoDB Driver</description>
- <url>http://www.mongodb.org</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>
- <developers>
- <developer>
- <name>Various</name>
- <organization>MongoDB</organization>
- </developer>
- </developers>
- <scm>
- <connection>scm:https://github.com/mongodb/mongo-java-driver.git</connection>
- <developerConnection>scm:git at github.com:mongodb/mongo-java-driver.git</developerConnection>
- <url>https://github.com/mongodb/mongo-java-driver</url>
- </scm>
- <dependencies>
- <dependency>
- <groupId>org.mongodb</groupId>
- <artifactId>bson</artifactId>
- <version>3.3.0</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.mongodb</groupId>
- <artifactId>mongodb-driver-core</artifactId>
- <version>3.3.0</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- <version>1.7.6</version>
- <scope>compile</scope>
- <optional>true</optional>
- </dependency>
- </dependencies>
-</project>
diff --git a/debian/poms/mongodb-driver-async-3.3.0.pom b/debian/poms/mongodb-driver-async-3.3.0.pom
deleted file mode 100644
index c7f50ca..0000000
--- a/debian/poms/mongodb-driver-async-3.3.0.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.mongodb</groupId>
- <artifactId>mongodb-driver-async</artifactId>
- <version>3.3.0</version>
- <name>MongoDB Asynchronous Driver</name>
- <description>The MongoDB Asynchronous Driver</description>
- <url>http://www.mongodb.org</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>
- <developers>
- <developer>
- <name>Various</name>
- <organization>MongoDB</organization>
- </developer>
- </developers>
- <scm>
- <connection>scm:https://github.com/mongodb/mongo-java-driver.git</connection>
- <developerConnection>scm:git at github.com:mongodb/mongo-java-driver.git</developerConnection>
- <url>https://github.com/mongodb/mongo-java-driver</url>
- </scm>
- <dependencies>
- <dependency>
- <groupId>org.mongodb</groupId>
- <artifactId>bson</artifactId>
- <version>3.3.0</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.mongodb</groupId>
- <artifactId>mongodb-driver-core</artifactId>
- <version>3.3.0</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- <version>1.7.6</version>
- <scope>compile</scope>
- <optional>true</optional>
- </dependency>
- </dependencies>
-</project>
diff --git a/debian/poms/mongodb-driver-core-3.3.0.pom b/debian/poms/mongodb-driver-core-3.3.0.pom
deleted file mode 100644
index 33d9666..0000000
--- a/debian/poms/mongodb-driver-core-3.3.0.pom
+++ /dev/null
@@ -1,66 +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.mongodb</groupId>
- <artifactId>mongodb-driver-core</artifactId>
- <version>3.3.0</version>
- <name>MongoDB Java Driver Core</name>
- <description>The Java operations layer for the MongoDB Java Driver. Third parties can ' +
- 'wrap this layer to provide custom higher-level APIs</description>
- <url>http://www.mongodb.org</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>
- <developers>
- <developer>
- <name>Various</name>
- <organization>MongoDB</organization>
- </developer>
- </developers>
- <scm>
- <connection>scm:https://github.com/mongodb/mongo-java-driver.git</connection>
- <developerConnection>scm:git at github.com:mongodb/mongo-java-driver.git</developerConnection>
- <url>https://github.com/mongodb/mongo-java-driver</url>
- </scm>
- <dependencies>
- <dependency>
- <groupId>io.netty</groupId>
- <artifactId>netty-buffer</artifactId>
- <version>4.0.26.Final</version>
- <scope>compile</scope>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>io.netty</groupId>
- <artifactId>netty-transport</artifactId>
- <version>4.0.26.Final</version>
- <scope>compile</scope>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>org.mongodb</groupId>
- <artifactId>bson</artifactId>
- <version>3.3.0</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>io.netty</groupId>
- <artifactId>netty-handler</artifactId>
- <version>4.0.26.Final</version>
- <scope>compile</scope>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- <version>1.7.6</version>
- <scope>compile</scope>
- <optional>true</optional>
- </dependency>
- </dependencies>
-</project>
diff --git a/debian/rules b/debian/rules
index 879f16e..9117402 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,23 +1,12 @@
#!/usr/bin/make -f
-export DH_VERBOSE=1
-export DH_OPTIONS
-
export JAVA_HOME := /usr/lib/jvm/default-java
%:
- dh $@ --buildsystem=gradle --with javahelper,jh_maven_repo_helper
+ dh $@ --buildsystem=gradle --with javahelper
override_dh_auto_test:
-# debian/runtest.sh
-
-
-# By default jh_maven_repo_helper calls:
-# mh_linkjars --skip-clean-poms -O--buildsystem=gradle
-# However, the --skip-clean-poms option results in only the symlinks for the
-# last jar in the poms file being created.
-override_mh_linkjars:
- mh_linkjars -O--buildsystem=gradle
+ debian/runtest.sh
get-orig-source:
uscan --download-current-version --force-download --rename
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/mongo-java-driver.git
More information about the pkg-java-commits
mailing list