Skip to content

Commit b2070b3

Browse files
subhramitkoppor
andauthored
Clean build process (#12970)
* Clean build process Signed-off-by: subhramit <[email protected]> * Update guava version --------- Signed-off-by: subhramit <[email protected]> Co-authored-by: Oliver Kopp <[email protected]>
1 parent bc19818 commit b2070b3

File tree

2 files changed

+3
-17
lines changed

2 files changed

+3
-17
lines changed

build.gradle

Lines changed: 2 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -227,10 +227,7 @@ dependencies {
227227
exclude module: 'oraclepki'
228228
}
229229

230-
implementation ('com.google.guava:guava:33.1.0-jre') {
231-
// TODO: Remove this as soon as https://github.com/google/guava/issues/2960 is fixed
232-
exclude module: "jsr305"
233-
}
230+
implementation 'com.google.guava:guava:33.4.8-jre'
234231

235232
implementation 'jakarta.annotation:jakarta.annotation-api:2.1.1'
236233
implementation 'jakarta.inject:jakarta.inject-api:2.0.1'
@@ -565,18 +562,7 @@ tasks.register('generateCitationStyleCatalog', JavaExec) {
565562
}
566563

567564
jar.dependsOn('generateCitationStyleCatalog')
568-
569-
// catalog from above task needs to be copied to build output for tests
570-
tasks.register('copyCitationStyleCatalog', Copy) {
571-
from 'src/main/resources/citation-style-catalog.json'
572-
into 'build/resources/main'
573-
mustRunAfter 'checkstyleMain'
574-
dependsOn 'generateCitationStyleCatalog'
575-
}
576-
577-
compileTestJava.dependsOn('copyCitationStyleCatalog')
578-
generateJournalListMV.dependsOn('copyCitationStyleCatalog')
579-
generateLtwaListMV.dependsOn('copyCitationStyleCatalog')
565+
compileTestJava.dependsOn("generateCitationStyleCatalog")
580566

581567
tasks.register('generateCitaviSource', XjcTask) {
582568
group = 'JabRef'

src/main/java/org/jabref/logic/citationstyle/CitationStyleCatalogGenerator.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
@AllowedToUseClassGetResource("Required for loading internal CSL styles")
2626
public class CitationStyleCatalogGenerator {
2727
private static final String STYLES_ROOT = "/csl-styles";
28-
private static final String CATALOG_PATH = "src/main/resources/citation-style-catalog.json";
28+
private static final String CATALOG_PATH = "build/resources/main/citation-style-catalog.json";
2929
private static final String DEFAULT_STYLE = "ieee.csl";
3030

3131
private static final Logger LOGGER = LoggerFactory.getLogger(CitationStyleCatalogGenerator.class);

0 commit comments

Comments
 (0)