MET-6224 changes in pom files

europeana · Dec 3, 2024 · a481eab · a481eab
1 parent 714bcdc
commit a481eab
Show file tree

Hide file tree

Showing 14 changed files with 191 additions and 9 deletions.
diff --git a/.run/ValidationJob.run.xml b/.run/ValidationJob.run.xml
@@ -1,13 +1,13 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="ValidationJob" type="Application" factoryName="Application" nameIsGenerated="true">
+  <configuration default="false" name="ValidationJob" type="Application" factoryName="Application">
     <option name="INCLUDE_PROVIDED_SCOPE" value="true" />
-    <option name="MAIN_CLASS_NAME" value="eu.europeana.metis.ValidationJob" />
+    <option name="MAIN_CLASS_NAME" value="eu.europeana.processing.validation.ValidationJob" />
     <module name="metis-processing-engine-validation" />
     <option name="PROGRAM_PARAMETERS" value="--datasetId 12 --executionId 1755776870684870440 --validationType VALIDATION_INTERNAL --chunkSize 12 --datasource.url jdbc:postgresql://localhost:5432/spring-batch-metis-poc --datasource.username admin --datasource.password admin" />
     <option name="VM_PARAMETERS" value="--add-opens java.base/java.lang=ALL-UNNAMED --add-opens java.base/java.util=ALL-UNNAMED --add-opens java.base/java.time=ALL-UNNAMED --add-opens java.base/java.util.concurrent.atomic=ALL-UNNAMED" />
     <extension name="coverage">
       <pattern>
-        <option name="PATTERN" value="eu.europeana.metis.*" />
+        <option name="PATTERN" value="eu.europeana.metis.processing.*" />
         <option name="ENABLED" value="true" />
       </pattern>
     </extension>

