diff --git a/docker/pom.xml b/docker/pom.xml deleted file mode 100644 index 29da5f9..0000000 --- a/docker/pom.xml +++ /dev/null @@ -1,93 +0,0 @@ - - - - 4.0.0 - - com.manorrock.aegean - project - 24.8.0-SNAPSHOT - - aegean-docker - pom - Manorrock Aegean - Docker - - - docker - - - com.manorrock.aegean - aegean - ${project.version} - provided - war - - - - - - org.apache.maven.plugins - maven-dependency-plugin - 3.7.1 - - - copy - package - - copy - - - - - - - com.manorrock.aegean - aegean - ${project.version} - war - true - ${project.build.directory}/wars - aegean.war - - - ${project.build.directory}/wars - true - true - - - - io.fabric8 - docker-maven-plugin - 0.44.0 - - - - persian - ghcr.io/manorrock/aegean:%l - - - - linux/amd64 - linux/arm64 - - - ${basedir} - src/main/docker/Dockerfile - - - - - - - build - install - - build - - - - - - - - - diff --git a/docker/src/main/docker/Dockerfile b/docker/src/main/docker/Dockerfile deleted file mode 100644 index ab4f920..0000000 --- a/docker/src/main/docker/Dockerfile +++ /dev/null @@ -1,16 +0,0 @@ -FROM eclipse-temurin:21 -RUN cd /opt && \ - export TOMCAT_VERSION=9.0.90 && \ - curl --insecure -L -O https://archive.apache.org/dist/tomcat/tomcat-9/v${TOMCAT_VERSION}/bin/apache-tomcat-${TOMCAT_VERSION}.tar.gz && \ - tar xfvz apache-tomcat-${TOMCAT_VERSION}.tar.gz && \ - mv apache-tomcat-${TOMCAT_VERSION} tomcat && \ - rm apache-tomcat-${TOMCAT_VERSION}.tar.gz && \ - rm -rf tomcat/webapps/*docs* && \ - rm -rf tomcat/webapps/*examples* && \ - rm -rf tomcat/webapps/*manager* && \ - rm -rf tomcat/webapps/ROOT* -CMD ["/opt/tomcat/bin/catalina.sh", "run"] -EXPOSE 8080 -WORKDIR /mnt -ENV ROOT_DIRECTORY /mnt -COPY target/wars/aegean.war /opt/tomcat/webapps/ROOT.war diff --git a/pom.xml b/pom.xml index 77421a3..e4989c2 100644 --- a/pom.xml +++ b/pom.xml @@ -4,21 +4,115 @@ 4.0.0 com.manorrock.aegean project - 24.8.0-SNAPSHOT - pom - Manorrock Aegean - Project + 25.2.0-SNAPSHOT + war + Manorrock Aegean Manorrock.com http://www.manorrock.com + + 2.0.2 + 6.10.0.202406032230-r + 3.1.9.Final + 4.0.4 + + 0.45.1 + 3.13.0 3.2.4 + 3.4.0 + + 21 + UTF-8 - - docker - repo - + + + org.eclipse.jgit + org.eclipse.jgit.http.server + ${jgit.version} + compile + + + jakarta.servlet + jakarta.servlet-api + ${servlet.version} + provided + + + jakarta.enterprise + jakarta.enterprise.cdi-api + ${cdi.version} + provided + + + org.jboss.weld.servlet + weld-servlet-shaded + ${weld.version} + runtime + + + + aegean + + + org.apache.maven.plugins + maven-compiler-plugin + ${maven-compiler-plugin.version} + + ${java.version} + + + + org.apache.maven.plugins + maven-war-plugin + ${maven-war-plugin.version} + + false + + + + + + docker + + + + io.fabric8 + docker-maven-plugin + ${docker-maven-plugin.version} + + + + persian + ghcr.io/manorrock/aegean:%l + + + + linux/amd64 + linux/arm64 + + + ${basedir} + src/main/docker/Dockerfile + + + + + + + build + install + + build + + + + + + + - 2.0.2 - 6.10.0.202406032230-r - 2.3.21 - 3.1.9.Final - 4.0.4 - - 0.42.1 - 3.13.0 - 3.4.0 - - 21 - UTF-8 - - - aegean - - - org.apache.maven.plugins - maven-compiler-plugin - ${maven-compiler-plugin.version} - - ${java.version} - - - - org.apache.maven.plugins - maven-war-plugin - ${maven-war-plugin.version} - - false - - - - - - - org.eclipse.jgit - org.eclipse.jgit.http.server - ${jgit.version} - compile - - - jakarta.servlet - jakarta.servlet-api - ${servlet.version} - provided - - - jakarta.enterprise - jakarta.enterprise.cdi-api - ${cdi.version} - provided - - - org.jboss.weld.servlet - weld-servlet-shaded - ${weld.version} - runtime - - - org.glassfish - jakarta.faces - ${mojarra.version} - - - - - docker - - - - io.fabric8 - docker-maven-plugin - ${docker-maven-plugin.version} - - - - aegean - ghcr.io/manorrock/aegean:%l - - - - linux/amd64 - linux/arm64/v8 - - - ${basedir} - src/main/docker/Dockerfile - - - - - - - build - install - - build - - - - push - deploy - - push - - - - - - - - - diff --git a/repo/src/main/docker/Dockerfile b/src/main/docker/Dockerfile similarity index 100% rename from repo/src/main/docker/Dockerfile rename to src/main/docker/Dockerfile diff --git a/repo/src/main/java/com/manorrock/aegean/Application.java b/src/main/java/com/manorrock/aegean/GitApplication.java similarity index 96% rename from repo/src/main/java/com/manorrock/aegean/Application.java rename to src/main/java/com/manorrock/aegean/GitApplication.java index d1a83bc..c780ae6 100644 --- a/repo/src/main/java/com/manorrock/aegean/Application.java +++ b/src/main/java/com/manorrock/aegean/GitApplication.java @@ -37,12 +37,12 @@ * @author Manfred Riem (mriem@manorrock.com) */ @ApplicationScoped -public class Application { +public class GitApplication { /** * Stores the logger. */ - private static final Logger LOGGER = Logger.getLogger(Application.class.getName()); + private static final Logger LOGGER = Logger.getLogger(GitApplication.class.getName()); /** * Stores the repositories directory. diff --git a/repo/src/main/java/com/manorrock/aegean/GitHttpServlet.java b/src/main/java/com/manorrock/aegean/GitHttpServlet.java similarity index 99% rename from repo/src/main/java/com/manorrock/aegean/GitHttpServlet.java rename to src/main/java/com/manorrock/aegean/GitHttpServlet.java index 158b850..2398883 100644 --- a/repo/src/main/java/com/manorrock/aegean/GitHttpServlet.java +++ b/src/main/java/com/manorrock/aegean/GitHttpServlet.java @@ -56,7 +56,7 @@ public class GitHttpServlet extends HttpServlet { * Stores the application. */ @Inject - private Application application; + private GitApplication application; /** * Stores the Git filter. diff --git a/repo/src/main/java/com/manorrock/aegean/GitRepositoryResolver.java b/src/main/java/com/manorrock/aegean/GitRepositoryResolver.java similarity index 100% rename from repo/src/main/java/com/manorrock/aegean/GitRepositoryResolver.java rename to src/main/java/com/manorrock/aegean/GitRepositoryResolver.java diff --git a/repo/src/main/webapp/META-INF/context.xml b/src/main/webapp/META-INF/context.xml similarity index 100% rename from repo/src/main/webapp/META-INF/context.xml rename to src/main/webapp/META-INF/context.xml diff --git a/repo/src/main/webapp/WEB-INF/beans.xml b/src/main/webapp/WEB-INF/beans.xml similarity index 100% rename from repo/src/main/webapp/WEB-INF/beans.xml rename to src/main/webapp/WEB-INF/beans.xml diff --git a/repo/src/main/webapp/WEB-INF/web.xml b/src/main/webapp/WEB-INF/web.xml similarity index 100% rename from repo/src/main/webapp/WEB-INF/web.xml rename to src/main/webapp/WEB-INF/web.xml