Skip to content

Commit 858d779

Browse files
SherpardSherpard
committed
feat: Update version for new release
fix: Spotbugs detected issues
1 parent e4c2ac5 commit 858d779

File tree

5 files changed

+113
-108
lines changed

5 files changed

+113
-108
lines changed

‎core/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<parent>
1616
<groupId>org.seedstack.addons.mongodb</groupId>
1717
<artifactId>mongodb</artifactId>
18-
<version>4.0.0-SNAPSHOT</version>
18+
<version>5.0.0-SNAPSHOT</version>
1919
</parent>
2020

2121
<artifactId>mongodb-core</artifactId>

‎morphia/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<parent>
1515
<groupId>org.seedstack.addons.mongodb</groupId>
1616
<artifactId>mongodb</artifactId>
17-
<version>4.0.0-SNAPSHOT</version>
17+
<version>5.0.0-SNAPSHOT</version>
1818
</parent>
1919

2020
<artifactId>mongodb-morphia</artifactId>

‎morphia/src/main/java/org/seedstack/mongodb/morphia/internal/DatastoreWrapper.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,11 @@
99

1010
import dev.morphia.Datastore;
1111
import dev.morphia.DatastoreImpl;
12+
import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
1213

1314
class DatastoreWrapper extends DatastoreImpl {
1415

16+
@SuppressFBWarnings(value = "MC_OVERRIDABLE_METHOD_CALL_IN_CONSTRUCTOR", justification = "Manually verified that mapper is initialized")
1517
public DatastoreWrapper(Datastore datastore, SeedEntityListener seedListener) {
1618
super((DatastoreImpl) datastore);
1719
// TODO: Find a way to wrap mapper instead of adding an interceptor

‎morphia/src/main/java/org/seedstack/mongodb/morphia/internal/MorphiaPlugin.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -117,10 +117,11 @@ public InitState initialize(InitContext initContext) {
117117
LOGGER.debug("Detected '{}' EntityListener", listener.toGenericString());
118118
this.seedEntityListeners.add((Class<? extends EntityListener<?>>) listener);
119119
}
120+
LOGGER.info("{} EntityListeners loaded", seedListeners.size());
121+
} else {
122+
LOGGER.info("No EntityListeners loaded");
120123
}
121124

122-
LOGGER.info("{} EntityListeners loaded", seedListeners.size());
123-
124125
return InitState.INITIALIZED;
125126
}
126127

‎pom.xml

Lines changed: 106 additions & 104 deletions
Original file line numberDiff line numberDiff line change
@@ -7,120 +7,122 @@
77
file, You can obtain one at http://mozilla.org/MPL/2.0/.
88
99
-->
10-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
11-
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
12-
<modelVersion>4.0.0</modelVersion>
10+
<project xmlns="http://maven.apache.org/POM/4.0.0"
11+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
12+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
13+
<modelVersion>4.0.0</modelVersion>
1314

14-
<parent>
15-
<groupId>org.seedstack.poms</groupId>
16-
<artifactId>parent-internal</artifactId>
17-
<version>4.1.0</version>
18-
</parent>
15+
<parent>
16+
<groupId>org.seedstack.poms</groupId>
17+
<artifactId>parent-internal</artifactId>
18+
<version>4.1.0</version>
19+
</parent>
1920

20-
<groupId>org.seedstack.addons.mongodb</groupId>
21-
<artifactId>mongodb</artifactId>
22-
<version>4.0.0-SNAPSHOT</version>
23-
<packaging>pom</packaging>
21+
<groupId>org.seedstack.addons.mongodb</groupId>
22+
<artifactId>mongodb</artifactId>
23+
<version>5.0.0-SNAPSHOT</version>
24+
<packaging>pom</packaging>
2425

25-
<properties>
26-
<seed.version>3.14.0</seed.version>
27-
<mongodb.version>4.11.1</mongodb.version>
28-
<morphia.version>2.4.13</morphia.version>
29-
<business.version>4.4.0</business.version>
26+
<properties>
27+
<seed.version>3.14.0</seed.version>
28+
<mongodb.version>5.0.1</mongodb.version>
29+
<morphia.version>2.4.13</morphia.version>
30+
<business.version>4.4.0</business.version>
3031

31-
<compatibility.skip>true</compatibility.skip>
32+
<compatibility.skip>true</compatibility.skip>
3233

33-
<bintray.package>mongodb-addon</bintray.package>
34-
</properties>
35-
<modules>
36-
<module>core</module>
37-
<module>morphia</module>
38-
</modules>
39-
<build>
40-
<pluginManagement>
41-
<plugins>
42-
<plugin>
43-
<groupId>org.codehaus.mojo</groupId>
44-
<artifactId>license-maven-plugin</artifactId>
45-
<configuration>
46-
<includedLicenses>
47-
<includedLicense>Apache 2</includedLicense>
48-
<includedLicense>BSD</includedLicense>
49-
<includedLicense>CDDL</includedLicense>
50-
<includedLicense>LGPL 3.0</includedLicense>
51-
<includedLicense>MIT License</includedLicense>
52-
<includedLicense>MPL 2.0</includedLicense>
53-
<includedLicense>Public Domain</includedLicense>
54-
<includedLicense>WTFPL</includedLicense>
34+
<bintray.package>mongodb-addon</bintray.package>
35+
</properties>
36+
<modules>
37+
<module>core</module>
38+
<module>morphia</module>
39+
</modules>
40+
<build>
41+
<pluginManagement>
42+
<plugins>
43+
<plugin>
44+
<groupId>org.codehaus.mojo</groupId>
45+
<artifactId>license-maven-plugin</artifactId>
46+
<configuration>
47+
<includedLicenses>
48+
<includedLicense>Apache 2</includedLicense>
49+
<includedLicense>BSD</includedLicense>
50+
<includedLicense>CDDL</includedLicense>
51+
<includedLicense>LGPL 3.0</includedLicense>
52+
<includedLicense>MIT License</includedLicense>
53+
<includedLicense>MPL 2.0</includedLicense>
54+
<includedLicense>Public Domain</includedLicense>
55+
<includedLicense>WTFPL</includedLicense>
5556

56-
<!-- Some licenses are ignored because they are alternatives to acceptable licenses and the
57+
<!-- Some licenses are ignored because they are alternatives to
58+
acceptable licenses and the
5759
plugin doesn't handle alternate licenses -->
58-
<includedLicense>IGNORED_LICENSE</includedLicense>
59-
</includedLicenses>
60-
<licenseMerges>
61-
<licenseMerge>Apache 2|Apache License, Version 2.0</licenseMerge>
62-
<licenseMerge>Apache 2|The Apache Software License, Version 2.0</licenseMerge>
63-
<licenseMerge>Apache 2|The Apache License, Version 2.0</licenseMerge>
64-
<licenseMerge>Apache 2|ASF 2.0</licenseMerge>
65-
<licenseMerge>Apache 2|Apache License 2.0</licenseMerge>
66-
<licenseMerge>Apache 2|Apache License, version 2.0</licenseMerge>
67-
<licenseMerge>Apache 2|Apache License Version 2.0</licenseMerge>
68-
<licenseMerge>Apache 2|Apache 2.0</licenseMerge>
69-
<licenseMerge>Apache 2|Apache-2.0</licenseMerge>
70-
<licenseMerge>BSD|The New BSD License</licenseMerge>
71-
<licenseMerge>BSD|BSD-3-Clause</licenseMerge>
72-
<licenseMerge>BSD|https://svn.codehaus.org/proxytoys/trunk/LICENSE.txt</licenseMerge>
73-
<licenseMerge>CDDL|CDDL + GPLv2 with classpath exception</licenseMerge>
74-
<licenseMerge>LGPL 3.0|GNU Lesser Public License</licenseMerge>
75-
<licenseMerge>MIT License|The MIT License</licenseMerge>
76-
<licenseMerge>MIT License|The MIT License (MIT)</licenseMerge>
77-
<licenseMerge>MIT License|MIT license</licenseMerge>
78-
<licenseMerge>IGNORED_LICENSE|MPL 1.1</licenseMerge>
79-
<licenseMerge>IGNORED_LICENSE|LGPL 2.1</licenseMerge>
80-
<licenseMerge>IGNORED_LICENSE|GNU LESSER GENERAL PUBLIC LICENSE, Version 2.1</licenseMerge>
81-
</licenseMerges>
82-
</configuration>
83-
</plugin>
84-
</plugins>
85-
</pluginManagement>
86-
</build>
60+
<includedLicense>IGNORED_LICENSE</includedLicense>
61+
</includedLicenses>
62+
<licenseMerges>
63+
<licenseMerge>Apache 2|Apache License, Version 2.0</licenseMerge>
64+
<licenseMerge>Apache 2|The Apache Software License, Version 2.0</licenseMerge>
65+
<licenseMerge>Apache 2|The Apache License, Version 2.0</licenseMerge>
66+
<licenseMerge>Apache 2|ASF 2.0</licenseMerge>
67+
<licenseMerge>Apache 2|Apache License 2.0</licenseMerge>
68+
<licenseMerge>Apache 2|Apache License, version 2.0</licenseMerge>
69+
<licenseMerge>Apache 2|Apache License Version 2.0</licenseMerge>
70+
<licenseMerge>Apache 2|Apache 2.0</licenseMerge>
71+
<licenseMerge>Apache 2|Apache-2.0</licenseMerge>
72+
<licenseMerge>BSD|The New BSD License</licenseMerge>
73+
<licenseMerge>BSD|BSD-3-Clause</licenseMerge>
74+
<licenseMerge>BSD|https://svn.codehaus.org/proxytoys/trunk/LICENSE.txt</licenseMerge>
75+
<licenseMerge>CDDL|CDDL + GPLv2 with classpath exception</licenseMerge>
76+
<licenseMerge>LGPL 3.0|GNU Lesser Public License</licenseMerge>
77+
<licenseMerge>MIT License|The MIT License</licenseMerge>
78+
<licenseMerge>MIT License|The MIT License (MIT)</licenseMerge>
79+
<licenseMerge>MIT License|MIT license</licenseMerge>
80+
<licenseMerge>IGNORED_LICENSE|MPL 1.1</licenseMerge>
81+
<licenseMerge>IGNORED_LICENSE|LGPL 2.1</licenseMerge>
82+
<licenseMerge>IGNORED_LICENSE|GNU LESSER GENERAL PUBLIC LICENSE, Version 2.1</licenseMerge>
83+
</licenseMerges>
84+
</configuration>
85+
</plugin>
86+
</plugins>
87+
</pluginManagement>
88+
</build>
8789

8890

89-
<dependencyManagement>
90-
<dependencies>
91-
<dependency>
92-
<groupId>org.jboss.logging</groupId>
93-
<artifactId>jboss-logging</artifactId>
94-
<version>3.5.3.Final</version>
95-
</dependency>
96-
</dependencies>
97-
</dependencyManagement>
91+
<dependencyManagement>
92+
<dependencies>
93+
<dependency>
94+
<groupId>org.jboss.logging</groupId>
95+
<artifactId>jboss-logging</artifactId>
96+
<version>3.5.3.Final</version>
97+
</dependency>
98+
</dependencies>
99+
</dependencyManagement>
98100

99-
<dependencies>
100-
<dependency>
101-
<groupId>org.seedstack.seed</groupId>
102-
<artifactId>seed-core</artifactId>
103-
<version>${seed.version}</version>
104-
</dependency>
105-
</dependencies>
101+
<dependencies>
102+
<dependency>
103+
<groupId>org.seedstack.seed</groupId>
104+
<artifactId>seed-core</artifactId>
105+
<version>${seed.version}</version>
106+
</dependency>
107+
</dependencies>
106108

107-
<scm>
108-
<url>https://github.com/seedstack/mongodb-addon</url>
109-
<connection>scm:git:git://github.com/seedstack/mongodb-addon.git</connection>
110-
<developerConnection>scm:git:[email protected]:seedstack/mongodb-addon.git</developerConnection>
111-
<tag>HEAD</tag>
112-
</scm>
109+
<scm>
110+
<url>https://github.com/seedstack/mongodb-addon</url>
111+
<connection>scm:git:git://github.com/seedstack/mongodb-addon.git</connection>
112+
<developerConnection>scm:git:[email protected]:seedstack/mongodb-addon.git</developerConnection>
113+
<tag>HEAD</tag>
114+
</scm>
113115

114-
<repositories>
115-
<repository>
116-
<id>oss.sonatype.org-snapshot</id>
117-
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
118-
<releases>
119-
<enabled>false</enabled>
120-
</releases>
121-
<snapshots>
122-
<enabled>true</enabled>
123-
</snapshots>
124-
</repository>
125-
</repositories>
116+
<repositories>
117+
<repository>
118+
<id>oss.sonatype.org-snapshot</id>
119+
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
120+
<releases>
121+
<enabled>false</enabled>
122+
</releases>
123+
<snapshots>
124+
<enabled>true</enabled>
125+
</snapshots>
126+
</repository>
127+
</repositories>
126128
</project>

0 commit comments

Comments
 (0)