Skip to content

Fix ITs for Maven 4 compat #1325

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

Open
Bukama wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix ITs for Maven 4 compat #1325

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
45 changes: 30 additions & 15 deletions src/it/projects/dependency-sets/massembly-1008/verify.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,22 +16,37 @@
* specific language governing permissions and limitations
* under the License.
*/
def expectedFilenames = null

import java.io.*;

def expectedFilenames = [
"aopalliance-1.0.jar",
"checker-qual-3.12.0.jar",
"error_prone_annotations-2.7.1.jar",
"failureaccess-1.0.1.jar",
"guava-31.0.1-jre.jar",
"guice-6.0.0.jar",
"j2objc-annotations-1.3.jar",
"jakarta.inject-api-2.0.1.jar",
"javax.inject-1.jar",
"jsr305-3.0.2.jar",
"listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar"
]
if (mavenVersion.startsWith('4.')) {
expectedFilenames = [
"aopalliance-1.0.jar",
"checker-qual-3.12.0.jar",
"error_prone_annotations-2.18.0.jar", // comes from guava 32.0.0-jre dependency runtime-dependency (not the test one)
"failureaccess-1.0.1.jar",
"guava-31.0.1-jre.jar",
"guice-6.0.0.jar",
"j2objc-annotations-1.3.jar",
"jakarta.inject-api-2.0.1.jar",
"javax.inject-1.jar",
"jsr305-3.0.1.jar", // funny that this is lower than in Maven 3
"listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar"
]
} else {
expectedFilenames = [
"aopalliance-1.0.jar",
"checker-qual-3.12.0.jar",
"error_prone_annotations-2.7.1.jar",
"failureaccess-1.0.1.jar",
"guava-31.0.1-jre.jar",
"guice-6.0.0.jar",
"j2objc-annotations-1.3.jar",
"jakarta.inject-api-2.0.1.jar",
"javax.inject-1.jar",
"jsr305-3.0.2.jar",
"listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar"
]
}

File assemblyBasedir = new File( basedir, "target/massembly-1008-1-bin/" )

Expand Down
2 changes: 1 addition & 1 deletion src/it/projects/dependency-sets/massembly-969/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ under the License.
<version>1</version>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<javafx.version>20</javafx.version>
<javafx.version>26</javafx.version>
</properties>
<dependencies>
<dependency>
Expand Down
25 changes: 11 additions & 14 deletions src/it/projects/dependency-sets/massembly-969/verify.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,20 +16,17 @@
* specific language governing permissions and limitations
* under the License.
*/

import java.io.*;

def expectedFilenames = [ "javafx-base-20.jar",
"javafx-controls-20-linux.jar",
"javafx-media-20-linux.jar",
"javafx-web-20.jar",
"javafx-base-20-linux.jar",
"javafx-graphics-20-linux.jar",
"javafx-swing-20.jar",
"javafx-web-20-linux.jar",
"javafx-controls-20.jar",
"javafx-media-20.jar",
"javafx-swing-20-linux.jar"
def expectedFilenames = [ "javafx-base-26.jar",
"javafx-controls-26-linux.jar",
"javafx-media-26-linux.jar",
"javafx-web-26.jar",
"javafx-base-26-linux.jar",
"javafx-graphics-26-linux.jar",
"javafx-swing-26.jar",
"javafx-web-26-linux.jar",
"javafx-controls-26.jar",
"javafx-media-26.jar",
"javafx-swing-26-linux.jar"
]

File assemblyBasedir = new File( basedir, "target/massembly-969-1-bin/" )
Expand Down
2 changes: 1 addition & 1 deletion src/it/projects/mojo-configuration/massembly-291/test.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,4 @@
# specific language governing permissions and limitations
# under the License.

altDeploymentRepository=test::default::file://${project.build.directory}/deploy
altDeploymentRepository=test::default::file:./deploy
4 changes: 1 addition & 3 deletions ...jo-configuration/massembly-291/verify.bsh → ...configuration/massembly-291/verify.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,8 @@
* specific language governing permissions and limitations
* under the License.
*/
String base = "./deploy/org/test/massembly-291/1/massembly-291-1";

import java.io.*;

String base = "target/deploy/org/test/massembly-291/1/massembly-291-1";
File pom = new File( basedir, base + ".pom" );
File zip = new File( basedir, base + ".zip" );
File tgz = new File( basedir, base + ".tar.gz" );
Expand Down
2 changes: 1 addition & 1 deletion src/it/projects/mojo-configuration/massembly-301/test.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,4 @@
# specific language governing permissions and limitations
# under the License.

altDeploymentRepository=test::default::file://${project.build.directory}/deploy
altDeploymentRepository=test::default::file:./deploy
3 changes: 1 addition & 2 deletions ...jo-configuration/massembly-301/verify.bsh → ...configuration/massembly-301/verify.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,8 @@
* under the License.
*/

import java.io.*;
String base = "./deploy/org/test/massembly-301/1/massembly-301-1";

String base = "target/deploy/org/test/massembly-301/1/massembly-301-1";
File jar = new File( basedir, base + ".jar" );
File zip = new File( basedir, base + ".zip" );
File tgz = new File( basedir, base + ".tar.gz" );
Expand Down
Loading