Added WEB-INF/lib-provided support
This commit is contained in:
parent
a805b35073
commit
17de9a8026
8 changed files with 59 additions and 18 deletions
4
.idea/libraries/bld.xml
generated
4
.idea/libraries/bld.xml
generated
|
|
@ -2,12 +2,12 @@
|
|||
<library name="bld">
|
||||
<CLASSES>
|
||||
<root url="file://$PROJECT_DIR$/lib/bld" />
|
||||
<root url="jar://$USER_HOME$/.bld/dist/bld-1.7.5.jar!/" />
|
||||
<root url="jar://$USER_HOME$/.bld/dist/bld-1.8.0-SNAPSHOT.jar!/" />
|
||||
</CLASSES>
|
||||
<JAVADOC />
|
||||
<SOURCES>
|
||||
<root url="file://$PROJECT_DIR$/lib/bld" />
|
||||
<root url="jar://$USER_HOME$/.bld/dist/bld-1.7.5-sources.jar!/" />
|
||||
<root url="jar://$USER_HOME$/.bld/dist/bld-1.8.0-SNAPSHOT.jar!/" />
|
||||
</SOURCES>
|
||||
<excluded>
|
||||
<root url="jar://$PROJECT_DIR$/lib/bld/bld-wrapper.jar!/" />
|
||||
|
|
|
|||
7
examples/.idea/misc.xml
generated
7
examples/.idea/misc.xml
generated
|
|
@ -1,4 +1,10 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project version="4">
|
||||
<component name="EntryPointsManager">
|
||||
<pattern value="com.example.demo.DemoApplicationBuild" method="bootjar" />
|
||||
<pattern value="com.example.demo.DemoApplicationBuild" method="bootwar" />
|
||||
<pattern value="com.example.demo.DemoApplicationBuild" />
|
||||
</component>
|
||||
<component name="PDMPlugin">
|
||||
<option name="customRuleSets">
|
||||
<list>
|
||||
|
|
@ -7,6 +13,7 @@
|
|||
<option value="$PROJECT_DIR$/../../bld-checkstyle/config/pmd.xml" />
|
||||
<option value="$PROJECT_DIR$/../../bld-exec/config/pmd.xml" />
|
||||
<option value="$PROJECT_DIR$/../../bld-testng/config/pmd.xml" />
|
||||
<option value="$PROJECT_DIR$/../../bld-pitest/config/pmd.xml" />
|
||||
</list>
|
||||
</option>
|
||||
<option name="skipTestSources" value="false" />
|
||||
|
|
|
|||
|
|
@ -4,4 +4,4 @@ bld.extensions=com.uwyn.rife2:bld-spring-boot:0.9.0-SNAPSHOT
|
|||
bld.repositories=MAVEN_LOCAL,MAVEN_CENTRAL,RIFE2_SNAPSHOTS,RIFE2_RELEASES
|
||||
bld.downloadLocation=
|
||||
bld.sourceDirectories=
|
||||
bld.version=1.7.5
|
||||
bld.version=1.8.0-SNAPSHOT
|
||||
|
|
|
|||
|
|
@ -4,4 +4,4 @@ bld.extension-pmd=com.uwyn.rife2:bld-pmd:0.9.4
|
|||
bld.repositories=MAVEN_LOCAL,MAVEN_CENTRAL,RIFE2_RELEASES
|
||||
bld.downloadLocation=
|
||||
bld.sourceDirectories=
|
||||
bld.version=1.7.5
|
||||
bld.version=1.8.0-SNAPSHOT
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* Copyright 2023 the original author or authors.
|
||||
* Copyright 2023-2024 the original author or authors.
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
|
|
@ -39,14 +39,14 @@ public class SpringBootBuild extends Project {
|
|||
downloadSources = true;
|
||||
autoDownloadPurge = true;
|
||||
|
||||
repositories = List.of(MAVEN_LOCAL, MAVEN_CENTRAL, RIFE2_RELEASES);
|
||||
repositories = List.of(MAVEN_LOCAL, MAVEN_CENTRAL, RIFE2_RELEASES, RIFE2_SNAPSHOTS);
|
||||
|
||||
scope(compile)
|
||||
.include(dependency("com.uwyn.rife2", "bld", version(1, 7, 5)));
|
||||
.include(dependency("com.uwyn.rife2", "bld", version(1, 8, 0, "SNAPSHOT")));
|
||||
scope(test)
|
||||
.include(dependency("org.junit.jupiter", "junit-jupiter", version(5, 10, 1)))
|
||||
.include(dependency("org.junit.platform", "junit-platform-console-standalone", version(1, 10, 1)))
|
||||
.include(dependency("org.assertj", "assertj-core", version(3, 24, 2)));
|
||||
.include(dependency("org.assertj", "assertj-core", version(3, 25, 1)));
|
||||
|
||||
javadocOperation()
|
||||
.javadocOptions()
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* Copyright 2023 the original author or authors.
|
||||
* Copyright 2023-2024 the original author or authors.
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
|
|
@ -22,6 +22,7 @@ import rife.tools.FileUtils;
|
|||
import java.io.File;
|
||||
import java.io.IOException;
|
||||
import java.nio.file.Files;
|
||||
import java.util.Collection;
|
||||
import java.util.List;
|
||||
import java.util.logging.Level;
|
||||
import java.util.logging.Logger;
|
||||
|
|
@ -76,6 +77,23 @@ public class BootJarOperation extends AbstractBootOperation<BootJarOperation> {
|
|||
|
||||
/**
|
||||
* Configures the operation from a {@link Project}.
|
||||
* <p>
|
||||
* Sets the following:
|
||||
* <ul>
|
||||
* <li>The {@link #destinationFileName(String) destination file name} to
|
||||
* {@link Project#archiveBaseName() archiveBaseName} and {@link Project#version() version}</li>
|
||||
* <li>The {@link #infLibs(File...) INF libs} to {@link Project#compileClasspathJars() compileClasspathJars}
|
||||
* and {@link Project#runtimeClasspathJars() runtimeClasspathJars}</li>
|
||||
* <li>The {@link #launcherClass(String) launcher class} to {@code JarLauncher}</li>
|
||||
* <li>The {@link #launcherLibs(Collection) launcher libs} to
|
||||
* {@link Project#standaloneClasspathJars() standaloneClasspathJars}</li>
|
||||
* <li>The {@link #mainClass(String) main class} to {@link Project#mainClass() mainClass}</li>
|
||||
* <li>The {@code Manifest-Version}, {@code Main-Class} and {@code Start-Class}
|
||||
* {@link #manifestAttributes(Collection) manifest attributes}</li>
|
||||
* <li>The {@link #sourceDirectories(File...) source directories} to
|
||||
* {@link Project#buildMainDirectory() buildMainDirectory} and
|
||||
* {@link Project#srcMainResourcesDirectory() srcMainResourcesDirectory}</li>
|
||||
* </ul>
|
||||
*
|
||||
* @param project the project
|
||||
* @return this operation instance
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* Copyright 2023 the original author or authors.
|
||||
* Copyright 2023-2024 the original author or authors.
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
|
|
@ -99,6 +99,24 @@ public class BootWarOperation extends AbstractBootOperation<BootWarOperation> {
|
|||
|
||||
/**
|
||||
* Configures the operation from a {@link Project}.
|
||||
* <p>
|
||||
* Sets the following:
|
||||
* <ul>
|
||||
* <li>The {@link #destinationFileName(String) destination file name} to
|
||||
* {@link Project#archiveBaseName() archiveBaseName} and {@link Project#version() version}</li>
|
||||
* <li>The {@link #infLibs(File...) INF libs} to {@link Project#compileClasspathJars() compileClasspathJars},
|
||||
* {@link Project#runtimeClasspathJars() runtimeClasspathJars} and
|
||||
* {@link Project#buildDistDirectory() buildDistDirectory}</li>
|
||||
* <li>The {@link #launcherClass(String) launcher class} to {@code WarLauncher}</li>
|
||||
* <li>The {@link #launcherLibs(Collection) launcher libs} to
|
||||
* {@link Project#standaloneClasspathJars() standaloneClasspathJars}</li>
|
||||
* <li>The {@link #mainClass(String) main class} to {@link Project#mainClass() mainClass}</li>
|
||||
* <li>The {@code Manifest-Version}, {@code Main-Class} and {@code Start-Class}
|
||||
* {@link #manifestAttributes(Collection) manifest attributes}</li>
|
||||
* <li>The {@link #sourceDirectories(File...) source directories} to
|
||||
* {@link Project#buildMainDirectory() buildMainDirectory} and
|
||||
* {@link Project#srcMainResourcesDirectory() srcMainResourcesDirectory}</li>
|
||||
* </ul>
|
||||
*
|
||||
* @param project the project
|
||||
* @return this operation instance
|
||||
|
|
@ -118,11 +136,9 @@ public class BootWarOperation extends AbstractBootOperation<BootWarOperation> {
|
|||
new BootManifestAttribute("Main-Class", launcherClass()),
|
||||
new BootManifestAttribute("Start-Class", mainClass())
|
||||
))
|
||||
// TODO enable when bld 1.7.6 is available
|
||||
// .providedLibs(project.providedClasspathJars())
|
||||
.providedLibs(project.providedClasspathJars())
|
||||
.sourceDirectories(project.buildMainDirectory(), project.srcMainResourcesDirectory());
|
||||
}
|
||||
|
||||
/**
|
||||
* Provides libraries that will be used for the WAR creation in {@code /WEB-INF/lib-provided}.
|
||||
*
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* Copyright 2023 the original author or authors.
|
||||
* Copyright 2023-2024 the original author or authors.
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
|
|
@ -34,7 +34,7 @@ import static org.assertj.core.api.Assertions.assertThat;
|
|||
import static org.assertj.core.api.Assertions.assertThatCode;
|
||||
|
||||
class BootJarOperationTest {
|
||||
private static final String BLD = "bld-1.7.5.jar";
|
||||
private static final String BLD = "bld-1.8.0-20240107.042858-1.jar";
|
||||
private static final String EXAMPLES_LIB_COMPILE = "examples/lib/compile/";
|
||||
private static final String EXAMPLES_LIB_RUNTIME = "examples/lib/runtime/";
|
||||
private static final String EXAMPLES_LIB_STANDALONE = "examples/lib/standalone/";
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue