From 254aa73a4810ca9bd17626a13d9ba27da4a2ced6 Mon Sep 17 00:00:00 2001 From: Michiel Borkent Date: Sat, 18 Apr 2020 23:28:02 +0200 Subject: [PATCH] wip --- .gitignore | 1 + README.md | 3 +- src/babashka/impl/xml.clj | 13 +-- test-resources/pom.xml | 170 ++++++++++++++++++++++++++++++++++++++ 4 files changed, 181 insertions(+), 6 deletions(-) create mode 100644 test-resources/pom.xml diff --git a/.gitignore b/.gitignore index 1b98c17b..3b3906e1 100644 --- a/.gitignore +++ b/.gitignore @@ -14,6 +14,7 @@ pom.xml.asc .clj-kondo/.cache !java/src/babashka/impl/LockFix.class !test-resources/babashka/src_for_classpath_test/foo.jar +!test-resources/pom.xml .cpcache *reflection.json /tmp diff --git a/README.md b/README.md index d0d5fa0d..c4f30166 100644 --- a/README.md +++ b/README.md @@ -221,6 +221,7 @@ enumerated explicitly. - `clojure.pprint`: `pprint` (currently backed by [fipp](https://github.com/brandonbloom/fipp)'s `fipp.edn/pprint`) - [`clojure.tools.cli`](https://github.com/clojure/tools.cli) aliased as `tools.cli` - [`clojure.data.csv`](https://github.com/clojure/data.csv) aliased as `csv` +- [`clojure.data.xml`](https://github.com/clojure/data.xml) aliased as `xml` - [`cheshire.core`](https://github.com/dakrone/cheshire) aliased as `json` - [`cognitect.transit`](https://github.com/cognitect/transit-clj) aliased as `transit` - [`clj-yaml.core`](https://github.com/clj-commons/clj-yaml) alias as `yaml` @@ -1248,7 +1249,7 @@ $ examples/which.clj rg ### pom.xml version A script to retrieve the version from a `pom.xml` file. See -[examples/pom_version.clj](https://github.com/borkdude/babashka/blob/master/examples/pom_version.clj). Written by [@wilkerlucio](https://github.com/wilkerlucio). +[examples/pom_version.clj](examples/pom_version.clj). Written by [@wilkerlucio](https://github.com/wilkerlucio). ## Thanks diff --git a/src/babashka/impl/xml.clj b/src/babashka/impl/xml.clj index 29beef64..c4e4d1ee 100644 --- a/src/babashka/impl/xml.clj +++ b/src/babashka/impl/xml.clj @@ -1,9 +1,12 @@ (ns babashka.impl.xml {:no-doc true} - (:require [clojure.data.xml :as xml])) + (:require [clojure.data.xml :as xml] + [sci.impl.namespaces :refer [copy-var]] + [sci.impl.vars :as vars])) + +(def xns (vars/->SciNamespace 'clojure.data.xml)) (def xml-namespace - {'parse-str xml/parse-str - 'element xml/element - 'emit-str xml/emit-str}) - + {'parse-str (copy-var xml/parse-str xns) + 'element (copy-var xml/element xns) + 'emit-str (copy-var xml/emit-str xns)}) diff --git a/test-resources/pom.xml b/test-resources/pom.xml new file mode 100644 index 00000000..24fe5298 --- /dev/null +++ b/test-resources/pom.xml @@ -0,0 +1,170 @@ + + 4.0.0 + borkdude + babashka + jar + 0.0.87-SNAPSHOT + babashka + babashka + https://github.com/borkdude/babashka + + + Eclipse Public License 1.0 + http://opensource.org/licenses/eclipse-1.0.php + + + + https://github.com/borkdude/babashka + scm:git:git://github.com/borkdude/babashka.git + scm:git:ssh://git@github.com/borkdude/babashka.git + 8072df2b97207c46340c64912597e05eed726077 + + + src + test + + + resources + + + sci/resources + + + + + resources + + + sci/resources + + + target + target/classes + + + org.codehaus.mojo + build-helper-maven-plugin + 1.7 + + + add-source + generate-sources + + add-source + + + + sci/src + babashka.curl/src + + + + + + + + + + central + https://repo1.maven.org/maven2/ + + false + + + true + + + + clojars + https://repo.clojars.org/ + + true + + + true + + + + + + + + + org.clojure + clojure + 1.10.2-alpha1 + + + org.clojure + tools.reader + 1.3.2 + + + borkdude + edamame + 0.0.11-alpha.9 + + + borkdude + graal.locking + 0.0.2 + + + borkdude + sci.impl.reflector + 0.0.1 + + + org.clojure + core.async + 1.0.567 + + + org.clojure + tools.cli + 0.4.2 + + + org.clojure + data.csv + 1.0.0 + + + cheshire + cheshire + 5.10.0 + + + fipp + fipp + 0.6.22 + + + clj-commons + clj-yaml + 0.7.1 + + + com.cognitect + transit-clj + 1.0.324 + + + clj-commons + conch + 0.9.2 + test + + + com.clojure-goes-fast + clj-async-profiler + 0.4.0 + test + + + + +