Skip to content

Commit

Permalink
Merge branch '5.3.x' of github.com:joinfaces/joinfaces into 5.4.x
Browse files Browse the repository at this point in the history
  • Loading branch information
larsgrefer committed Nov 21, 2024
2 parents ce68806 + 6a5afea commit 52aee4c
Show file tree
Hide file tree
Showing 9 changed files with 22 additions and 3 deletions.
7 changes: 6 additions & 1 deletion .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,12 @@ updates:
interval: "daily"
- package-ecosystem: "gradle"
directory: "/"
target-branch: "5.2.x"
target-branch: "5.4.x"
schedule:
interval: "daily"
- package-ecosystem: "gradle"
directory: "/"
target-branch: "5.5.x"
schedule:
interval: "daily"

Expand Down
4 changes: 4 additions & 0 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,10 @@ allprojects {
}
}

tasks.withType(JavaCompile).configureEach {
options.compilerArgs += ['-Werror']
}

tasks.withType(Javadoc).configureEach {
failOnError = false
}
Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.11-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,7 @@ public class JakartaFaces3Properties implements ServletContextInitParameterPrope
*
* @see ViewHandler#DEFAULT_SUFFIX_PARAM_NAME
*/
@SuppressWarnings("removal")
@Deprecated(forRemoval = true, since = "5.0.0")
@ServletContextInitParameter(value = ViewHandler.DEFAULT_SUFFIX_PARAM_NAME, listSeparator = " ")
private String defaultSuffix;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -60,9 +60,9 @@ public ServletContainerInitializerRegistrationBean<FacesInitializer2> mojarraSer

/**
* {@link TldListenerRegistrationBean} for the 'jsf_core.tld' of Mojarra 3.
* Not needed for Mojarra 4+.
*
* @return The {@link TldListenerRegistrationBean}.
* @deprecated Not needed for Mojarra 4+.
*/
@Bean
@ConditionalOnResource(resources = "classpath:/META-INF/jsf_core.tld")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,8 @@ public class Primefaces4_0Properties implements ServletContextInitParameterPrope
/**
* Defines uploader mode; auto, native or commons.
*/
@SuppressWarnings("removal")
@Deprecated(since = "PrimeFaces 14", forRemoval = true)
@ServletContextInitParameter(Constants.ContextParams.UPLOADER)
private String uploader;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,8 @@
* @author Nurettin Yilmaz
* @author Lars Grefer
*/
@SuppressWarnings("removal")
@Deprecated(forRemoval = true, since = "Primefaces 14")
@Configuration(proxyBeanMethods = false)
@ConditionalOnClass(FileUploadFilter.class)
@ConditionalOnWebApplication(type = ConditionalOnWebApplication.Type.SERVLET)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,12 @@

import static org.assertj.core.api.Assertions.assertThat;

@Deprecated(forRemoval = true, since = "PrimeFaces 14")
public class FileUploadFilterTest {

private WebApplicationContextRunner webApplicationContextRunner;

@SuppressWarnings("removal")
@BeforeEach
public void setUp() {
this.webApplicationContextRunner = new WebApplicationContextRunner()
Expand Down
3 changes: 3 additions & 0 deletions joinfaces/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,9 @@ dependencies {
compileOnly 'jakarta.servlet:jakarta.servlet-api'
compileOnly 'jakarta.persistence:jakarta.persistence-api'

compileOnly "com.google.code.findbugs:jsr305:3.0.2"
testCompileOnly "com.google.code.findbugs:jsr305:3.0.2"

implementation 'io.github.classgraph:classgraph'

optional 'org.primefaces:primefaces::jakarta'
Expand Down

0 comments on commit 52aee4c

Please sign in to comment.