WIP: Fix vulnerability and prep for adding to Farmlogs

.gitignore

@@ -2,10 +2,9 @@
 *.jar
 lib
 classes
-pom.xml
 README.html
 docs
-target
-pom.xml*
+src/raynes/fs/target
 doc
-test/me/raynes/testfiles/round*
+test/me/raynes/testfiles/round*
+/.idea

.pre-commit-config.yaml

@@ -0,0 +1,7 @@
+- repo: local
+  hooks:
+    - id: pom_generator
+      name: pom_generator
+      entry: pom_generator.sh
+      language: script
+      pass_filenames: false

README.markdown → README.md

@@ -1,12 +1,17 @@
 # fs - File system utilities for Clojure
 
-[![Build Status](https://secure.travis-ci.org/Raynes/fs.png)](http://travis-ci.org/Raynes/fs)
-
-[API docs](http://raynes.github.com/fs/)
+```clj
+[fs "1.4.7"]
+```
 
 This library defines some utilities for working with the file system in Clojure. Mostly, it wants to fill the gap that
 `clojure.java.io` leaves and add on (and prettify) what `java.io.File` provides.
 
+## pre-commit
+
+- Install: https://pre-commit.com/
+- running locally: This will also happen automatically before committing to a branch, but you can also run the tasks with `pre-commit run --all-files`
+
 ## Usage
 
 This library is simple. It is just a collection of functions that do things with the file system. The one thing
@@ -22,33 +27,6 @@ because I probably want it. Make sure you include tests. Also, make sure they pa
 
 fs is *not* an I/O utility library. We should try to keep things limited to file system activities.
 
-## Artifacts
-
-Library artifacts are [released to Clojars](https://clojars.org/me.raynes/fs). If you are using Maven, add the following repository
-definition to your `pom.xml`:
-
-``` xml
-<repository>
-  <id>clojars.org</id>
-  <url>http://clojars.org/repo</url>
-</repository>
-```
-
-### The Most Recent Release
-
-With Leiningen:
-
-    [me.raynes/fs "1.4.6"]
-
-
-With Maven:
-
-    <dependency>
-      <groupId>me.raynes</groupId>
-      <artifactId>fs</artifactId>
-      <version>1.4.6</version>
-    </dependency>
-
 ## License
 
 Copyright (C) 2010-2013 Miki Tebeka, Anthony Grimes

pom.xml

@@ -0,0 +1,92 @@
+<?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>com.farmlogs</groupId>
+  <artifactId>fs</artifactId>
+  <packaging>jar</packaging>
+  <version>1.4.7-SNAPSHOT</version>
+  <name>fs</name>
+  <description>File system utilities for clojure</description>
+  <url>https://github.com/FarmLogs/fs</url>
+  <licenses>
+    <license>
+      <name>Eclipse Public License - v 1.0</name>
+      <url>http://www.eclipse.org/legal/epl-v10.html</url>
+    </license>
+  </licenses>
+  <scm>
+    <url>https://github.com/FarmLogs/fs</url>
+    <connection>scm:git:git://github.com/FarmLogs/fs.git</connection>
+    <developerConnection>scm:git:ssh://git@github.com/FarmLogs/fs.git</developerConnection>
+    <tag>63d694889a981854aa7ec35f42bd69ac7004591f</tag>
+  </scm>
+  <build>
+    <sourceDirectory>src</sourceDirectory>
+    <testSourceDirectory>test</testSourceDirectory>
+    <resources>
+      <resource>
+        <directory>resources</directory>
+      </resource>
+    </resources>
+    <testResources>
+      <testResource>
+        <directory>resources</directory>
+      </testResource>
+    </testResources>
+    <directory>target</directory>
+    <outputDirectory>target/classes</outputDirectory>
+    <plugins/>
+  </build>
+  <repositories>
+    <repository>
+      <id>central</id>
+      <url>https://repo1.maven.org/maven2/</url>
+      <snapshots>
+        <enabled>false</enabled>
+      </snapshots>
+      <releases>
+        <enabled>true</enabled>
+      </releases>
+    </repository>
+    <repository>
+      <id>clojars</id>
+      <url>https://repo.clojars.org/</url>
+      <snapshots>
+        <enabled>true</enabled>
+      </snapshots>
+      <releases>
+        <enabled>true</enabled>
+      </releases>
+    </repository>
+    <repository>
+      <id>releases</id>
+      <url>s3p://fl-maven-repo/mvn</url>
+      <snapshots>
+        <enabled>true</enabled>
+      </snapshots>
+      <releases>
+        <enabled>true</enabled>
+      </releases>
+    </repository>
+  </repositories>
+  <dependencyManagement>
+    <dependencies/>
+  </dependencyManagement>
+  <dependencies>
+    <dependency>
+      <groupId>org.clojure</groupId>
+      <artifactId>clojure</artifactId>
+      <version>1.11.1</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.commons</groupId>
+      <artifactId>commons-compress</artifactId>
+      <version>1.21</version>
+    </dependency>
+  </dependencies>
+</project>
+
+<!-- This file was autogenerated by Leiningen.
+  Please do not edit it directly; instead edit project.clj and regenerate it.
+  It should not be considered canonical data. For more information see
+  https://github.com/technomancy/leiningen -->

pom_generator.sh

@@ -0,0 +1,4 @@
+#!/bin/sh
+
+lein pom
+env -i git add pom.xml

project.clj

@@ -1,14 +1,33 @@
-(defproject me.raynes/fs "1.4.6"
+(defproject me.raynes/fs "1.4.7"
   :description "File system utilities for clojure"
   :license {:name "Eclipse Public License - v 1.0"
             :url "http://www.eclipse.org/legal/epl-v10.html"}
-  :url "https://github.com/Raynes/fs"
-  :dependencies [[org.clojure/clojure "1.4.0"]
-                 [org.apache.commons/commons-compress "1.8"]]
-  :plugins [[lein-midje "3.1.3"]
+  :url "https://github.com/FarmLogs/fs"
+  :min-lein-version "2.0.0"
+  :plugins [[lein-file-replace "0.1.0"]
+            [s3-wagon-private "1.3.5"]
+            [lein-midje "3.1.3"]
             [codox "0.8.10"]]
-  :codox {:src-dir-uri "https://github.com/Raynes/fs/blob/master/"
-          :src-linenum-anchor-prefix "L"
-          :defaults {:doc/format :markdown}}
-  :deploy-repositories {"releases" :clojars}
-  :profiles {:dev {:dependencies [[midje "1.6.3"]]}})
+  :profiles {:dev {:dependencies [[midje "1.6.3"]]}}
+  :repositories {"releases" {:url "s3p://fl-maven-repo/mvn"
+                             :username :env/AMAZON_KEY
+                             :passphrase :env/AMAZON_SECRET
+                             :sign-releases false}}
+  :dependencies [[org.clojure/clojure "1.4.0"]
+                 [org.apache.commons/commons-compress "1.21"]
+                 [org.tukaani/xz "1.9"]]
+  :test-selectors {:default (complement :integration)
+                   :integration :integration
+                   :third-party :third-party
+                   :docker (complement :third-party)
+                   :all (constantly true)}
+
+  :release-tasks [["vcs" "assert-committed"]
+                  ["change" "version"
+                   "leiningen.release/bump-version" "release"]
+                  ["vcs" "commit"]
+                  ["vcs" "tag" "--no-sign"]
+                  ["deploy"]
+                  ["file-replace" "README.md" "\\[api \"" "\"]" "version"]
+                  ["change" "version" "leiningen.release/bump-version"]
+                  ["vcs" "commit"]])