Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix failing tests in java17 CI run #198

Merged
merged 2 commits into from
Feb 4, 2023
Merged

fix failing tests in java17 CI run #198

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dc2e900
fix failing tests in java17 ci run
pjfanning Feb 3, 2023
6df8246
fix provided by @jjohannes
pjfanning Feb 4, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 0 additions & 13 deletions .travis.yml
View file
Open in desktop

This file was deleted.

49 changes: 49 additions & 0 deletions afterburner/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,56 @@ field access and method calls
<groupId>org.moditect</groupId>
<artifactId>moditect-maven-plugin</artifactId>
</plugin>
<plugin>
<groupId>io.github.floverfelt</groupId>
<artifactId>find-and-replace-maven-plugin</artifactId>
<version>1.1.0</version>
<executions>
<execution>
<id>exec</id>
<phase>package</phase>
<goals>
<goal>find-and-replace</goal>
</goals>
<configuration>
<replacementType>file-contents</replacementType>
<baseDir>${basedir}</baseDir>
<findRegex><![CDATA[<modelVersion>4.0.0</modelVersion>]]></findRegex>
<fileMask>dependency-reduced-pom.xml</fileMask>
<replaceValue><![CDATA[ <!-- This module was also published with a richer model, Gradle metadata, -->
<!-- which should be used instead. Do not delete the following line which -->
<!-- is to indicate to Gradle or any Gradle module metadata file consumer -->
<!-- that they should prefer consuming it instead. -->
<!-- do_not_remove: published-with-gradle-metadata -->
<modelVersion>4.0.0</modelVersion>]]></replaceValue>
<recursive>false</recursive>
</configuration>
</execution>
</executions>
</plugin>
</plugins>

</build>

<profiles>
<profile>
<!-- And different set up for JDK 17+ -->
<id>java17+</id>
<activation>
<jdk>[17,)</jdk>
</activation>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>3.0.0-M8</version>
<configuration>
<argLine>--add-opens java.base/java.lang=ALL-UNNAMED</argLine>
</configuration>
</plugin>
</plugins>
</build>
</profile>
</profiles>
</project>
21 changes: 21 additions & 0 deletions blackbird/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,4 +72,25 @@ that uses LambdaMetafactory based code generation to replace reflection calls.
</plugin>
</plugins>
</build>
<profiles>
<profile>
<!-- And different set up for JDK 17+ -->
<id>java17+</id>
<activation>
<jdk>[17,)</jdk>
</activation>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>3.0.0-M8</version>
<configuration>
<argLine>--add-opens java.base/javax.security.auth=ALL-UNNAMED</argLine>
</configuration>
</plugin>
</plugins>
</build>
</profile>
</profiles>
</project>
22 changes: 22 additions & 0 deletions osgi/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,4 +70,26 @@
</plugins>
</build>

<profiles>
<profile>
<!-- And different set up for JDK 17+ -->
<id>java17+</id>
<activation>
<jdk>[17,)</jdk>
</activation>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>3.0.0-M8</version>
<configuration>
<argLine>--add-opens java.base/java.lang=ALL-UNNAMED</argLine>
</configuration>
</plugin>
</plugins>
</build>
</profile>
</profiles>

</project>
17 changes: 8 additions & 9 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>com.fasterxml.jackson</groupId>
<artifactId>jackson-base</artifactId>
Expand All @@ -11,7 +11,7 @@
<version>2.14.3-SNAPSHOT</version>
<packaging>pom</packaging>
<description>Parent pom for Jackson "base" modules: modules that build directly on databind, and are
not datatype, data format, or JAX-RS provider modules.
not datatype, data format, or JAX-RS provider modules.
</description>

<licenses>
Expand Down Expand Up @@ -78,27 +78,27 @@ not datatype, data format, or JAX-RS provider modules.
<build>
<pluginManagement>
<plugins>
<plugin>
<!-- Inherited from oss-base. Generate PackageVersion.java.-->
<plugin>
<!-- Inherited from oss-base. Generate PackageVersion.java.-->
<groupId>com.google.code.maven-replacer-plugin</groupId>
<artifactId>replacer</artifactId>
<executions>
<executions>
<execution>
<id>process-packageVersion</id>
<phase>generate-sources</phase>
</execution>
</executions>
</plugin>
</plugin>

<plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<excludes>
<exclude>com/fasterxml/jackson/**/failing/*.java</exclude>
</excludes>
</configuration>
</plugin>
</plugin>
</plugins>
</pluginManagement>

pjfanning marked this conversation as resolved.
Show resolved Hide resolved
Expand All @@ -109,5 +109,4 @@ not datatype, data format, or JAX-RS provider modules.
</plugin>
</plugins>
</build>

</project>