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

Switch to codehaus plexus-build-api 1.2.0 #345

Merged
merged 2 commits into from
Jun 6, 2023
Merged

Switch to codehaus plexus-build-api 1.2.0 #345

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
59097d6
Switch to codehaus plexus-build-api 1.1.0
gnodet May 23, 2023
13f3dab
Switch to codehaus plexus-build-api 1.2.0
gnodet Jun 2, 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
2 changes: 1 addition & 1 deletion modello-core/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@

<dependencies>
<dependency>
<groupId>org.sonatype.plexus</groupId>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-build-api</artifactId>
</dependency>
<dependency>
Expand Down
2 changes: 1 addition & 1 deletion modello-core/src/main/java/org/codehaus/modello/plugin/AbstractModelloGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,14 +43,14 @@
import org.codehaus.modello.model.Version;
import org.codehaus.plexus.PlexusConstants;
import org.codehaus.plexus.PlexusContainer;
import org.codehaus.plexus.build.BuildContext;
import org.codehaus.plexus.component.repository.exception.ComponentLookupException;
import org.codehaus.plexus.context.Context;
import org.codehaus.plexus.context.ContextException;
import org.codehaus.plexus.logging.AbstractLogEnabled;
import org.codehaus.plexus.personality.plexus.lifecycle.phase.Contextualizable;
import org.codehaus.plexus.util.StringUtils;
import org.codehaus.plexus.util.io.CachingWriter;
import org.sonatype.plexus.build.incremental.BuildContext;

/**
* @author <a href="mailto:[email protected]">Jason van Zyl</a>
Expand Down
2 changes: 1 addition & 1 deletion modello-maven-plugin/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@
<artifactId>modello-plugin-velocity</artifactId>
</dependency>
<dependency>
<groupId>org.sonatype.plexus</groupId>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-build-api</artifactId>
</dependency>
</dependencies>
Expand Down
2 changes: 1 addition & 1 deletion ...o-maven-plugin/src/main/java/org/codehaus/modello/maven/AbstractModelloGeneratorMojo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,8 @@
import org.codehaus.modello.core.ModelloCore;
import org.codehaus.modello.model.Model;
import org.codehaus.modello.model.ModelValidationException;
import org.codehaus.plexus.build.BuildContext;
import org.codehaus.plexus.util.StringUtils;
import org.sonatype.plexus.build.incremental.BuildContext;

/**
* @author <a href="mailto:[email protected]">Trygve Laugst&oslash;l</a>
Expand Down
8 changes: 7 additions & 1 deletion modello-maven-plugin/src/test/java/org/codehaus/modello/maven/ModelloConvertersMojoTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,10 @@
import java.util.Arrays;

import org.codehaus.modello.core.ModelloCore;
import org.codehaus.plexus.ContainerConfiguration;
import org.codehaus.plexus.PlexusTestCase;
import org.codehaus.plexus.build.BuildContext;
import org.codehaus.plexus.util.FileUtils;
import org.sonatype.plexus.build.incremental.BuildContext;

/**
* @author <a href="mailto:[email protected]">Brett Porter</a>
Expand Down Expand Up @@ -98,4 +99,9 @@ public void testModelloConvertersMojo() throws Exception {

assertFalse("The generated java file doesn't exist: '" + javaFile.getAbsolutePath() + "'.", javaFile.exists());
}

@Override
protected void customizeContainerConfiguration(ContainerConfiguration containerConfiguration) {
containerConfiguration.setClassPathScanning("cache");
}
}
8 changes: 7 additions & 1 deletion modello-maven-plugin/src/test/java/org/codehaus/modello/maven/ModelloJavaMojoTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,10 @@
import java.util.Arrays;

import org.codehaus.modello.core.ModelloCore;
import org.codehaus.plexus.ContainerConfiguration;
import org.codehaus.plexus.PlexusTestCase;
import org.codehaus.plexus.build.BuildContext;
import org.codehaus.plexus.util.FileUtils;
import org.sonatype.plexus.build.incremental.BuildContext;

/**
* @author <a href="mailto:[email protected]">Trygve Laugst&oslash;l</a>
Expand Down Expand Up @@ -96,4 +97,9 @@ public void testModelloJavaMojo() throws Exception {
assertFalse(
"The generated java file shouldn't exist: '" + javaFile.getAbsolutePath() + "'.", javaFile.exists());
}

@Override
protected void customizeContainerConfiguration(ContainerConfiguration containerConfiguration) {
containerConfiguration.setClassPathScanning("cache");
}
}
2 changes: 1 addition & 1 deletion modello-plugins/modello-plugin-java/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
<artifactId>plexus-utils</artifactId>
</dependency>
<dependency>
<groupId>org.sonatype.plexus</groupId>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-build-api</artifactId>
</dependency>

Expand Down
6 changes: 6 additions & 0 deletions modello-test/src/main/java/org/codehaus/modello/AbstractModelloGeneratorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@
import java.util.Optional;
import java.util.Properties;

import org.codehaus.plexus.ContainerConfiguration;
import org.codehaus.plexus.PlexusTestCase;
import org.codehaus.plexus.util.FileUtils;
import org.codehaus.plexus.util.ReaderFactory;
Expand Down Expand Up @@ -107,4 +108,9 @@ protected SAXParser createSaxParserWithSchema(String generatedXsdName)
new File(getOutputDirectory(), generatedXsdName));
return saxParser;
}

@Override
protected void customizeContainerConfiguration(ContainerConfiguration containerConfiguration) {
containerConfiguration.setClassPathScanning("cache");
}
}
4 changes: 2 additions & 2 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -342,9 +342,9 @@
<version>3.5.1</version>
</dependency>
<dependency>
<groupId>org.sonatype.plexus</groupId>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-build-api</artifactId>
<version>0.0.7</version>
<version>1.2.0</version>
</dependency>
<dependency>
<groupId>junit</groupId>
Expand Down