diff --git a/commons/src/main/java/eu/europeana/processing/DbConnectionProvider.java b/commons/src/main/java/eu/europeana/processing/DbConnectionProvider.java
@@ -17,6 +17,7 @@ public class DbConnectionProvider implements Serializable, AutoCloseable {
 
     public DbConnectionProvider(ParameterTool parameterTool) {
         HikariConfig config=new HikariConfig();
+        config.setDriverClassName("org.postgresql.Driver");
         config.setJdbcUrl(parameterTool.getRequired(JobParamName.DATASOURCE_URL));
         config.setUsername(parameterTool.get(JobParamName.DATASOURCE_USERNAME));
         config.setPassword(parameterTool.get(JobParamName.DATASOURCE_PASSWORD));

diff --git a/docker/build-docker-images.sh b/docker/build-docker-images.sh
@@ -9,5 +9,5 @@ docker build --no-cache -t flink:1.18.1-java21_poc .
 cd ..
 cd flink-node
 echo building :: flink-node $(pwd)
-docker build --no-cache -t metis-processing-engine-flink:1.20-java21 .
+docker build --no-cache -t metis-processing-engine-flink:1.18.1-java21 .
 
diff --git a/enrichment/pom.xml b/enrichment/pom.xml
@@ -50,4 +50,34 @@
     </dependency>
   </dependencies>
 
+  <build>
+    <plugins>
+      <plugin>
+        <artifactId>maven-assembly-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>make-assembly</id>
+            <configuration>
+              <descriptorRefs>
+                <descriptorRef>jar-with-dependencies</descriptorRef>
+              </descriptorRefs>
+              <appendAssemblyId>false</appendAssemblyId>
+              <archive>
+                <manifest>
+                  <mainClass>
+                    eu.europeana.processing.enrichment.EnrichmentJob
+                  </mainClass>
+                </manifest>
+              </archive>
+            </configuration>
+            <phase>package</phase>
+            <goals>
+              <goal>single</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+
 </project>
diff --git a/indexing/pom.xml b/indexing/pom.xml
@@ -51,4 +51,34 @@
 
   </dependencies>
 
+  <build>
+    <plugins>
+      <plugin>
+        <artifactId>maven-assembly-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>make-assembly</id>
+            <configuration>
+              <descriptorRefs>
+                <descriptorRef>jar-with-dependencies</descriptorRef>
+              </descriptorRefs>
+              <appendAssemblyId>false</appendAssemblyId>
+              <archive>
+                <manifest>
+                  <mainClass>
+                    eu.europeana.processing.indexing.IndexingJob
+                  </mainClass>
+                </manifest>
+              </archive>
+            </configuration>
+            <phase>package</phase>
+            <goals>
+              <goal>single</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+
 </project>
diff --git a/media/pom.xml b/media/pom.xml
@@ -57,7 +57,6 @@
           <execution>
             <id>make-assembly</id>
             <configuration>
-              <finalName>media-job</finalName>
               <descriptorRefs>
                 <descriptorRef>jar-with-dependencies</descriptorRef>
               </descriptorRefs>

diff --git a/normalization/pom.xml b/normalization/pom.xml
@@ -57,4 +57,34 @@
 
   </dependencies>
 
+  <build>
+    <plugins>
+      <plugin>
+        <artifactId>maven-assembly-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>make-assembly</id>
+            <configuration>
+              <descriptorRefs>
+                <descriptorRef>jar-with-dependencies</descriptorRef>
+              </descriptorRefs>
+              <appendAssemblyId>false</appendAssemblyId>
+              <archive>
+                <manifest>
+                  <mainClass>
+                    eu.europeana.processing.normalization.NormalizationJob
+                  </mainClass>
+                </manifest>
+              </archive>
+            </configuration>
+            <phase>package</phase>
+            <goals>
+              <goal>single</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+
 </project>
diff --git a/oai/pom.xml b/oai/pom.xml
@@ -66,4 +66,34 @@
 
   </dependencies>
 
+  <build>
+    <plugins>
+      <plugin>
+        <artifactId>maven-assembly-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>make-assembly</id>
+            <configuration>
+              <descriptorRefs>
+                <descriptorRef>jar-with-dependencies</descriptorRef>
+              </descriptorRefs>
+              <appendAssemblyId>false</appendAssemblyId>
+              <archive>
+                <manifest>
+                  <mainClass>
+                    eu.europeana.processing.oai.OAIJob
+                  </mainClass>
+                </manifest>
+              </archive>
+            </configuration>
+            <phase>package</phase>
+            <goals>
+              <goal>single</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+
 </project>
diff --git a/transformation/pom.xml b/transformation/pom.xml
@@ -33,4 +33,34 @@
 
   </dependencies>
 
+  <build>
+    <plugins>
+      <plugin>
+        <artifactId>maven-assembly-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>make-assembly</id>
+            <configuration>
+              <descriptorRefs>
+                <descriptorRef>jar-with-dependencies</descriptorRef>
+              </descriptorRefs>
+              <appendAssemblyId>false</appendAssemblyId>
+              <archive>
+                <manifest>
+                  <mainClass>
+                    eu.europeana.metis.transformation.TransformationJob
+                  </mainClass>
+                </manifest>
+              </archive>
+            </configuration>
+            <phase>package</phase>
+            <goals>
+              <goal>single</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+
 </project>
diff --git a/...eu/europeana/metis/TransformationJob.java → ...ing/transformation/TransformationJob.java b/...eu/europeana/metis/TransformationJob.java → ...ing/transformation/TransformationJob.java
@@ -1,10 +1,11 @@
-package eu.europeana.metis;
+package eu.europeana.processing.transformation;
 
 
 import eu.europeana.processing.MetisJob;
 import eu.europeana.processing.job.JobName;
 import eu.europeana.processing.model.ExecutionRecord;
 import eu.europeana.processing.model.ExecutionRecordResult;
+import eu.europeana.processing.transformation.processor.TransformationOperator;
 import org.apache.flink.streaming.api.functions.ProcessFunction;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

diff --git a/...ropeana/metis/TransformationOperator.java → ...ion/processor/TransformationOperator.java b/...ropeana/metis/TransformationOperator.java → ...ion/processor/TransformationOperator.java
@@ -1,4 +1,4 @@
-package eu.europeana.metis;
+package eu.europeana.processing.transformation.processor;
 
 import eu.europeana.metis.transformation.service.*;
 import eu.europeana.processing.job.JobName;

diff --git a/validation/pom.xml b/validation/pom.xml
@@ -46,4 +46,34 @@
 
   </dependencies>
 
+  <build>
+    <plugins>
+      <plugin>
+        <artifactId>maven-assembly-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>make-assembly</id>
+            <configuration>
+              <descriptorRefs>
+                <descriptorRef>jar-with-dependencies</descriptorRef>
+              </descriptorRefs>
+              <appendAssemblyId>false</appendAssemblyId>
+              <archive>
+                <manifest>
+                  <mainClass>
+                    eu.europeana.processing.validation.ValidationJob
+                  </mainClass>
+                </manifest>
+              </archive>
+            </configuration>
+            <phase>package</phase>
+            <goals>
+              <goal>single</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+
 </project>
diff --git a/...ava/eu/europeana/metis/ValidationJob.java → .../processing/validation/ValidationJob.java b/...ava/eu/europeana/metis/ValidationJob.java → .../processing/validation/ValidationJob.java
@@ -1,9 +1,10 @@
-package eu.europeana.metis;
+package eu.europeana.processing.validation;
 
 import eu.europeana.processing.MetisJob;
 import eu.europeana.processing.job.JobParamName;
 import eu.europeana.processing.model.ExecutionRecord;
 import eu.europeana.processing.model.ExecutionRecordResult;
+import eu.europeana.processing.validation.processor.ValidationOperator;
 import org.apache.flink.api.java.utils.ParameterTool;
 import org.apache.flink.streaming.api.functions.ProcessFunction;
 import org.slf4j.Logger;

diff --git a/...u/europeana/metis/ValidationOperator.java → ...idation/processor/ValidationOperator.java b/...u/europeana/metis/ValidationOperator.java → ...idation/processor/ValidationOperator.java
@@ -1,4 +1,4 @@
-package eu.europeana.metis;
+package eu.europeana.processing.validation.processor;
 
 import eu.europeana.metis.transformation.service.TransformationException;
 import eu.europeana.metis.transformation.service.XsltTransformer;