From a8a8ec9779ce07f66a930910774e9c193c533774 Mon Sep 17 00:00:00 2001
From: 0qln <0qln@proton.me>
Date: Sat, 22 Nov 2025 13:24:40 +0100
Subject: [PATCH] clean up and install angular cli

---
 flake.nix |  9 +++++--
 pom.xml   | 75 ++++++++++++++++++++++++-------------------------------
 2 files changed, 39 insertions(+), 45 deletions(-)

diff --git a/flake.nix b/flake.nix
index 25d97a9..96af548 100644
--- a/flake.nix
+++ b/flake.nix
@@ -49,6 +49,10 @@
                   upquote
                 ]))
           ];
+
+          angularPackages = with pkgs; [
+            nodePackages."@angular/cli"
+          ];
         in {
           # Per-system attributes can be defined here. The self' and inputs'
           # module parameters provide easy access to attributes of the same
@@ -101,7 +105,8 @@
                   jetty
                   maven
                 ]
-                ++ latexPackages;
+                ++ latexPackages
+                ++ angularPackages;
 
               shellHook =
                 # bash
@@ -128,7 +133,7 @@
                   jetty --add-modules=http,ee11-cdi,ee11-ext,ee11-deploy,ee11-environment,ee11-annotations,ee11-glassfish-jstl,ee11-jndi,ee11-jsp,ee11-jstl,ee11-plus,ee11-security,ee11-servlet,ee11-servlets,ee11-webapp,ee11-websocket-jakarta,ee11-websocket-jetty,ee11-websocket-jetty-client-webapp
 
                   echo "Usage Example:"
-                  echo "jetty --add-modules=... # add modules"
+                  echo "mvn clean package # build demo.war"
                   echo "jetty # run webserver"
                 '';
             };
diff --git a/pom.xml b/pom.xml
index fb0fcb4..e71f058 100755
--- a/pom.xml
+++ b/pom.xml
@@ -1,15 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
-
   <groupId>org.example</groupId>
   <artifactId>demo</artifactId>
   <version>1.0-SNAPSHOT</version>
   <name>demo</name>
   <packaging>war</packaging>
-
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <project.report.sourceEncoding>UTF-8</project.report.sourceEncoding>
@@ -18,64 +14,57 @@
     <compiler-plugin.version>3.13.0</compiler-plugin.version>
     <war-plugin.version>3.4.0</war-plugin.version>
   </properties>
-
   <dependencies>
     <dependency>
-        <groupId>jakarta.platform</groupId>
-        <artifactId>jakarta.jakartaee-web-api</artifactId>
-        <version>11.0.0</version>
-        <scope>provided</scope>
-    </dependency>
-
-    <dependency>
-        <groupId>org.glassfish</groupId>
-        <artifactId>jakarta.faces</artifactId>
-        <version>4.1.3</version>
-    </dependency>
-
-    <dependency>
-        <groupId>jakarta.enterprise</groupId>
-        <artifactId>jakarta.enterprise.cdi-api</artifactId>
-        <version>4.1.0</version>
+      <groupId>jakarta.platform</groupId>
+      <artifactId>jakarta.jakartaee-web-api</artifactId>
+      <version>11.0.0</version>
+      <scope>provided</scope>
     </dependency>
     <dependency>
-        <groupId>jakarta.enterprise</groupId>
-        <artifactId>jakarta.enterprise.cdi-el-api</artifactId>
-        <version>4.1.0</version>
+      <groupId>org.glassfish</groupId>
+      <artifactId>jakarta.faces</artifactId>
+      <version>4.1.3</version>
     </dependency>
-
     <dependency>
-        <groupId>org.jboss.weld.servlet</groupId>
-        <artifactId>weld-servlet-core</artifactId>
-        <version>5.1.2.Final</version>
+      <groupId>jakarta.enterprise</groupId>
+      <artifactId>jakarta.enterprise.cdi-api</artifactId>
+      <version>4.1.0</version>
+    </dependency>
+    <dependency>
+      <groupId>jakarta.enterprise</groupId>
+      <artifactId>jakarta.enterprise.cdi-el-api</artifactId>
+      <version>4.1.0</version>
+    </dependency>
+    <dependency>
+      <groupId>org.jboss.weld.servlet</groupId>
+      <artifactId>weld-servlet-core</artifactId>
+      <version>5.1.2.Final</version>
     </dependency>
-
     <dependency>
       <groupId>org.junit.jupiter</groupId>
       <artifactId>junit-jupiter-api</artifactId>
       <version>${junit.version}</version>
     </dependency>
-
     <dependency>
       <groupId>org.projectlombok</groupId>
       <artifactId>lombok</artifactId>
       <version>1.18.30</version>
     </dependency>
   </dependencies>
-
   <build>
     <finalName>demo</finalName>
     <plugins>
-        <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-compiler-plugin</artifactId>
-            <version>${compiler-plugin.version}</version>
-        </plugin>
-        <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-war-plugin</artifactId>
-            <version>${war-plugin.version}</version>
-            </plugin>
-        </plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <version>${compiler-plugin.version}</version>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-war-plugin</artifactId>
+        <version>${war-plugin.version}</version>
+      </plugin>
+    </plugins>
   </build>
 </project>