Skip to content

Commit 79d7990

Browse files
authored
Tidy up (#255)
Tidy up more after Ant build removal. Changes: * Removal of Ant left some remnants, clean them up. * Make dependabot take care of maven deps as well * Use local repo cache for now * Add SHA512 checksums to key dependencies
1 parent 8e6f10d commit 79d7990

6 files changed

Lines changed: 34 additions & 8 deletions

File tree

.github/dependabot.yml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,12 @@
11
version: 2
22
updates:
3-
- package-ecosystem: "github-actions"
3+
4+
- package-ecosystem: "maven"
45
directory: "/"
56
schedule:
67
interval: "weekly"
8+
9+
- package-ecosystem: "github-actions"
10+
directory: "/"
11+
schedule:
12+
interval: "weekly"
Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@ on:
44
schedule:
55
- cron: '42 0 * * 4'
66
push:
7+
branches:
8+
- master
79
pull_request:
810

911
jobs:
@@ -18,7 +20,8 @@ jobs:
1820
with:
1921
distribution: temurin
2022
java-version: 11
21-
- name: Install and run ipfs
23+
cache: 'maven'
24+
- name: Install and run IPFS
2225
run: ./install-run-ipfs.sh
2326
- name: Build & run tests with Maven
2427
run: mvn test
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
1d9ee8afb28fa04cd2742360a3b088862875ca779c1f80a60d59e4ba40770f6e20256ae1cf4e7db76807b4edf2ea318372a852d3956d3224dc5a90e56e60a8d1 com/github/multiformats/java-multihash/v1.3.4/java-multihash-v1.3.4.pom
2+
38568a2682dac8c0dbfe0fe537971f84bcefd4bae07163e3b450d89303424b8112b8de05a1956fa19b96580e0e7f8c7f312534e21a691a40906cae2528f3f82e com/github/ipld/java-cid/v1.3.7/java-cid-v1.3.7.jar
3+
588d207f41a09b386b148ee9492f966904be7ab5f6caadc1d4bcd2be51f0226cd7b0bacab2dea9a7ab1ec121c32accd23593408945bbf780d7212697323b9334 com/github/multiformats/java-multiaddr/v1.4.12/java-multiaddr-v1.4.12.pom
4+
5e4669bd3709cfd524c77e237195dca8eb6bc90159f1a08247f3f6944f55fcf670bbc855227124a95478cb360a0198ddb587bd394a7883fbfe5da71050299dec com/github/multiformats/java-multibase/v1.1.1/java-multibase-v1.1.1.pom
5+
7fe1ccc7b498bd8661c37314e0de7b26dcf87eaa2ad492213e6cc99b893616068b923c9df27934c8bdb2824d02b17fef11d83731132818bf5891c6e889d85c8e com/github/ipld/java-cid/v1.3.7/java-cid-v1.3.7.pom
6+
866a459ae1ab32d10256344cb837ca556591c36fe344021e709393a3ece66afc2ff24159da2b09914cc7ed626bed99de1416dad86d001363694ce106fa1f6396 com/github/multiformats/java-multibase/v1.1.1/java-multibase-v1.1.1.jar
7+
8f8299abf791266a616cf999ce959685cedc606180078d78f54a3fbad4a18fe0996598571a5e3ac2142e481794339c32a1de3dd9331cbe5af523ac0a6438f97f com/github/multiformats/java-multiaddr/v1.4.12/java-multiaddr-v1.4.12.jar
8+
ed60764485e3acc301a1b4d5c0d7a35f6db3622c54be64043436d1a3dc4d8742b0cb91d03741896430606583f064a6b223b6cd522ae30245e2a0a84efeca6ef2 com/github/multiformats/java-multihash/v1.3.4/java-multihash-v1.3.4.jar

.mvn/maven.config

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
--strict-checksums
2+
-Daether.checksums.algorithms=SHA-512,SHA-1,MD5
3+
-Daether.trustedChecksumsSource.summaryFile=true
4+
-Daether.trustedChecksumsSource.summaryFile.basedir=${session.rootDirectory}/.mvn/checksums/
5+
-Daether.artifactResolver.postProcessor.trustedChecksums=true
6+
-Daether.artifactResolver.postProcessor.trustedChecksums.checksumAlgorithms=SHA-512
7+
-Daether.artifactResolver.postProcessor.trustedChecksums.failIfMissing=false
8+

README.md

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,10 @@ for Maven, add the following sections to your pom.xml (replacing $LATEST_VERSION
4848
### Building
4949

5050
* Clone this repository
51-
* Run `ant dist`
52-
* Copy `dist/ipfs.jar` into your project. Appropriate versions of other [dependencies](#dependencies) are also included in `dist/lib/`.
53-
* Run tests using `ant test`.
51+
* Run `mvn install`
52+
* Copy `target/ipfs-$VERSION.jar` into your project. Appropriate versions of other [dependencies](#dependencies) are also included in `dist/lib/`.
53+
* To copy the project and all dependency JARs to directory, execute `mvn eu.maveniverse.maven.plugins:toolbox:gav-copy -DsourceSpec="resolveTransitive(gav(com.github.ipfs:java-ipfs-http-client:v1.4.5-SNAPSHOT))" -DsinkSpec="flat(.)"` in that given directory.
54+
* Run tests using `mvn test` (invocation above will run them as well).
5455

5556
### Running tests
5657

@@ -100,15 +101,15 @@ More example usage found [here](./src/main/java/io/ipfs/api/demo)
100101

101102
## Dependencies
102103

103-
Current versions of dependencies are included in the `./lib` directory.
104+
Current versions of dependencies are listed in the `pom.xml`, their corresponding source repositories are:
104105

105106
* [multibase](https://github.com/multiformats/java-multibase)
106107
* [multiaddr](https://github.com/multiformats/java-multiaddr)
107108
* [multihash](https://github.com/multiformats/java-multihash)
108109
* [cid](https://github.com/ipld/java-cid)
109110

110111
## Releasing
111-
The version number is specified in `build.xml` and `pom.xml` and must be changed in both places in order to be accurately reflected in the JAR file manifest. A git tag must be added in the format `vx.x.x` for [JitPack](https://jitpack.io/#ipfs/java-ipfs-http-client/) to work.
112+
The version number is specified in `pom.xml` and must be changed in order to be accurately reflected in the JAR file manifest. A git tag must be added in the format `vx.x.x` for [JitPack](https://jitpack.io/#ipfs/java-ipfs-http-client/) to work.
112113

113114
## Contribute
114115

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
<groupId>com.github.ipfs</groupId>
66
<artifactId>java-ipfs-http-client</artifactId>
7-
<version>v1.4.1</version>
7+
<version>v1.4.5-SNAPSHOT</version>
88
<packaging>jar</packaging>
99

1010
<name>java-ipfs-http-client</name>

0 commit comments

Comments
 (0)