Merge branch 'develop' into feature/jakrtaee10
# Conflicts: # configuration/pom.xml # db/pom.xml # jeeutil/pom.xml # network/pom.xml # poi-util/pom.xml # pom.xml # util/pom.xml
This commit is contained in:
@ -26,7 +26,7 @@ limitations under the License.
|
||||
<parent>
|
||||
<artifactId>shared</artifactId>
|
||||
<groupId>de.muehlencord</groupId>
|
||||
<version>2.0.0-SNAPSHOT</version>
|
||||
<version>2.0.1-SNAPSHOT</version>
|
||||
</parent>
|
||||
|
||||
<name>shared-db</name>
|
||||
@ -61,7 +61,7 @@ limitations under the License.
|
||||
<!-- Testing -->
|
||||
<dependency>
|
||||
<groupId>org.junit.jupiter</groupId>
|
||||
<artifactId>junit-jupiter-engine</artifactId>
|
||||
<artifactId>junit-jupiter-api</artifactId>
|
||||
<scope>test</scope>
|
||||
</dependency>
|
||||
|
||||
|
||||
Reference in New Issue
Block a user