[Pkg-osm-commits] [SCM] osmosis branch, master, updated. debian/0.40.1+ds1-3-6-gb69bad0
David Paleino
dapal at debian.org
Thu Mar 8 07:34:27 UTC 2012
The following commit has been merged in the master branch:
commit 4c2539b8383cfdfc5782eca9b929ce43015f8d75
Author: David Paleino <dapal at debian.org>
Date: Thu Mar 8 08:10:50 2012 +0100
Drop junit4 workaround: now Debian has 4.10
diff --git a/debian/changelog b/debian/changelog
index f994577..5657b58 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,8 +2,9 @@ osmosis (0.40.1+ds1-4) UNRELEASED; urgency=low
* Switch dependency from libpg-java to libpostgresql-jdbc-java
(Closes: #659399)
+ * Drop junit4 workaround: now Debian has 4.10
- -- David Paleino <dapal at debian.org> Fri, 10 Feb 2012 21:19:12 +0100
+ -- David Paleino <dapal at debian.org> Thu, 08 Mar 2012 08:10:34 +0100
osmosis (0.40.1+ds1-3) unstable; urgency=low
diff --git a/debian/control b/debian/control
index a1a6761..706987b 100644
--- a/debian/control
+++ b/debian/control
@@ -28,7 +28,7 @@ Build-Depends:
, libxerces2-java
, checkstyle
, ivy
- , junit4
+ , junit4 (>= 4.10)
, default-jdk
Standards-Version: 3.9.2
Vcs-Git: git://git.debian.org/pkg-osm/osmosis.git
diff --git a/debian/patches/05-workaround_missing_junit4.10.patch b/debian/patches/05-workaround_missing_junit4.10.patch
deleted file mode 100644
index 9d5f16c..0000000
--- a/debian/patches/05-workaround_missing_junit4.10.patch
+++ /dev/null
@@ -1,260 +0,0 @@
-From: David Paleino <dapal at debian.org>
-Subject: Debian doesn't have junit 4.10 yet, so make it useless :)
-Origin: vendor
-Forwarded: not-needed
-
----
- apidb/src/test/java/org/openstreetmap/osmosis/apidb/v0_6/ApiDbTest.java | 2 -
- apidb/src/test/java/org/openstreetmap/osmosis/apidb/v0_6/ApidbFileReplicatorTest.java | 6 +++--
- areafilter/src/test/java/org/openstreetmap/osmosis/areafilter/v0_6/AreaFilterTest.java | 12 +++++-----
- dataset/src/test/java/org/openstreetmap/osmosis/dataset/v0_6/CustomDbTest.java | 4 ++-
- pgsnapshot/src/test/java/org/openstreetmap/osmosis/pgsnapshot/v0_6/PostgreSqlTest.java | 8 +++---
- set/src/test/java/org/openstreetmap/osmosis/set/v0_6/ChangeAppenderTest.java | 2 -
- set/src/test/java/org/openstreetmap/osmosis/set/v0_6/ChangeSimplifierTest.java | 2 -
- tagfilter/src/test/java/org/openstreetmap/osmosis/tagfilter/v0_6/TagRemoverTest.java | 4 +--
- testutil/src/main/java/org/openstreetmap/osmosis/testutil/TestDataUtilities.java | 2 -
- xml/src/test/java/org/openstreetmap/osmosis/xml/v0_6/XmlChangeReaderWriterTest.java | 2 -
- xml/src/test/java/org/openstreetmap/osmosis/xml/v0_6/XmlReaderWriterTest.java | 6 +++--
- 11 files changed, 28 insertions(+), 22 deletions(-)
-
-Index: osmosis/testutil/src/main/java/org/openstreetmap/osmosis/testutil/TestDataUtilities.java
-===================================================================
---- osmosis.orig/testutil/src/main/java/org/openstreetmap/osmosis/testutil/TestDataUtilities.java 2012-01-11 16:33:29.000000000 +0100
-+++ osmosis/testutil/src/main/java/org/openstreetmap/osmosis/testutil/TestDataUtilities.java 2012-01-11 16:46:53.000000000 +0100
-@@ -51,7 +51,7 @@
- "/data/template/" + dataFileName), UTF8));
-
- // Create a temporary file and open it.
-- tmpFile = newFile();
-+ tmpFile = File.createTempFile("junit", null);
- dataWriter = new BufferedWriter(new OutputStreamWriter(new FileOutputStream(tmpFile), UTF8));
-
- // Copy all data into the temp file replacing the version string.
-Index: osmosis/xml/src/test/java/org/openstreetmap/osmosis/xml/v0_6/XmlChangeReaderWriterTest.java
-===================================================================
---- osmosis.orig/xml/src/test/java/org/openstreetmap/osmosis/xml/v0_6/XmlChangeReaderWriterTest.java 2012-01-11 16:33:29.000000000 +0100
-+++ osmosis/xml/src/test/java/org/openstreetmap/osmosis/xml/v0_6/XmlChangeReaderWriterTest.java 2012-01-11 16:46:53.000000000 +0100
-@@ -32,7 +32,7 @@
- File outputFile;
-
- inputFile = dataUtils.createDataFile("v0_6/xml-task-tests-v0_6.osc");
-- outputFile = dataUtils.newFile();
-+ outputFile = File.createTempFile("junit", null);
-
- // Create and connect the xml tasks.
- xmlReader = new XmlChangeReader(inputFile, true, CompressionMethod.None);
-Index: osmosis/xml/src/test/java/org/openstreetmap/osmosis/xml/v0_6/XmlReaderWriterTest.java
-===================================================================
---- osmosis.orig/xml/src/test/java/org/openstreetmap/osmosis/xml/v0_6/XmlReaderWriterTest.java 2012-01-11 16:33:29.000000000 +0100
-+++ osmosis/xml/src/test/java/org/openstreetmap/osmosis/xml/v0_6/XmlReaderWriterTest.java 2012-01-11 16:46:53.000000000 +0100
-@@ -30,7 +30,7 @@
-
- // Generate input files.
- inputFile = dataUtils.createDataFile("v0_6/xml-task-tests-v0_6.osm");
-- outputFile = dataUtils.newFile();
-+ outputFile = File.createTempFile("junit", null);
-
- // Run the pipeline.
- Osmosis.run(
-@@ -64,7 +64,9 @@
-
- // Generate input files.
- uncompressedFile = dataUtils.createDataFile("v0_6/xml-task-tests-v0_6.osm");
-- workingFolder = dataUtils.newFolder();
-+ workingFolder = File.createTempFile("junit", "");
-+ workingFolder.delete();
-+ workingFolder.mkdir();
- inputFile = new File(workingFolder, "testin.osm.gz");
- outputFile = new File(workingFolder, "testout.osm.gz");
- dataUtils.compressFile(uncompressedFile, inputFile);
-Index: osmosis/set/src/test/java/org/openstreetmap/osmosis/set/v0_6/ChangeAppenderTest.java
-===================================================================
---- osmosis.orig/set/src/test/java/org/openstreetmap/osmosis/set/v0_6/ChangeAppenderTest.java 2012-01-11 16:33:29.000000000 +0100
-+++ osmosis/set/src/test/java/org/openstreetmap/osmosis/set/v0_6/ChangeAppenderTest.java 2012-01-11 16:46:53.000000000 +0100
-@@ -33,7 +33,7 @@
- sourceFile1 = dataUtils.createDataFile("v0_6/append-change-in1.osc");
- sourceFile2 = dataUtils.createDataFile("v0_6/append-change-in2.osc");
- expectedOutputFile = dataUtils.createDataFile("v0_6/append-change-out.osc");
-- actualOutputFile = dataUtils.newFile();
-+ actualOutputFile = File.createTempFile("junit", null);
-
- // Append the two source files into the destination file.
- Osmosis.run(
-Index: osmosis/set/src/test/java/org/openstreetmap/osmosis/set/v0_6/ChangeSimplifierTest.java
-===================================================================
---- osmosis.orig/set/src/test/java/org/openstreetmap/osmosis/set/v0_6/ChangeSimplifierTest.java 2012-01-11 16:33:29.000000000 +0100
-+++ osmosis/set/src/test/java/org/openstreetmap/osmosis/set/v0_6/ChangeSimplifierTest.java 2012-01-11 16:46:53.000000000 +0100
-@@ -29,7 +29,7 @@
- // Generate files.
- sourceFile = dataUtils.createDataFile("v0_6/simplify-change-in.osc");
- expectedOutputFile = dataUtils.createDataFile("v0_6/simplify-change-out.osc");
-- actualOutputFile = dataUtils.newFile();
-+ actualOutputFile = File.createTempFile("junit", null);
-
- // Append the two source files into the destination file.
- Osmosis.run(
-Index: osmosis/apidb/src/test/java/org/openstreetmap/osmosis/apidb/v0_6/ApiDbTest.java
-===================================================================
---- osmosis.orig/apidb/src/test/java/org/openstreetmap/osmosis/apidb/v0_6/ApiDbTest.java 2012-01-11 16:33:29.000000000 +0100
-+++ osmosis/apidb/src/test/java/org/openstreetmap/osmosis/apidb/v0_6/ApiDbTest.java 2012-01-11 16:46:53.000000000 +0100
-@@ -57,7 +57,7 @@
- // Generate input files.
- authFile = dbUtils.getAuthorizationFile();
- inputFile = dataUtils.createDataFile("v0_6/db-snapshot.osm");
-- outputFile = dataUtils.newFile();
-+ outputFile = File.createTempFile("junit", null);
-
- // Remove all existing data from the database.
- dbUtils.truncateDatabase();
-Index: osmosis/apidb/src/test/java/org/openstreetmap/osmosis/apidb/v0_6/ApidbFileReplicatorTest.java
-===================================================================
---- osmosis.orig/apidb/src/test/java/org/openstreetmap/osmosis/apidb/v0_6/ApidbFileReplicatorTest.java 2012-01-11 16:33:29.000000000 +0100
-+++ osmosis/apidb/src/test/java/org/openstreetmap/osmosis/apidb/v0_6/ApidbFileReplicatorTest.java 2012-01-11 16:46:53.000000000 +0100
-@@ -35,8 +35,10 @@
- authFile = dbUtils.getAuthorizationFile();
- snapshotFile = dataUtils.createDataFile("v0_6/db-snapshot.osm");
- changesetFile = dataUtils.createDataFile("v0_6/db-replicate-changeset.osc");
-- outputFile = dataUtils.newFile();
-- workingDirectory = dataUtils.newFolder();
-+ outputFile = File.createTempFile("junit", null);
-+ workingDirectory = File.createTempFile("junit", "");
-+ workingDirectory.delete();
-+ workingDirectory.mkdir();
-
- // Remove all existing data from the database.
- dbUtils.truncateDatabase();
-Index: osmosis/areafilter/src/test/java/org/openstreetmap/osmosis/areafilter/v0_6/AreaFilterTest.java
-===================================================================
---- osmosis.orig/areafilter/src/test/java/org/openstreetmap/osmosis/areafilter/v0_6/AreaFilterTest.java 2012-01-11 16:33:29.000000000 +0100
-+++ osmosis/areafilter/src/test/java/org/openstreetmap/osmosis/areafilter/v0_6/AreaFilterTest.java 2012-01-11 16:46:53.000000000 +0100
-@@ -29,7 +29,7 @@
- // Generate input files.
- inputFile = dataUtils.createDataFile("v0_6/areafilter-in.osm");
- expectedOutputFile = dataUtils.createDataFile("v0_6/areafilter-out-whole.osm");
-- actualOutputFile = dataUtils.newFile();
-+ actualOutputFile = File.createTempFile("junit", null);
-
- // Load the database with a dataset.
- Osmosis.run(
-@@ -64,7 +64,7 @@
- // Generate input files.
- inputFile = dataUtils.createDataFile("v0_6/areafilter-in.osm");
- expectedOutputFile = dataUtils.createDataFile("v0_6/areafilter-out-standard.osm");
-- actualOutputFile = dataUtils.newFile();
-+ actualOutputFile = File.createTempFile("junit", null);
-
- // Load the database with a dataset.
- Osmosis.run(
-@@ -98,7 +98,7 @@
- // Generate input files.
- inputFile = dataUtils.createDataFile("v0_6/areafilter-in.osm");
- expectedOutputFile = dataUtils.createDataFile("v0_6/areafilter-out-cascadingrelations.osm");
-- actualOutputFile = dataUtils.newFile();
-+ actualOutputFile = File.createTempFile("junit", null);
-
- // Load the database with a dataset.
- Osmosis.run(
-@@ -133,7 +133,7 @@
- // Generate input files.
- inputFile = dataUtils.createDataFile("v0_6/areafilter-in.osm");
- expectedOutputFile = dataUtils.createDataFile("v0_6/areafilter-out-completeways.osm");
-- actualOutputFile = dataUtils.newFile();
-+ actualOutputFile = File.createTempFile("junit", null);
-
- // Load the database with a dataset.
- Osmosis.run(
-@@ -168,7 +168,7 @@
- // Generate input files.
- inputFile = dataUtils.createDataFile("v0_6/areafilter-in.osm");
- expectedOutputFile = dataUtils.createDataFile("v0_6/areafilter-out-completerelations.osm");
-- actualOutputFile = dataUtils.newFile();
-+ actualOutputFile = File.createTempFile("junit", null);
-
- // Load the database with a dataset.
- Osmosis.run(
-@@ -203,7 +203,7 @@
- // Generate input files.
- inputFile = dataUtils.createDataFile("v0_6/areafilter-in.osm");
- expectedOutputFile = dataUtils.createDataFile("v0_6/areafilter-out-clipincompleteentities.osm");
-- actualOutputFile = dataUtils.newFile();
-+ actualOutputFile = File.createTempFile("junit", null);
-
- // Load the database with a dataset.
- Osmosis.run(
-Index: osmosis/dataset/src/test/java/org/openstreetmap/osmosis/dataset/v0_6/CustomDbTest.java
-===================================================================
---- osmosis.orig/dataset/src/test/java/org/openstreetmap/osmosis/dataset/v0_6/CustomDbTest.java 2012-01-11 16:33:29.000000000 +0100
-+++ osmosis/dataset/src/test/java/org/openstreetmap/osmosis/dataset/v0_6/CustomDbTest.java 2012-01-11 16:46:53.000000000 +0100
-@@ -32,7 +32,9 @@
- // Generate input files.
- inputFile = dataUtils.createDataFile("v0_6/customdb-snapshot.osm");
- outputFile = File.createTempFile("test", ".osm");
-- dataDir = dataUtils.newFolder();
-+ dataDir = File.createTempFile("junit", "");
-+ dataDir.delete();
-+ dataDir.mkdir();
-
- // Load the database with a dataset.
- Osmosis.run(
-Index: osmosis/pgsnapshot/src/test/java/org/openstreetmap/osmosis/pgsnapshot/v0_6/PostgreSqlTest.java
-===================================================================
---- osmosis.orig/pgsnapshot/src/test/java/org/openstreetmap/osmosis/pgsnapshot/v0_6/PostgreSqlTest.java 2012-01-11 16:33:29.000000000 +0100
-+++ osmosis/pgsnapshot/src/test/java/org/openstreetmap/osmosis/pgsnapshot/v0_6/PostgreSqlTest.java 2012-01-11 16:46:53.000000000 +0100
-@@ -37,7 +37,7 @@
- // Generate input files.
- authFile = getAuthFile();
- inputFile = dataUtils.createDataFile("v0_6/db-snapshot.osm");
-- outputFile = dataUtils.newFile();
-+ outputFile = File.createTempFile("junit", null);
-
- // Remove all existing data from the database.
- Osmosis.run(
-@@ -97,7 +97,7 @@
- snapshotFile = dataUtils.createDataFile("v0_6/db-snapshot.osm");
- changesetFile = dataUtils.createDataFile("v0_6/db-changeset.osc");
- expectedResultFile = dataUtils.createDataFile("v0_6/db-changeset-expected.osm");
-- actualResultFile = dataUtils.newFile();
-+ actualResultFile = File.createTempFile("junit", null);
-
- // Remove all existing data from the database.
- Osmosis.run(
-@@ -166,7 +166,7 @@
- authFile = getAuthFile();
- snapshotFile = dataUtils.createDataFile("v0_6/db-snapshot.osm");
- expectedResultFile = dataUtils.createDataFile("v0_6/db-dataset-expected.osm");
-- actualResultFile = dataUtils.newFile();
-+ actualResultFile = File.createTempFile("junit", null);
-
- // Remove all existing data from the database.
- Osmosis.run(
-@@ -235,7 +235,7 @@
- // Generate input files.
- authFile = getAuthFile();
- inputFile = dataUtils.createDataFile("v0_6/db-snapshot.osm");
-- outputFile = dataUtils.newFile();
-+ outputFile = File.createTempFile("junit", null);
-
- // Remove all existing data from the database.
- Osmosis.run(
-Index: osmosis/tagfilter/src/test/java/org/openstreetmap/osmosis/tagfilter/v0_6/TagRemoverTest.java
-===================================================================
---- osmosis.orig/tagfilter/src/test/java/org/openstreetmap/osmosis/tagfilter/v0_6/TagRemoverTest.java 2012-01-11 16:33:29.000000000 +0100
-+++ osmosis/tagfilter/src/test/java/org/openstreetmap/osmosis/tagfilter/v0_6/TagRemoverTest.java 2012-01-11 16:46:53.000000000 +0100
-@@ -30,7 +30,7 @@
-
- inputFile = dataUtils.createDataFile("v0_6/tag-remove-snapshot.osm");
- expectedResultFile = dataUtils.createDataFile("v0_6/tag-remove-expected.osm");
-- outputFile = dataUtils.newFile();
-+ outputFile = File.createTempFile("junit", null);
-
- // Remove all created_by tags.
- Osmosis.run(
-@@ -64,7 +64,7 @@
-
- inputFile = dataUtils.createDataFile("v0_6/tag-remove-snapshot.osm");
- expectedResultFile = dataUtils.createDataFile("v0_6/tag-remove-expected.osm");
-- outputFile = dataUtils.newFile();
-+ outputFile = File.createTempFile("junit", null);
-
- // Remove all created_by tags.
- Osmosis.run(
diff --git a/debian/patches/series b/debian/patches/series
index f2c44ba..501461a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,5 +3,4 @@
02-fix_plexus.patch
03-create_manifest.patch
04-fix_dependencies_versions.patch
-05-workaround_missing_junit4.10.patch
06-no-woodstox.patch
--
Osmosis, an OSM data processor
More information about the Pkg-osm-commits
mailing list