Skip to content

Commit b23d7db

Browse files
Move to new Enforcer API - require m-enforcer-p 3.2.0
fix #256
1 parent b7ba48d commit b23d7db

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+380
-499
lines changed

pom.xml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -153,6 +153,10 @@
153153
</execution>
154154
</executions>
155155
</plugin>
156+
<plugin>
157+
<groupId>org.eclipse.sisu</groupId>
158+
<artifactId>sisu-maven-plugin</artifactId>
159+
</plugin>
156160
</plugins>
157161
</build>
158162

src/it/circular-simple/verify.groovy

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
File file = new File(basedir, "build.log");
2+
assert file.exists();
3+
4+
String text = file.getText("utf-8");
5+
6+
7+
assert text.contains('ERROR] Rule 0: org.codehaus.mojo.extraenforcer.dependencies.BanCircularDependencies failed with message:')
8+
assert text.contains('[ERROR] Circular Dependency found. Your project\'s groupId:artifactId combination must not exist in the list of direct or transitive dependencies.')
9+
10+
return true;

src/it/mojo-1744/verify.groovy

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
* specific language governing permissions and limitations
1717
* under the License.
1818
*/
19-
import org.codehaus.mojo.extraenforcerrules.it.BanDuplicateClassesLogParser;
19+
import org.codehaus.mojo.extraenforcer.it.BanDuplicateClassesLogParser;
2020

2121
File log = new File( basedir, 'build.log' )
2222
assert log.exists()

src/it/mojo-1853/verify.groovy

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
final File file = new File( basedir, "build.log" );
22
final String buf = file.getText("utf-8");
33

4-
assert buf.contains(/org.apache.maven.plugins.enforcer.RequirePropertyDiverges failed with message/);
4+
assert buf.contains(/org.codehaus.mojo.extraenforcer.model.RequirePropertyDiverges failed with message/);
55

66
assert buf.contains('Property \'project.url\' evaluates to \'http://company/company-parent-pom/child-fail');
77

src/it/mojo-1929/verify.groovy

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
final File file = new File( basedir, "build.log" );
22
final String buf = file.getText("utf-8");
33

4-
assert buf.contains(/org.apache.maven.plugins.enforcer.RequirePropertyDiverges failed with message/);
4+
assert buf.contains(/org.codehaus.mojo.extraenforcer.model.RequirePropertyDiverges failed with message/);
55

66
assert buf.contains('Property \'project.url\' evaluates to \'http://company/company-parent-pom/child-fail');
77

src/it/require-project-url-missing/verify.groovy

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@ File file = new File( basedir, "build.log" );
22
assert file.exists();
33

44
String text = file.getText("utf-8");
5-
assert text.contains('org.apache.maven.plugins.enforcer.RequireProjectUrl failed with message');
5+
assert text.contains('org.codehaus.mojo.extraenforcer.model.RequireProjectUrl failed with message');
66

77
return true;

src/it/require-project-url-present/verify.groovy

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@ File file = new File( basedir, "build.log" );
22
assert file.exists();
33

44
String text = file.getText("utf-8");
5-
assert !text.contains('org.apache.maven.plugins.enforcer.RequireProjectUrl failed with message');
5+
assert !text.contains('org.codehaus.mojo.extraenforcer.model.RequireProjectUrl failed with message');
66

77
return true;

src/it/require-project-url-regex/verify.groovy

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@ File file = new File( basedir, "build.log" );
22
assert file.exists();
33

44
String text = file.getText("utf-8");
5-
assert text.contains('org.apache.maven.plugins.enforcer.RequireProjectUrl failed with message');
5+
assert text.contains('org.codehaus.mojo.extraenforcer.model.RequireProjectUrl failed with message');
66

77
return true;

src/it/require-property-diverges/verify.groovy

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
final File file = new File( basedir, "build.log" );
22
final String buf = file.getText( "utf-8" );
33

4-
assert buf.contains(/org.apache.maven.plugins.enforcer.RequirePropertyDiverges failed with message/);
4+
assert buf.contains(/org.codehaus.mojo.extraenforcer.model.RequirePropertyDiverges failed with message/);
55

66
assert buf.contains('Property \'project.issueManagement\' is required for this build and not defined in hierarchy at all.');
77

src/it/require-roles-missing-contributor/verify.groovy

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@ File file = new File( basedir, "build.log" );
22
assert file.exists();
33

44
String text = file.getText("utf-8");
5-
assert text.contains('org.apache.maven.plugins.enforcer.RequireContributorRoles failed with message');
5+
assert text.contains('org.codehaus.mojo.extraenforcer.model.RequireContributorRoles failed with message');
66
assert text.contains('Found no contributor representing role(s) \'[quality manager]\'');
77
return true;

0 commit comments

Comments
 (0)