Skip to content

Commit 8d7e9d0

Browse files
Koen SerryKoen Serry
Koen Serry
authored and
Koen Serry
committed
Corrected both poms to point to parent + removed an erroneous import
1 parent 691b59e commit 8d7e9d0

File tree

4 files changed

+109
-63
lines changed

4 files changed

+109
-63
lines changed

‎bson/pom.xml‎

Lines changed: 22 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,25 @@
1-
<project>
1+
<?xml version="1.0"?>
2+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
4+
<modelVersion>4.0.0</modelVersion>
5+
<parent>
6+
<groupId>org.mongodb</groupId>
7+
<artifactId>mongodb-parent</artifactId>
8+
<version>2.4-SNAPSHOT</version>
9+
<relativePath>../pom.xml</relativePath>
10+
</parent>
11+
<groupId>org.bson</groupId>
12+
<artifactId>bson</artifactId>
13+
<name>BSON</name>
14+
<description>BSON Encoding/Decoding Tools</description>
15+
<url>http://bsonspec.org/</url>
216

3-
<modelVersion>4.0.0</modelVersion>
4-
<groupId>org.bson</groupId>
5-
<artifactId>bson</artifactId>
6-
<packaging>jar</packaging>
7-
<name>BSON</name>
8-
<version>$VERSION</version>
9-
<description>BSON Encoding/Decoding Tools</description>
10-
<url>http://bsonspec.org/</url>
11-
12-
<licenses>
13-
<license>
14-
<name>The Apache Software License, Version 2.0</name>
15-
<url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
16-
<distribution>repo</distribution>
17-
</license>
18-
</licenses>
19-
20-
<scm>
21-
<url>http://github.com/mongodb/mongo-java-driver</url>
22-
</scm>
23-
24-
<dependencies>
25-
</dependencies>
17+
<licenses>
18+
<license>
19+
<name>The Apache Software License, Version 2.0</name>
20+
<url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
21+
<distribution>repo</distribution>
22+
</license>
23+
</licenses>
2624

2725
</project>

‎bson/src/main/java/org/bson/BSONDecoder.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
package org.bson;
44

5-
import com.mongodb.BasicDBObject;
65
import static org.bson.BSON.*;
76

87
import java.io.*;

‎bson/src/main/java/org/bson/BSONEncoder.java‎

Lines changed: 42 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,48 @@
22

33
package org.bson;
44

5-
import static org.bson.BSON.*;
6-
7-
import java.lang.reflect.*;
8-
import java.nio.*;
9-
import java.nio.charset.*;
10-
import java.util.*;
5+
import static org.bson.BSON.ARRAY;
6+
import static org.bson.BSON.BINARY;
7+
import static org.bson.BSON.BOOLEAN;
8+
import static org.bson.BSON.B_BINARY;
9+
import static org.bson.BSON.B_UUID;
10+
import static org.bson.BSON.CODE;
11+
import static org.bson.BSON.CODE_W_SCOPE;
12+
import static org.bson.BSON.DATE;
13+
import static org.bson.BSON.EOO;
14+
import static org.bson.BSON.NULL;
15+
import static org.bson.BSON.NUMBER;
16+
import static org.bson.BSON.NUMBER_INT;
17+
import static org.bson.BSON.NUMBER_LONG;
18+
import static org.bson.BSON.OBJECT;
19+
import static org.bson.BSON.OID;
20+
import static org.bson.BSON.REGEX;
21+
import static org.bson.BSON.STRING;
22+
import static org.bson.BSON.SYMBOL;
23+
import static org.bson.BSON.TIMESTAMP;
24+
import static org.bson.BSON.UNDEFINED;
25+
import static org.bson.BSON.regexFlags;
26+
27+
import java.lang.reflect.Array;
28+
import java.nio.Buffer;
29+
import java.util.Date;
30+
import java.util.List;
31+
import java.util.Map;
1132
import java.util.Map.Entry;
12-
import java.util.concurrent.atomic.*;
13-
import java.util.regex.*;
14-
15-
import org.bson.io.*;
16-
import org.bson.types.*;
33+
import java.util.Set;
34+
import java.util.UUID;
35+
import java.util.concurrent.atomic.AtomicInteger;
36+
import java.util.concurrent.atomic.AtomicLong;
37+
import java.util.regex.Pattern;
38+
39+
import org.bson.io.BasicOutputBuffer;
40+
import org.bson.io.OutputBuffer;
41+
import org.bson.types.BSONTimestamp;
42+
import org.bson.types.Binary;
43+
import org.bson.types.Code;
44+
import org.bson.types.CodeWScope;
45+
import org.bson.types.ObjectId;
46+
import org.bson.types.Symbol;
1747

