From 51110e0fe07b38678373f7d92c9d5fd68b2dc6e7 Mon Sep 17 00:00:00 2001 From: fleskesvor Date: Sat, 7 Dec 2024 14:43:01 +0100 Subject: [PATCH 01/15] Fix core groupId --- core/pom.xml | 7 +++---- core/project.clj | 2 +- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/core/pom.xml b/core/pom.xml index 30b9da93..b47743e0 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -1,7 +1,6 @@ - - + 4.0.0 - jarl + by.borge.jarl jarl jar 0.1.0-SNAPSHOT @@ -206,4 +205,4 @@ + https://github.com/technomancy/leiningen --> diff --git a/core/project.clj b/core/project.clj index 27c847bc..774922e5 100644 --- a/core/project.clj +++ b/core/project.clj @@ -1,4 +1,4 @@ -(defproject jarl "0.1.0-SNAPSHOT" +(defproject by.borge.jarl/jarl "0.1.0-SNAPSHOT" :description "Jarl, The JVM Alternative for the Rego Language" :url "https://github.com/borgeby/jarl" :license {:name "Apache License Version 2.0" From fd602cdaf6375554733ac4690fd86c987bdcad42 Mon Sep 17 00:00:00 2001 From: fleskesvor Date: Sat, 7 Dec 2024 15:25:06 +0100 Subject: [PATCH 02/15] Add Maven publish workflow --- .github/workflows/maven.yaml | 28 ++++++++++++++++++++++++++++ core/pom.xml | 7 +++++++ core/project.clj | 6 +++++- 3 files changed, 40 insertions(+), 1 deletion(-) create mode 100644 .github/workflows/maven.yaml diff --git a/.github/workflows/maven.yaml b/.github/workflows/maven.yaml new file mode 100644 index 00000000..849e21d4 --- /dev/null +++ b/.github/workflows/maven.yaml @@ -0,0 +1,28 @@ +name: Publish Maven artifacts + +on: + push: + branches: + - 'main' + - 'feature/maven-artifacts' # FIXME: Remove when done + +jobs: + generate-metrics: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + + - name: Create pom + working-directory: ./core + run: lein pom + + - uses: actions/setup-java@v4 + with: + java-version: '17' + distribution: 'temurin' + + - name: Publish package + working-directory: ./core + run: mvn --batch-mode deploy + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/core/pom.xml b/core/pom.xml index b47743e0..f7acd05d 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -200,6 +200,13 @@ test + + + github + Jarl core Maven package + https://maven.pkg.github.com/fleskesvor/jarl + + + https://codeberg.org/leiningen/leiningen --> diff --git a/core/project.clj b/core/project.clj index 334d6600..27c847bc 100644 --- a/core/project.clj +++ b/core/project.clj @@ -1,4 +1,4 @@ -(defproject by.borge.jarl/jarl "0.1.0-SNAPSHOT" +(defproject jarl "0.1.0-SNAPSHOT" :description "Jarl, The JVM Alternative for the Rego Language" :url "https://github.com/borgeby/jarl" :license {:name "Apache License Version 2.0" @@ -60,8 +60,4 @@ ; more recent version provided by shadow-cljs :exclusions [com.google.javascript/closure-compiler-unshaded]] [thheller/shadow-cljs "2.20.14"]] - :source-paths ["src/main/cljs" "src/main/cljc" "src/test/cljs" "src/test/cljc"]}} - :pom-addition ([:distributionManagement [:repository [:id "github"] - [:name "Jarl Core Maven package"] - [:url "https://maven.pkg.github.com/borgeby/jarl"]]] - [:properties ["maven.compiler.source" "17"] ["maven.compiler.target" "17"]])) + :source-paths ["src/main/cljs" "src/main/cljc" "src/test/cljs" "src/test/cljc"]}}) From 09be11abf5c1118db808c201199860cf409b6096 Mon Sep 17 00:00:00 2001 From: fleskesvor Date: Mon, 9 Dec 2024 13:36:52 +0100 Subject: [PATCH 14/15] Fix dependsOn for publish task --- api/build.gradle | 2 ++ 1 file changed, 2 insertions(+) diff --git a/api/build.gradle b/api/build.gradle index 6e3009e8..32341afe 100644 --- a/api/build.gradle +++ b/api/build.gradle @@ -39,6 +39,8 @@ jar { configurations.runtimeClasspath.collect { it.isDirectory() ? it : zipTree(it) } } } +tasks.jar.dependsOn compileJava +tasks.publish.dependsOn jar publishing { publications { From 62dc2c99db042345b88e78d506016b1f21ec0d72 Mon Sep 17 00:00:00 2001 From: fleskesvor Date: Mon, 9 Dec 2024 14:19:28 +0100 Subject: [PATCH 15/15] Exclude conflicting logger implementation from uberjar --- core/pom.xml | 6 ++++++ core/project.clj | 3 ++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/core/pom.xml b/core/pom.xml index 30b9da93..cecb0540 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -129,6 +129,12 @@ org.bitbucket.b_c jose4j 0.9.2 + + + slf4j-api + org.sjf4j + + org.apache.commons diff --git a/core/project.clj b/core/project.clj index 27c847bc..055270ca 100644 --- a/core/project.clj +++ b/core/project.clj @@ -60,4 +60,5 @@ ; more recent version provided by shadow-cljs :exclusions [com.google.javascript/closure-compiler-unshaded]] [thheller/shadow-cljs "2.20.14"]] - :source-paths ["src/main/cljs" "src/main/cljc" "src/test/cljs" "src/test/cljc"]}}) + :source-paths ["src/main/cljs" "src/main/cljc" "src/test/cljs" "src/test/cljc"]} + :uberjar {:uberjar-exclusions [#"org/slf4j"]}})