upgrade versions

Issue #194
imixs · Aug 25, 2023 · ece98fa · ece98fa
1 parent eaa68f0
commit ece98fa
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 41 deletions.
diff --git a/imixs-archive-api/src/test/java/org/imixs/archive/core/TestSnapshotService.java b/imixs-archive-api/src/test/java/org/imixs/archive/core/TestSnapshotService.java
@@ -18,7 +18,6 @@
 import org.imixs.workflow.exceptions.ProcessingErrorException;
 import org.junit.Assert;
 import org.junit.Before;
-import org.junit.Ignore;
 import org.junit.Test;
 import org.mockito.Mockito;
 import org.mockito.MockitoAnnotations;
@@ -84,7 +83,6 @@ public void setup() throws PluginException, ModelException {
 	 * 
 	 */
 	@Test
-	@Ignore
 	public void testOnSave() throws AccessDeniedException, ProcessingErrorException, PluginException, ModelException {
 		// load test workitem
 		ItemCollection workitem = workflowMockEnvironment.getDatabase().get("W0000-00001");
@@ -128,7 +126,6 @@ public void testOnSave() throws AccessDeniedException, ProcessingErrorException,
 	 * 
 	 */
 	@Test
-	@Ignore
 	public void testOnSaveVersion()
 			throws AccessDeniedException, ProcessingErrorException, PluginException, ModelException {
 		// load test workitem

diff --git a/imixs-archive-backup/pom.xml b/imixs-archive-backup/pom.xml
@@ -10,12 +10,7 @@
   <name>Imixs-Archive Backup</name>
 
 	<properties>
-		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-		<maven.compiler.source>11</maven.compiler.source>
-		<maven.compiler.target>11</maven.compiler.target>
 		<failOnMissingWebXml>false</failOnMissingWebXml>
-		<org.imixs.workflow.version>6.0.1</org.imixs.workflow.version>
 		<org.imixs.jwt.version>1.0.3</org.imixs.jwt.version>
 	</properties>
 

diff --git a/imixs-archive-exporter/pom.xml b/imixs-archive-exporter/pom.xml
@@ -29,15 +29,7 @@
 	</repositories>
 
 	<properties>
-		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-		<maven.compiler.source>11</maven.compiler.source>
-		<maven.compiler.target>11</maven.compiler.target>
 		<failOnMissingWebXml>false</failOnMissingWebXml>
-		<org.imixs.workflow.version>6.0.2</org.imixs.workflow.version>
-		<microprofile.version>5.0</microprofile.version>
-		<microprofile-metrics.version>4.0</microprofile-metrics.version>
-
 	</properties>
 
 	<profiles>

diff --git a/imixs-archive-importer/pom.xml b/imixs-archive-importer/pom.xml
@@ -7,8 +7,6 @@
   </parent>
   <artifactId>imixs-archive-importer</artifactId>
 
-
-
   <dependencies>
 		<!-- JEE Dependencies -->
 		<dependency>
@@ -33,23 +31,6 @@
 			<scope>compile</scope>
 		</dependency>
 
-
-
-		<!--
-		<dependency>
-		    <groupId>javax.json</groupId>
-		    <artifactId>javax.json-api</artifactId>
-		    <version>1.1</version>
-		    <scope>test</scope>
-		</dependency>
-		
-		<dependency>
-		    <groupId>org.glassfish</groupId>
-		    <artifactId>javax.json</artifactId>
-		    <version>1.1</version>
-		    <scope>test</scope>
-		</dependency>	
-		-->	
 	</dependencies>
 
   <name>Imixs-Archive Importer</name>

diff --git a/imixs-archive-service/pom.xml b/imixs-archive-service/pom.xml
@@ -9,17 +9,14 @@
 	<name>Imixs-Archive Service</name>
 
 	<properties>
-		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<custom.webResources>src/main/webapp</custom.webResources>
 		<imixs-archive.applicationname>Imixs-Workflow-Archive</imixs-archive.applicationname>
 		<!-- Default docker registry -->
 		<org.imixs.docker.registry>localhost:5000</org.imixs.docker.registry>
 		<root-context>/</root-context>
 	</properties>
 
-
 	<profiles>
-
 		<profile>
 			<id>docker</id>
 			<build>

diff --git a/imixs-archive-service/src/main/java/org/imixs/archive/service/HealthCheckService.java b/imixs-archive-service/src/main/java/org/imixs/archive/service/HealthCheckService.java
@@ -33,10 +33,10 @@
 import java.util.Properties;
 import java.util.logging.Logger;
 
-import org.eclipse.microprofile.health.Health;
 import org.eclipse.microprofile.health.HealthCheck;
 import org.eclipse.microprofile.health.HealthCheckResponse;
 import org.eclipse.microprofile.health.HealthCheckResponseBuilder;
+import org.eclipse.microprofile.health.Liveness;
 import org.imixs.archive.service.cassandra.ClusterService;
 
 import jakarta.enterprise.context.ApplicationScoped;
@@ -56,7 +56,7 @@
  * @author rsoika
  * @version 1.0
  */
-@Health
+@Liveness
 @ApplicationScoped
 public class HealthCheckService implements HealthCheck {
 
@@ -89,6 +89,7 @@ public HealthCheckResponse call() {
         return builder.build();
     }
 
+
     /**
      * This method extracts the archive version form the maven pom.properties
      * 

diff --git a/pom.xml b/pom.xml
@@ -79,13 +79,16 @@
 
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+		<maven.compiler.source>11</maven.compiler.source>
+		<maven.compiler.target>11</maven.compiler.target>	
 		<jakarta.version>10.0.0</jakarta.version>
 		<org.imixs.workflow.version>6.0.3</org.imixs.workflow.version>
 		<org.imixs.melman.version>2.0.1</org.imixs.melman.version>
 		<org.imixs.mock.version>6.0.0</org.imixs.mock.version>
 		<apache.pdfbox.version>2.0.21</apache.pdfbox.version>
 		<microprofile.version>6.0</microprofile.version>
-		<microprofile-metrics.version>5.0.0</microprofile-metrics.version>
+		<microprofile-metrics.version>4.0</microprofile-metrics.version>		
 	</properties>
 
 	<repositories>