Skip to content

Commit

Permalink
Discrepancy resolution + POM version property (#10)
Browse files Browse the repository at this point in the history
  • Loading branch information
mohamed-ennahdi authored Nov 3, 2024
1 parent 844185c commit 3e98642
Show file tree
Hide file tree
Showing 8 changed files with 30 additions and 58 deletions.
4 changes: 2 additions & 2 deletions objectmorph-app/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<groupId>com.github.mohamed-ennahdi</groupId>
<artifactId>objectmorph</artifactId>
<version>0.0.3-SNAPSHOT</version>
<version>${objectmorph.parent.version}</version>
</parent>
<artifactId>objectmorph-app</artifactId>
<properties>
Expand All @@ -26,7 +26,7 @@
<dependency>
<groupId>com.github.mohamed-ennahdi</groupId>
<artifactId>objectmorph-renderer</artifactId>
<version>0.0.1</version>
<version>${objectmorph.parent.version}</version>
</dependency>
<dependency>
<groupId>org.springdoc</groupId>
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
package com.github.mohamedennahdi.objectmorph.app.logic;

import java.io.File;

import org.springframework.stereotype.Component;

import com.github.mohamedennahdi.objectmorph.renderer.HTMLGenerator;

@Component
public class ObjectmorphComponent {

HTMLGenerator htmlGenerator;

private ObjectmorphComponent() {}

public HTMLGenerator getHtmlGenerator(File... files) {
htmlGenerator = new HTMLGenerator(files);
return htmlGenerator;
}
}

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
package com.github.mohamedennahdi.objectmorph.app.service;

import java.io.File;
import java.io.FileNotFoundException;
import java.io.IOException;
import java.net.URISyntaxException;
import java.nio.charset.StandardCharsets;
Expand All @@ -15,16 +14,16 @@
import org.apache.commons.io.FileUtils;
import org.springframework.stereotype.Service;

import com.github.mohamedennahdi.objectmorph.app.logic.ObjectmorphSingleton;
import com.github.mohamedennahdi.objectmorph.app.logic.ObjectmorphComponent;

import lombok.extern.slf4j.Slf4j;

@Slf4j
@Service
public class ObjectmorphService {
ObjectmorphSingleton objectmorphLogic;
ObjectmorphComponent objectmorphLogic;

public ObjectmorphService(ObjectmorphSingleton objectmorphLogic) {
public ObjectmorphService(ObjectmorphComponent objectmorphLogic) {
this.objectmorphLogic = objectmorphLogic;
}

Expand Down
2 changes: 1 addition & 1 deletion objectmorph-logic/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<groupId>com.github.mohamed-ennahdi</groupId>
<artifactId>objectmorph</artifactId>
<version>0.0.3-SNAPSHOT</version>
<version>${objectmorph.parent.version}</version>
</parent>
<artifactId>objectmorph-logic</artifactId>
<properties>
Expand Down
4 changes: 2 additions & 2 deletions objectmorph-renderer/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<groupId>com.github.mohamed-ennahdi</groupId>
<artifactId>objectmorph</artifactId>
<version>0.0.3-SNAPSHOT</version>
<version>${objectmorph.parent.version}</version>
</parent>
<artifactId>objectmorph-renderer</artifactId>
<properties>
Expand All @@ -15,7 +15,7 @@
<dependency>
<groupId>com.github.mohamed-ennahdi</groupId>
<artifactId>objectmorph-logic</artifactId>
<version>0.0.1</version>
<version>${objectmorph.parent.version}</version>
</dependency>
<dependency>
<groupId>com.j2html</groupId>
Expand Down
3 changes: 2 additions & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.github.mohamed-ennahdi</groupId>
<artifactId>objectmorph</artifactId>
<version>0.0.3-SNAPSHOT</version>
<version>${objectmorph.parent.version}</version>
<packaging>pom</packaging>
<modules>
<module>objectmorph-app</module>
Expand All @@ -11,6 +11,7 @@
</modules>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<objectmorph.parent.version>0.0.3-SNAPSHOT</objectmorph.parent.version>
</properties>
<scm>
<connection>scm:git:https://github.com/mohamed-ennahdi/objectmorph.git</connection>
Expand Down
26 changes: 0 additions & 26 deletions release.properties

This file was deleted.

0 comments on commit 3e98642

Please sign in to comment.