1848
/**
1949
* this is meant to be pooled or cached
@@ -319,7 +349,7 @@ protected void putBinary( String name , byte[] data ){
319349
_buf.write( data );
320350
int after = _buf.getPosition();
321351

322-
com.mongodb.util.MyAsserts.assertEquals( after - before , data.length );
352+
assert(after - before == data.length );
323353
}
324354

325355
protected void putBinary( String name , Binary val ){

‎mongodb/pom.xml‎

Lines changed: 45 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,46 @@
1-
<project>
2-
3-
<modelVersion>4.0.0</modelVersion>
4-
<groupId>org.mongodb</groupId>
5-
<artifactId>mongo-java-driver</artifactId>
6-
<packaging>jar</packaging>
7-
<name>MongoDB Java Driver</name>
8-
<version>$VERSION</version>
9-
<description>Java Driver for MongoDB</description>
10-
<url>http://mongodb.org/</url>
11-
12-
<licenses>
13-
<license>
14-
<name>The Apache Software License, Version 2.0</name>
15-
<url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
16-
<distribution>repo</distribution>
17-
</license>
18-
</licenses>
19-
20-
<scm>
21-
<url>http://github.com/mongodb/mongo-java-driver</url>
22-
</scm>
23-
24-
<dependencies>
25-
</dependencies>
26-
1+
<?xml version="1.0"?>
2+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
4+
<modelVersion>4.0.0</modelVersion>
5+
<parent>
6+
<groupId>org.mongodb</groupId>
7+
<artifactId>mongodb-parent</artifactId>
8+
<version>2.4-SNAPSHOT</version>
9+
<relativePath>../pom.xml</relativePath>
10+
</parent>
11+
<artifactId>mongo-java-driver</artifactId>
12+
<name>MongoDB Java Driver</name>
13+
<description>Java Driver for MongoDB</description>
14+
<build>
15+
<plugins>
16+
<plugin>
17+
<groupId>org.apache.maven.plugins</groupId>
18+
<artifactId>maven-jar-plugin</artifactId>
19+
<version>2.3.1</version>
20+
<configuration>
21+
<archive>
22+
<index>true</index>
23+
<manifest>
24+
<addClasspath>false</addClasspath>
25+
</manifest>
26+
<manifestEntries>
27+
<Bundle-ManifestVersion>2</Bundle-ManifestVersion>
28+
<Bundle-Name>MongoDB</Bundle-Name>
29+
<Bundle-SymbolicName>com.mongodb</Bundle-SymbolicName>
30+
<Bundle-Version>${pom.version}</Bundle-Version>
31+
<Export-Package>com.mongodb, com.mongodb.io, com.mongodb.util,
32+
com.mongodb.gridfs, org.bson, org.bson.util, org.bson.types,
33+
org.bson.io</Export-Package> </manifestEntries>
34+
</archive>
35+
</configuration>
36+
</plugin>
37+
</plugins>
38+
</build>
39+
<dependencies>
40+
<dependency>
41+
<groupId>org.bson</groupId>
42+
<artifactId>bson</artifactId>
43+
<version>2.4-SNAPSHOT</version>
44+
</dependency>
45+
</dependencies>
2746
</project>

0 commit comments

Comments
 (0)