You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by kh...@apache.org on 2018/08/19 17:08:24 UTC
[maven-verifier-plugin] 01/01: [MVERIFIER-32] - Move model package
to org.apache.maven.plugins.verifier.model
This is an automated email from the ASF dual-hosted git repository.
khmarbaise pushed a commit to branch MVERIFIER-32
in repository https://gitbox.apache.org/repos/asf/maven-verifier-plugin.git
commit f3c90e02d0fb902e8ff5c29108553bead92a54b6
Author: Karl Heinz Marbaise <kh...@apache.org>
AuthorDate: Sun Aug 19 19:08:16 2018 +0200
[MVERIFIER-32] - Move model package to org.apache.maven.plugins.verifier.model
---
pom.xml | 1 +
.../verifier/ConsoleVerificationResultPrinter.java | 6 +--
.../maven/plugins/verifier/VerificationResult.java | 2 +-
.../maven/plugins/verifier/VerifierMojo.java | 45 +++++++++++++++-------
src/main/mdo/verifications.mdo | 4 +-
5 files changed, 39 insertions(+), 19 deletions(-)
diff --git a/pom.xml b/pom.xml
index c20b72e..7279df5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -63,6 +63,7 @@ under the License.
<properties>
<mavenVersion>3.0</mavenVersion>
+ <javaVersion>7</javaVersion>
</properties>
<dependencies>
diff --git a/src/main/java/org/apache/maven/plugins/verifier/ConsoleVerificationResultPrinter.java b/src/main/java/org/apache/maven/plugins/verifier/ConsoleVerificationResultPrinter.java
index c777133..64f33a4 100644
--- a/src/main/java/org/apache/maven/plugins/verifier/ConsoleVerificationResultPrinter.java
+++ b/src/main/java/org/apache/maven/plugins/verifier/ConsoleVerificationResultPrinter.java
@@ -51,7 +51,7 @@ public class ConsoleVerificationResultPrinter
{
for ( Object o : results.getExistenceFailures() )
{
- org.apache.maven.plugin.verifier.model.File file = (org.apache.maven.plugin.verifier.model.File) o;
+ org.apache.maven.plugins.verifier.model.File file = (org.apache.maven.plugins.verifier.model.File) o;
printMessage( "File not found [" + file.getLocation() + "]" );
}
@@ -61,7 +61,7 @@ public class ConsoleVerificationResultPrinter
{
for ( Object o : results.getNonExistenceFailures() )
{
- org.apache.maven.plugin.verifier.model.File file = (org.apache.maven.plugin.verifier.model.File) o;
+ org.apache.maven.plugins.verifier.model.File file = (org.apache.maven.plugins.verifier.model.File) o;
printMessage( "File should not exist [" + file.getLocation() + "]" );
}
@@ -71,7 +71,7 @@ public class ConsoleVerificationResultPrinter
{
for ( Object o : results.getContentFailures() )
{
- org.apache.maven.plugin.verifier.model.File file = (org.apache.maven.plugin.verifier.model.File) o;
+ org.apache.maven.plugins.verifier.model.File file = (org.apache.maven.plugins.verifier.model.File) o;
printMessage( "File [" + file.getLocation() + "] does not match regexp [" + file.getContains() + "]" );
}
diff --git a/src/main/java/org/apache/maven/plugins/verifier/VerificationResult.java b/src/main/java/org/apache/maven/plugins/verifier/VerificationResult.java
index 9c34920..c4c7a60 100644
--- a/src/main/java/org/apache/maven/plugins/verifier/VerificationResult.java
+++ b/src/main/java/org/apache/maven/plugins/verifier/VerificationResult.java
@@ -22,7 +22,7 @@ package org.apache.maven.plugins.verifier;
import java.util.ArrayList;
import java.util.List;
-import org.apache.maven.plugin.verifier.model.File;
+import org.apache.maven.plugins.verifier.model.File;
/**
*
diff --git a/src/main/java/org/apache/maven/plugins/verifier/VerifierMojo.java b/src/main/java/org/apache/maven/plugins/verifier/VerifierMojo.java
index 56979fb..5132efe 100644
--- a/src/main/java/org/apache/maven/plugins/verifier/VerifierMojo.java
+++ b/src/main/java/org/apache/maven/plugins/verifier/VerifierMojo.java
@@ -19,23 +19,42 @@ package org.apache.maven.plugins.verifier;
* under the License.
*/
+import java.io.File;
+import java.io.FileReader;
+import java.io.IOException;
+import java.io.Reader;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
import org.apache.maven.plugin.AbstractMojo;
import org.apache.maven.plugin.MojoExecutionException;
-import org.apache.maven.plugin.verifier.model.Verifications;
-import org.apache.maven.plugin.verifier.model.io.xpp3.VerificationsXpp3Reader;
import org.apache.maven.plugins.annotations.LifecyclePhase;
import org.apache.maven.plugins.annotations.Mojo;
import org.apache.maven.plugins.annotations.Parameter;
+import org.apache.maven.plugins.verifier.model.Verifications;
+import org.apache.maven.plugins.verifier.model.io.xpp3.VerificationsXpp3Reader;
import org.codehaus.plexus.util.FileUtils;
import org.codehaus.plexus.util.IOUtil;
-import java.io.File;
-import java.io.FileReader;
-import java.io.IOException;
-import java.io.Reader;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
/**
* Verifies the existence or non-existence of files/directories and optionally checks file content against a regular
* expression.
@@ -115,7 +134,7 @@ public class VerifierMojo
reader.close();
reader = null;
- for ( org.apache.maven.plugin.verifier.model.File file : verifications.getFiles() )
+ for ( org.apache.maven.plugins.verifier.model.File file : verifications.getFiles() )
{
// Transform the file to check into an absolute path prefixing the basedir if
// the location is relative
@@ -146,7 +165,7 @@ public class VerifierMojo
return results;
}
- private boolean verifyFile( org.apache.maven.plugin.verifier.model.File fileCheck, VerificationResult results )
+ private boolean verifyFile( org.apache.maven.plugins.verifier.model.File fileCheck, VerificationResult results )
throws IOException
{
boolean result;
@@ -161,7 +180,7 @@ public class VerifierMojo
}
// CHECKSTYLE_OFF: LineLength
- private boolean verifyFileContent( org.apache.maven.plugin.verifier.model.File fileCheck, VerificationResult results )
+ private boolean verifyFileContent( org.apache.maven.plugins.verifier.model.File fileCheck, VerificationResult results )
throws IOException
{
boolean result = false;
@@ -187,7 +206,7 @@ public class VerifierMojo
}
// CHECKSTYLE_ON: LineLength
- private boolean verifyFileExistence( org.apache.maven.plugin.verifier.model.File fileCheck,
+ private boolean verifyFileExistence( org.apache.maven.plugins.verifier.model.File fileCheck,
VerificationResult results )
{
boolean result;
diff --git a/src/main/mdo/verifications.mdo b/src/main/mdo/verifications.mdo
index b49a657..d39ac11 100644
--- a/src/main/mdo/verifications.mdo
+++ b/src/main/mdo/verifications.mdo
@@ -32,7 +32,7 @@ under the License.
<defaults>
<default>
<key>package</key>
- <value>org.apache.maven.plugin.verifier.model</value>
+ <value>org.apache.maven.plugins.verifier.model</value>
</default>
</defaults>
<classes>
@@ -86,4 +86,4 @@ under the License.
</fields>
</class>
</classes>
-</model>
\ No newline at end of file
+</model>