Skip to content

Commit

Permalink
fixes broken layout
Browse files Browse the repository at this point in the history
Signed-off-by: Adrian Cole <[email protected]>
  • Loading branch information
Adrian Cole committed Dec 17, 2023
1 parent e65f6ab commit 127517a
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 5 deletions.
4 changes: 2 additions & 2 deletions pom.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright 2018-2020 The OpenZipkin Authors
Copyright 2018-2023 The OpenZipkin Authors
Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
in compliance with the License. You may obtain a copy of the License at
Expand Down Expand Up @@ -113,7 +113,7 @@
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-loader-tools</artifactId>
<version>2.4.0</version>
<version>2.7.18</version>
<scope>provided</scope>
</dependency>

Expand Down
14 changes: 11 additions & 3 deletions src/main/java/zipkin/layout/ZipkinLayoutFactory.java
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2018-2020 The OpenZipkin Authors
* Copyright 2018-2023 The OpenZipkin Authors
*
* Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
* in compliance with the License. You may obtain a copy of the License at
Expand Down Expand Up @@ -50,12 +50,20 @@ public void setName(String name) {
}

// If the scope of the library is CUSTOM, then the libs will be repackaged to "libs/" directory
@Override public String getLibraryDestination(String libraryName, LibraryScope scope) {
@Override public String getLibraryLocation(String libraryName, LibraryScope scope) {
return "lib/";
}

@Override public String getClassesLocation() {
return null;
return "classes/";
}

@Override public String getClasspathIndexFileLocation() {
return Layout.super.getClasspathIndexFileLocation();
}

@Override public String getLayersIndexFileLocation() {
return Layout.super.getLayersIndexFileLocation();
}

// Marking the jar as non executable
Expand Down

0 comments on commit 127517a

Please sign in to comment.