sander/jargo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

wip parents

Browse source
This commit is contained in:
Sander Hautvast 2024-01-18 16:12:16 +01:00
parent 8371757c71
commit 3b81dd314b
4 changed files with 8 additions and 77 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

69
Cargo.lock generated
View file

@ -439,7 +439,6 @@ dependencies = [
"reqwest",
"sha1",
"strong-xml",
"tokio",
"toml",
]
@ -476,16 +475,6 @@ version = "0.4.12"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c4cd1a83af159aa67994778be9070f0ae1bd732942279cabb14f86f986a21456"
[[package]]
name = "lock_api"
version = "0.4.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45"
dependencies = [
"autocfg",
"scopeguard",
]
[[package]]
name = "log"
version = "0.4.20"
@ -611,29 +600,6 @@ dependencies = [
"vcpkg",
]
[[package]]
name = "parking_lot"
version = "0.12.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f"
dependencies = [
"lock_api",
"parking_lot_core",
]
[[package]]
name = "parking_lot_core"
version = "0.9.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e"
dependencies = [
"cfg-if",
"libc",
"redox_syscall",
"smallvec",
"windows-targets 0.48.5",
]
[[package]]
name = "percent-encoding"
version = "2.3.1"
@ -757,12 +723,6 @@ dependencies = [
"windows-sys 0.52.0",
]
[[package]]
name = "scopeguard"
version = "1.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
[[package]]
name = "security-framework"
version = "2.9.2"
@ -849,15 +809,6 @@ dependencies = [
"digest",
]
[[package]]
name = "signal-hook-registry"
version = "1.4.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1"
dependencies = [
"libc",
]
[[package]]
name = "slab"
version = "0.4.9"
@ -867,12 +818,6 @@ dependencies = [
"autocfg",
]
[[package]]
name = "smallvec"
version = "1.11.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970"
[[package]]
name = "socket2"
version = "0.5.5"
@ -989,25 +934,11 @@ dependencies = [
"libc",
"mio",
"num_cpus",
"parking_lot",
"pin-project-lite",
"signal-hook-registry",
"socket2",
"tokio-macros",
"windows-sys 0.48.0",
]
[[package]]
name = "tokio-macros"
version = "2.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b"
dependencies = [
"proc-macro2",
"quote",
"syn 2.0.48",
]
[[package]]
name = "tokio-native-tls"
version = "0.3.1"

1
Cargo.toml
View file

@ -11,7 +11,6 @@ anyhow = "1.0"
strong-xml = "0.6"
colored = "2.0"
reqwest = {version = "0.11", features = ["blocking"]}
tokio = { version = "1", features = ["full"] }
bytes = "1.5"
home = "0.5"
sha1 = "0.10"

1
src/deploader.rs
View file

@ -75,6 +75,7 @@ fn load_artifact(project: &Project, artifact: &Artifact) -> Result<(), Error> {
let pom = Pom::from_str(&pom_lookup.pom_xml).unwrap();
//TODO exclusions
//TODO parents
if let Some(dependencies) = pom.dependencies {
let artifacts = dependencies.value.into_iter().map(|d| d.into()).collect();
load_artifacts(project, &artifacts)?;

14
src/maven/pom.rs
View file

@ -9,27 +9,27 @@ pub struct Pom {
#[xml(child = "modelVersion")]
pub model_version: ModelVersion,
#[xml(child = "parent")]
pub parent: Parent,
pub parent: Option<Parent>,
#[xml(child = "groupId")]
pub group_id: GroupId,
pub group_id: Option<GroupId>,
#[xml(child = "artifactId")]
pub artifact_id: ArtifactId,
#[xml(child = "version")]
pub version: Version,
pub version: Option<Version>,
#[xml(child = "name")]
pub name: Name,
#[xml(child = "packaging")]
pub packaging: Option<Packaging>,
#[xml(child = "url")]
pub url: Url,
pub url: Option<Url>,
#[xml(child = "description")]
pub description: Description,
#[xml(child = "licenses")]
pub licences: Licenses,
pub licences: Option<Licenses>,
#[xml(child = "scm")]
pub scm: Scm,
pub scm: Option<Scm>,
#[xml(child = "developers")]
pub developers: Developers,
pub developers: Option<Developers>,
#[xml(child = "dependencies")]
pub dependencies: Option<Dependencies>,
}