@@ -57,17 +57,20 @@ static SimpleJarMetadata fromFileName(final Path path, final Set<String> pkgs, f
5757 if (versionMaybe != null )
5858 {
5959 Path artifactMaybe = versionMaybe .getParent ();
60- if (artifactMaybe != null && path . getFileName (). toString (). startsWith ( artifactMaybe . getFileName (). toString () + "-" + versionMaybe . getFileName (). toString ()) )
60+ if (artifactMaybe != null )
6161 {
62- var name = artifactMaybe .getFileName ().toString ();
63- var ver = versionMaybe .getFileName ().toString ();
64- var mat = MODULE_VERSION .matcher (ver );
65- if (mat .find ()) {
66- ver = ModuleDescriptor .Version .parse (ver .substring (mat .start ())).toString ();
67- return new SimpleJarMetadata (cleanModuleName (name ), ver , pkgs , providers );
68- } else {
69- return new SimpleJarMetadata (cleanModuleName (name ), null , pkgs , providers );
70- }
62+ Path artifactNameMaybe = artifactMaybe .getFileName ();
63+ if (artifactNameMaybe != null && path .getFileName ().toString ().startsWith (artifactNameMaybe + "-" + versionMaybe .getFileName ().toString ())) {
64+ var name = artifactMaybe .getFileName ().toString ();
65+ var ver = versionMaybe .getFileName ().toString ();
66+ var mat = MODULE_VERSION .matcher (ver );
67+ if (mat .find ()) {
68+ ver = ModuleDescriptor .Version .parse (ver .substring (mat .start ())).toString ();
69+ return new SimpleJarMetadata (cleanModuleName (name ), ver , pkgs , providers );
70+ } else {
71+ return new SimpleJarMetadata (cleanModuleName (name ), null , pkgs , providers );
72+ }
73+ }
7174 }
7275 }
7376
0 commit comments