[NAE-1906] Merge NAE-1882 with NAE-1904

- quartz.properties
netgrif · Jan 24, 2024 · b7a82e5 · b7a82e5
1 parent 84bb0d9
commit b7a82e5
Show file tree

Hide file tree

Showing 5 changed files with 33 additions and 22 deletions.
diff --git a/THIRD-PARTY.txt b/THIRD-PARTY.txt
@@ -40,7 +40,6 @@ Lists of 378 third-party dependencies.
      (The Apache Software License, Version 2.0) project ':json-path' (com.jayway.jsonpath:json-path:2.6.0 - https://github.com/jayway/JsonPath)
      (Eclipse Public License, Version 1.0) (GNU Lesser General Public License, Version 2.1) mchange-commons-java (com.mchange:mchange-commons-java:0.2.15 - https://github.com/swaldman/mchange-commons-java)
      (The Apache Software License, Version 2.0) lang (com.mysema.commons:mysema-commons-lang:0.2.4 - http://www.github.com/mysema/mysema-commons-lang)
-     (Unknown license) quartz-mongodb (com.novemberain:quartz-mongodb:2.2.0-rc2 - no url defined)
      (Apache License, Version 2.0) Querydsl - Codegen utils (com.querydsl:codegen-utils:5.0.0 - https://querydsl.github.io/codegen-utils/)
      (Apache License, Version 2.0) Querydsl - APT support (com.querydsl:querydsl-apt:5.0.0 - http://www.querydsl.com)
      (Apache License, Version 2.0) Querydsl - Codegen module (com.querydsl:querydsl-codegen:5.0.0 - http://www.querydsl.com)

diff --git a/pom.xml b/pom.xml
@@ -66,6 +66,32 @@
         <sonar.host.url>https://sonarcloud.io</sonar.host.url>
     </properties>
 
+    <repositories>
+        <repository>
+            <id>oss.snapshots</id>
+            <name>OSSRH SNAPSHOT</name>
+            <url>https://s01.oss.sonatype.org/content/repositories/snapshots</url>
+            <releases>
+                <enabled>false</enabled>
+            </releases>
+            <snapshots>
+                <enabled>true</enabled>
+            </snapshots>
+        </repository>
+        <repository>
+            <id>mvnrepository1</id>
+            <url>https://maven.imagej.net/content/repositories/public/</url>
+        </repository>
+        <repository>
+            <id>mvnrepository2</id>
+            <url>https://repo.spring.io/plugins-release/</url>
+        </repository>
+        <repository>
+            <id>mulesoft</id>
+            <url>https://repository.mulesoft.org/nexus/content/repositories/public/</url>
+        </repository>
+    </repositories>
+
     <dependencyManagement>
         <dependencies>
             <!-- ElasticSearch Api -->
@@ -408,9 +434,9 @@
             <version>2.3.2</version>
         </dependency>
         <dependency>
-            <groupId>com.novemberain</groupId>
-            <artifactId>quartz-mongodb</artifactId>
-            <version>2.2.0-rc2</version>
+            <groupId>com.netgrif</groupId>
+            <artifactId>quartz-mongodb-connector</artifactId>
+            <version>1.0.0-SNAPSHOT</version>
         </dependency>
 
         <!-- OpenAPI 3 / Swagger Docs -->
@@ -502,21 +528,6 @@
         </dependency>
     </dependencies>
 
-    <repositories>
-        <repository>
-            <id>mvnrepository1</id>
-            <url>https://maven.imagej.net/content/repositories/public/</url>
-        </repository>
-        <repository>
-            <id>mvnrepository2</id>
-            <url>https://repo.spring.io/plugins-release/</url>
-        </repository>
-        <repository>
-            <id>mulesoft</id>
-            <url>https://repository.mulesoft.org/nexus/content/repositories/public/</url>
-        </repository>
-    </repositories>
-
     <build>
         <resources>
             <resource>

diff --git a/src/main/java/com/netgrif/application/engine/configuration/quartz/QuartzConfiguration.java b/src/main/java/com/netgrif/application/engine/configuration/quartz/QuartzConfiguration.java
@@ -74,7 +74,7 @@ public SchedulerFactoryBean schedulerFactoryBean() throws Exception {
             properties.setProperty("org.quartz.jobStore.mongoUri", uri);
         }
         properties.setProperty("org.quartz.jobStore.dbName", db);
-        properties.setProperty("org.quartz.jobStore.class", "com.novemberain.quartz.mongodb.MongoDBJobStore");
+        properties.setProperty("org.quartz.jobStore.class", "com.netgrif.quartz.mongodb.MongoDBJobStore");
         properties.setProperty("spring.quartz.properties.org.quartz.jobStore.isClustered", "false");
         properties.setProperty("org.quartz.jobStore.isClustered", "true");
         properties.setProperty("org.quartz.threadPool.threadCount", "1");

diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
@@ -102,7 +102,8 @@ nae.security.anonymous-exceptions=/api/auth/signup,/api/auth/token/verify,/api/a
 springdoc.swagger-ui.enabled=false
 
 # Quartz (this config overwrites quartz.properties resource file)
-org.quartz.jobStore.class=com.novemberain.quartz.mongodb.MongoDBJobStore
+org.quartz.jobStore.mongoUri=${MONGO_URI:mongodb://localhost:27017}
+org.quartz.jobStore.class=com.netgrif.quartz.mongodb.MongoDBJobStore
 org.quartz.threadPool.threadCount=1
 org.quartz.scheduler.instanceName=netgrif_onloadcode
 spring.quartz.properties.org.quartz.scheduler.instanceName=quartz-nae

diff --git a/src/main/resources/quartz.properties b/src/main/resources/quartz.properties
@@ -3,7 +3,7 @@
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 #org.quartz.scheduler.instanceName=springboot-quartz-mongodb
 #org.quartz.scheduler.instanceId=AUTO
-org.quartz.jobStore.class=com.novemberain.quartz.mongodb.MongoDBJobStore
+org.quartz.jobStore.class=com.netgrif.quartz.mongodb.MongoDBJobStore
 #org.quartz.jobStore.mongoUri=mongodb://${NAE_MONGO_HOST}:27017/
 org.quartz.jobStore.mongoUri=mongodb://localhost:27017/
 # MongoDB Database name