wip

.github/workflows/pr_flow.yml

@@ -27,8 +27,8 @@ jobs:
       with:
         token: ${{ secrets.CODECOV_TOKEN }}
         files: ./target/coverage/codecov.json
-    #- name: Run Java Tests
-    #  run: lein pom && mvn test --batch-mode --fail-at-end
+    - name: Run Java Tests
+      run: clojure -T:pom && mvn test --batch-mode --fail-at-end
     - name: Unit tests in Clojure
       run: clojure -M:test
     - name: Test Report

build.clj

@@ -5,15 +5,14 @@
 (def jar-content (str build-folder "/classes"))
 
 (def basis (b/create-basis {:project "deps.edn"}))
-(def version "0.0.1")
+(def version "0.5.10-SNAPSHOT")
 (def app-name "stencil-core")
 (def uber-file-name (format "%s/%s-%s-standalone.jar" build-folder app-name version)) ; path for result uber file
 
 (defn clean [_]
   (b/delete {:path build-folder})
   (println (format "Build folder \"%s\" removed" build-folder)))
 
-
 (defn compile-java [_]
   (clean nil)
   (println :should-compile-java-here)
@@ -30,7 +29,6 @@
                   :class-dir jar-content})
   (println "jar done?"))
 
-
 (defn uber [_]
   (clean nil)
 

deps.edn

@@ -2,12 +2,9 @@
         org.clojure/data.xml {:mvn/version "0.2.0-alpha8"}
         org.slf4j/slf4j-api {:mvn/version "2.0.9"}}
  :paths ["src" "target/classes"]
- :deps/prep-lib
- {:ensure "target/classes"
-  :alias :build
-  :fn compile-java}
  :aliases
- {:build {:deps {io.github.clojure/tools.build {:git/tag "v0.8.1" :git/sha "7d40500"}}
+ {:build {:deps {org.clojure/clojure {:mvn/version "1.12.0-beta1"}
+                 io.github.clojure/tools.build {:git/tag "v0.8.1" :git/sha "7d40500"}}
           :ns-default build}
 
   :lint/clj-kondo

pom.xml

@@ -0,0 +1,94 @@
+<?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 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>io.github.erdos</groupId>
+  <artifactId>stencil-core</artifactId>
+  <packaging>jar</packaging>
+  <name>stencil-core</name>
+  <description>Templating engine for office documents.</description>
+  <url>https://github.com/erdos/stencil</url>
+  <licenses>
+    <license>
+      <name>Eclipse Public License - v 2.0</name>
+      <url>https://www.eclipse.org/legal/epl-2.0/</url>
+    </license>
+  </licenses>
+  <build>
+    <sourceDirectory>src</sourceDirectory>
+    <testSourceDirectory>java-test</testSourceDirectory>
+    <resources>
+      <resource>
+        <directory>resources</directory>
+      </resource>
+    </resources>
+    <testResources>
+      <testResource>
+        <directory>test-resources</directory>
+      </testResource>
+      <testResource>
+        <directory>resources</directory>
+      </testResource>
+    </testResources>
+    <directory>target</directory>
+    <outputDirectory>target/classes</outputDirectory>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <version>2.20</version>
+      </plugin>
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>build-helper-maven-plugin</artifactId>
+        <version>1.7</version>
+        <executions>
+          <execution>
+            <id>add-source</id>
+            <phase>generate-sources</phase>
+            <goals>
+              <goal>add-source</goal>
+            </goals>
+            <configuration>
+              <sources>
+                <source>java-src</source>
+              </sources>
+            </configuration>
+          </execution>
+          <execution>
+            <id>add-test-source</id>
+            <phase>generate-test-sources</phase>
+            <goals>
+              <goal>add-test-source</goal>
+            </goals>
+            <configuration>
+              <sources>
+                <source>test</source>
+              </sources>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+  <repositories>
+    <repository>
+      <id>clojars</id>
+      <url>https://repo.clojars.org/</url>
+    </repository>
+  </repositories>
+  <dependencyManagement>
+    <dependencies/>
+  </dependencyManagement>
+  <dependencies>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>4.13.2</version>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+  <properties>
+    <maven.compiler.source>8</maven.compiler.source>
+    <maven.compiler.target>8</maven.compiler.target>
+  </properties>
+</project>