Author: khmarbaise
Date: Mon Nov 3 21:27:36 2014
New Revision: 1636449
URL: http://svn.apache.org/r1636449
Log:
[MEAR-202] Upgrade to maven-plugins version 25 to 26
- Fixed checkstyle reported errors.
- Added/Fixed missing license headers
Modified:
maven/plugins/trunk/maven-ear-plugin/pom.xml
maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/AbstractEarMojo.java
maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/AbstractXmlWriter.java
maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/ApplicationXmlWriter.java
maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/EarModuleFactory.java
maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/EarMojo.java
maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/GenerateApplicationXmlMojo.java
maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/JbossAppXmlWriter.java
maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/JbossConfiguration.java
maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/util/JavaEEVersion.java
maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/util/ModuleIdentifierValidator.java
maven/plugins/trunk/maven-ear-plugin/src/test/java/org/apache/maven/plugin/ear/util/JavaEEVersionTest.java
maven/plugins/trunk/maven-ear-plugin/src/test/java/org/apache/maven/plugin/ear/util/ModuleIdentifierValidatorTest.java
Modified: maven/plugins/trunk/maven-ear-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/pom.xml?rev=1636449&r1=1636448&r2=1636449&view=diff
==============================================================================
--- maven/plugins/trunk/maven-ear-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-ear-plugin/pom.xml Mon Nov 3 21:27:36 2014
@@ -25,7 +25,7 @@ under the License.
<parent>
<artifactId>maven-plugins</artifactId>
<groupId>org.apache.maven.plugins</groupId>
- <version>25</version>
+ <version>26</version>
<relativePath>../maven-plugins/pom.xml</relativePath>
</parent>
Modified:
maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/AbstractEarMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/AbstractEarMojo.java?rev=1636449&r1=1636448&r2=1636449&view=diff
==============================================================================
---
maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/AbstractEarMojo.java
(original)
+++
maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/AbstractEarMojo.java
Mon Nov 3 21:27:36 2014
@@ -105,7 +105,8 @@ public abstract class AbstractEarMojo
* The {@code standard} means the filename is the artifactId incl. the
version of the artifact.
* The {@code no-version} means the files is only the artifactId without
the version.
* The {@code full} means the filename is the groupId+artifactId+version
of the artifact.
- * The {@code no-version-for-ejb} means the filename is the artifactId
without the version in case of {@code EJB} type.
+ * The {@code no-version-for-ejb} means the filename is the artifactId
without the version in case of
+ * {@code EJB} type.
*/
@Parameter
private String fileNameMapping;
Modified:
maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/AbstractXmlWriter.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/AbstractXmlWriter.java?rev=1636449&r1=1636448&r2=1636449&view=diff
==============================================================================
---
maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/AbstractXmlWriter.java
(original)
+++
maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/AbstractXmlWriter.java
Mon Nov 3 21:27:36 2014
@@ -56,7 +56,9 @@ abstract class AbstractXmlWriter
}
catch ( IOException ex )
{
+ // CHECKSTYLE_OFF: LineLength
throw new EarPluginException( "Exception while opening file[" +
destinationFile.getAbsolutePath() + "]", ex );
+ // CHECKSTYLE_ON: LineLength
}
}
Modified:
maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/ApplicationXmlWriter.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/ApplicationXmlWriter.java?rev=1636449&r1=1636448&r2=1636449&view=diff
==============================================================================
---
maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/ApplicationXmlWriter.java
(original)
+++
maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/ApplicationXmlWriter.java
Mon Nov 3 21:27:36 2014
@@ -56,23 +56,23 @@ final class ApplicationXmlWriter
Writer w = initializeWriter( context.getDestinationFile() );
XMLWriter writer = null;
- if ( JavaEEVersion.OneDotThree.eq( version ) )
+ if ( JavaEEVersion.ONE_DOT_THREE.eq( version ) )
{
writer = initializeRootElementOneDotThree( w );
}
- else if ( JavaEEVersion.OneDotFour.eq( version ) )
+ else if ( JavaEEVersion.ONE_DOT_FOUR.eq( version ) )
{
writer = initializeRootElementOneDotFour( w );
}
- else if ( JavaEEVersion.Five.eq( version ) )
+ else if ( JavaEEVersion.FIVE.eq( version ) )
{
writer = initializeRootElementFive( w );
}
- else if ( JavaEEVersion.Six.eq( version ) )
+ else if ( JavaEEVersion.SIX.eq( version ) )
{
writer = initializeRootElementSix( w );
}
- else if ( JavaEEVersion.Seven.eq( version ) )
+ else if ( JavaEEVersion.SEVEN.eq( version ) )
{
writer = initializeRootElementSeven( w );
}
@@ -84,14 +84,14 @@ final class ApplicationXmlWriter
}
// As from JavaEE6
- if ( version.ge( JavaEEVersion.Six ) )
+ if ( version.ge( JavaEEVersion.SIX ) )
{
writeApplicationName( context.getApplicationName(), writer );
}
// IMPORTANT: the order of the description and display-name elements
was
// reversed between J2EE 1.3 and J2EE 1.4.
- if ( version.eq( JavaEEVersion.OneDotThree ) )
+ if ( version.eq( JavaEEVersion.ONE_DOT_THREE ) )
{
writeDisplayName( context.getDisplayName(), writer );
writeDescription( context.getDescription(), writer );
@@ -103,7 +103,7 @@ final class ApplicationXmlWriter
}
// As from JavaEE6
- if ( version.ge( JavaEEVersion.Six ) )
+ if ( version.ge( JavaEEVersion.SIX ) )
{
writeInitializeInOrder( context.getInitializeInOrder(), writer );
}
@@ -119,12 +119,12 @@ final class ApplicationXmlWriter
securityRole.appendSecurityRole( writer );
}
- if ( version.ge( JavaEEVersion.Five ) )
+ if ( version.ge( JavaEEVersion.FIVE ) )
{
writeLibraryDirectory( context.getLibraryDirectory(), writer );
}
- if ( version.ge( JavaEEVersion.Six ) )
+ if ( version.ge( JavaEEVersion.SIX ) )
{
for ( EnvEntry envEntry : context.getEnvEntries() )
{
@@ -236,8 +236,10 @@ final class ApplicationXmlWriter
writer.startElement( APPLICATION_ELEMENT );
writer.addAttribute( "xmlns", "http://xmlns.jcp.org/xml/ns/javaee"; );
writer.addAttribute( "xmlns:xsi",
"http://www.w3.org/2001/XMLSchema-instance"; );
+ // CHECKSTYLE_OFF: LineLength
writer.addAttribute( "xsi:schemaLocation",
"http://xmlns.jcp.org/xml/ns/javaee
http://xmlns.jcp.org/xml/ns/javaee/application_7.xsd"; );
+ // CHECKSTYLE_ON: LineLength
writer.addAttribute( "version", "7" );
return writer;
}
Modified:
maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/EarModuleFactory.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/EarModuleFactory.java?rev=1636449&r1=1636448&r2=1636449&view=diff
==============================================================================
---
maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/EarModuleFactory.java
(original)
+++
maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/EarModuleFactory.java
Mon Nov 3 21:27:36 2014
@@ -35,7 +35,7 @@ import java.util.List;
*/
public final class EarModuleFactory
{
- public static final List<String> standardArtifactTypes;
+ public static final List<String> STANDARD_ARTIFACT_TYPE;
static
{
@@ -51,7 +51,7 @@ public final class EarModuleFactory
temp.add( "sar" );
temp.add( "wsr" );
temp.add( "har" );
- standardArtifactTypes = Collections.unmodifiableList( temp );
+ STANDARD_ARTIFACT_TYPE = Collections.unmodifiableList( temp );
}
/**
@@ -68,8 +68,10 @@ public final class EarModuleFactory
* @throws UnknownArtifactTypeException if the artifact is not handled
*/
@SuppressWarnings( "deprecation" )
+ // CHECKSTYLE_OFF: LineLength
public static EarModule newEarModule( Artifact artifact, JavaEEVersion
javaEEVersion, String defaultLibBundleDir,
Boolean includeInApplicationXml,
ArtifactTypeMappingService typeMappingService )
+ // CHECKSTYLE_ON: LineLength
throws UnknownArtifactTypeException
{
// Get the standard artifact type based on default config and
user-defined mapping(s)
@@ -102,7 +104,7 @@ public final class EarModuleFactory
else if ( "ejb-client".equals( artifactType ) )
{
// Somewhat weird way to tackle the problem described in MEAR-85
- if ( javaEEVersion.le( JavaEEVersion.OneDotFour ) )
+ if ( javaEEVersion.le( JavaEEVersion.ONE_DOT_FOUR ) )
{
return new EjbClientModule( artifact, null );
}
@@ -148,7 +150,7 @@ public final class EarModuleFactory
*/
public static List<String> getStandardArtifactTypes()
{
- return standardArtifactTypes;
+ return STANDARD_ARTIFACT_TYPE;
}
/**
@@ -159,7 +161,7 @@ public final class EarModuleFactory
*/
public static boolean isStandardArtifactType( final String type )
{
- return standardArtifactTypes.contains( type );
+ return STANDARD_ARTIFACT_TYPE.contains( type );
}
}
Modified:
maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/EarMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/EarMojo.java?rev=1636449&r1=1636448&r2=1636449&view=diff
==============================================================================
---
maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/EarMojo.java
(original)
+++
maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/EarMojo.java
Mon Nov 3 21:27:36 2014
@@ -19,6 +19,17 @@ package org.apache.maven.plugin.ear;
* under the License.
*/
+import java.io.File;
+import java.io.FileReader;
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.zip.ZipException;
+
import org.apache.maven.archiver.MavenArchiveConfiguration;
import org.apache.maven.archiver.MavenArchiver;
import org.apache.maven.execution.MavenSession;
@@ -52,25 +63,15 @@ import org.codehaus.plexus.util.Director
import org.codehaus.plexus.util.FileUtils;
import org.codehaus.plexus.util.StringUtils;
-import java.io.File;
-import java.io.FileReader;
-import java.io.IOException;
-import java.io.PrintWriter;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Set;
-import java.util.zip.ZipException;
-
/**
* Builds J2EE Enterprise Archive (EAR) files.
*
* @author <a href="snic...@apache.org">Stephane Nicoll</a>
* @version $Id$
*/
-@Mojo( name = "ear", defaultPhase = LifecyclePhase.PACKAGE, threadSafe = true,
requiresDependencyResolution = ResolutionScope.TEST )
+@Mojo(
+ name = "ear", defaultPhase = LifecyclePhase.PACKAGE,
+ threadSafe = true, requiresDependencyResolution = ResolutionScope.TEST )
public class EarMojo
extends AbstractEarMojo
{
@@ -259,16 +260,15 @@ public class EarMojo
private boolean useJvmChmod = true;
/**
- * The list of artifacts is checked and if you set this to {@code true}
- * the build will fail if duplicate artifacts have been found within
- * the build configuration.
+ * The list of artifacts is checked and if you set this to {@code true}
the build will fail if duplicate artifacts
+ * have been found within the build configuration.
*
* @since 2.10
*/
- //TODO: This can be removed if we change to full unique identifiers in EAR
(next major version!)
+ // TODO: This can be removed if we change to full unique identifiers in
EAR (next major version!)
@Parameter( defaultValue = "false", property =
"maven.ear.duplicateArtifactsBreakTheBuild" )
private boolean duplicateArtifactsBreakTheBuild;
-
+
private void checkModuleUniqueness()
throws MojoExecutionException
{
@@ -285,13 +285,15 @@ public class EarMojo
getLog().warn( " --> " + earModule.getArtifact().getId() +
" (" + earModule.getType() + ")" );
}
}
-
- getLog().warn("HINT: This can be simply solved by using the
<fileNameMapping>full</fileNameMapping>");
+
+ getLog().warn( "HINT: This can be simply solved by using the
<fileNameMapping>full</fileNameMapping>" );
if ( duplicateArtifactsBreakTheBuild )
{
+ // CHECKSTYLE_OFF: LineLength
throw new MojoExecutionException(
"The build contains
duplicate artifacts which result in unpredictable ear content." );
+ // CHECKSTYLE_ON: LineLength
}
}
@@ -315,10 +317,10 @@ public class EarMojo
unpackTypesList = Arrays.asList( unpackTypes.split( "," ) );
for ( String type : unpackTypesList )
{
- if ( !EarModuleFactory.standardArtifactTypes.contains( type ) )
+ if ( !EarModuleFactory.STANDARD_ARTIFACT_TYPE.contains( type )
)
{
throw new MojoExecutionException( "Invalid type [" + type
+ "] supported types are "
- + EarModuleFactory.standardArtifactTypes );
+ + EarModuleFactory.STANDARD_ARTIFACT_TYPE );
}
}
getLog().debug( "Initialized unpack types " + unpackTypesList );
@@ -360,8 +362,10 @@ public class EarMojo
// If the module is within the unpack list, make sure that no
unpack wasn't forced (null or true)
// If the module is not in the unpack list, it should be true
+ // CHECKSTYLE_OFF: LineLength
if ( ( unpackTypesList.contains( module.getType() ) && (
module.shouldUnpack() == null || module.shouldUnpack() ) )
|| ( module.shouldUnpack() != null &&
module.shouldUnpack() ) )
+ // CHECKSTYLE_ON: LineLength
{
getLog().info( "Copying artifact [" + module + "] to [" +
module.getUri() + "] (unpacked)" );
// Make sure that the destination is a directory to avoid
plexus nasty stuff :)
@@ -440,9 +444,11 @@ public class EarMojo
// Check if deployment descriptor is there
File ddFile = new File( getWorkDirectory(), APPLICATION_XML_URI );
- if ( !ddFile.exists() && ( javaEEVersion.lt( JavaEEVersion.Five ) ) )
+ if ( !ddFile.exists() && ( javaEEVersion.lt( JavaEEVersion.FIVE ) ) )
{
+ // CHECKSTYLE_OFF: LineLength
throw new MojoExecutionException( "Deployment descriptor: " +
ddFile.getAbsolutePath() + " does not exist." );
+ // CHECKSTYLE_ON: LineLength
}
try
@@ -724,13 +730,17 @@ public class EarMojo
boolean newMetaInfCreated = metaInfDirectory.mkdirs();
if ( newMetaInfCreated )
{
+ // CHECKSTYLE_OFF: LineLength
getLog().debug( "This project did not have a META-INF
directory before, so a new directory was created." );
+ // CHECKSTYLE_ON: LineLength
}
File manifestFile = new File( metaInfDirectory, "MANIFEST.MF" );
boolean newManifestCreated = manifestFile.createNewFile();
if ( newManifestCreated )
{
+ // CHECKSTYLE_OFF: LineLength
getLog().debug( "This project did not have a
META-INF/MANIFEST.MF file before, so a new file was created." );
+ // CHECKSTYLE_ON: LineLength
}
// Read the manifest from disk
Modified:
maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/GenerateApplicationXmlMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/GenerateApplicationXmlMojo.java?rev=1636449&r1=1636448&r2=1636449&view=diff
==============================================================================
---
maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/GenerateApplicationXmlMojo.java
(original)
+++
maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/GenerateApplicationXmlMojo.java
Mon Nov 3 21:27:36 2014
@@ -42,7 +42,9 @@ import java.util.List;
* @author <a href="snic...@apache.org">Stephane Nicoll</a>
* @version $Id$
*/
-@Mojo( name = "generate-application-xml", defaultPhase =
LifecyclePhase.GENERATE_RESOURCES, threadSafe = true,
requiresDependencyResolution = ResolutionScope.TEST )
+@Mojo(
+ name = "generate-application-xml", defaultPhase =
LifecyclePhase.GENERATE_RESOURCES,
+ threadSafe = true, requiresDependencyResolution = ResolutionScope.TEST )
public class GenerateApplicationXmlMojo
extends AbstractEarMojo
{
Modified:
maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/JbossAppXmlWriter.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/JbossAppXmlWriter.java?rev=1636449&r1=1636448&r2=1636449&view=diff
==============================================================================
---
maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/JbossAppXmlWriter.java
(original)
+++
maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/JbossAppXmlWriter.java
Mon Nov 3 21:27:36 2014
@@ -106,7 +106,9 @@ final class JbossAppXmlWriter
}
// classloader repository
+ // CHECKSTYLE_OFF: LineLength
if ( jbossConfiguration.getLoaderRepository() != null ||
jbossConfiguration.getLoaderRepositoryConfig() != null )
+ // CHECKSTYLE_ON: LineLength
{
writer.startElement( JbossConfiguration.LOADER_REPOSITORY );
Modified:
maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/JbossConfiguration.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/JbossConfiguration.java?rev=1636449&r1=1636448&r2=1636449&view=diff
==============================================================================
---
maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/JbossConfiguration.java
(original)
+++
maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/JbossConfiguration.java
Mon Nov 3 21:27:36 2014
@@ -122,7 +122,9 @@ class JbossConfiguration
}
else
{
+ // CHECKSTYLE_OFF: LineLength
throw new EarPluginException( "Invalid JBoss configuration,
version[" + version + "] is not supported." );
+ // CHECKSTYLE_ON: LineLength
}
this.securityDomain = securityDomain;
this.unauthenticatedPrincipal = unauthenticatedPrincipal;
Modified:
maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/util/JavaEEVersion.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/util/JavaEEVersion.java?rev=1636449&r1=1636448&r2=1636449&view=diff
==============================================================================
---
maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/util/JavaEEVersion.java
(original)
+++
maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/util/JavaEEVersion.java
Mon Nov 3 21:27:36 2014
@@ -41,32 +41,32 @@ public class JavaEEVersion
private static final String VERSION_7 = "7";
- private static final Map<String, JavaEEVersion> versionsMap = new
HashMap<String, JavaEEVersion>();
+ private static final Map<String, JavaEEVersion> VERSION_MAP = new
HashMap<String, JavaEEVersion>();
/**
* Represents the J2EE 1.3 version.
*/
- public static final JavaEEVersion OneDotThree = new JavaEEVersion(
Integer.valueOf( 0 ), VERSION_1_3 );
+ public static final JavaEEVersion ONE_DOT_THREE = new JavaEEVersion(
Integer.valueOf( 0 ), VERSION_1_3 );
/**
* Represents the J2EE 1.4 version.
*/
- public static final JavaEEVersion OneDotFour = new JavaEEVersion(
Integer.valueOf( 1 ), VERSION_1_4 );
+ public static final JavaEEVersion ONE_DOT_FOUR = new JavaEEVersion(
Integer.valueOf( 1 ), VERSION_1_4 );
/**
* Represents the JavaEE 5 version.
*/
- public static final JavaEEVersion Five = new JavaEEVersion(
Integer.valueOf( 2 ), VERSION_5 );
+ public static final JavaEEVersion FIVE = new JavaEEVersion(
Integer.valueOf( 2 ), VERSION_5 );
/**
* Represents the JavaEE 6 version.
*/
- public static final JavaEEVersion Six = new JavaEEVersion(
Integer.valueOf( 3 ), VERSION_6 );
+ public static final JavaEEVersion SIX = new JavaEEVersion(
Integer.valueOf( 3 ), VERSION_6 );
/**
* Represents the JavaEE 7 version.
*/
- public static final JavaEEVersion Seven = new JavaEEVersion(
Integer.valueOf( 4 ), VERSION_7 );
+ public static final JavaEEVersion SEVEN = new JavaEEVersion(
Integer.valueOf( 4 ), VERSION_7 );
private final Integer index;
@@ -76,7 +76,7 @@ public class JavaEEVersion
{
this.index = index;
this.version = version;
- versionsMap.put( version, this );
+ VERSION_MAP.put( version, this );
}
public static JavaEEVersion getJavaEEVersion( String version )
@@ -86,7 +86,7 @@ public class JavaEEVersion
{
throw new InvalidJavaEEVersion( "Invalid version [" + version +
"]", version );
}
- return versionsMap.get( version );
+ return VERSION_MAP.get( version );
}
/**
Modified:
maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/util/ModuleIdentifierValidator.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/util/ModuleIdentifierValidator.java?rev=1636449&r1=1636448&r2=1636449&view=diff
==============================================================================
---
maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/util/ModuleIdentifierValidator.java
(original)
+++
maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/util/ModuleIdentifierValidator.java
Mon Nov 3 21:27:36 2014
@@ -1,5 +1,24 @@
package org.apache.maven.plugin.ear.util;
+/*
+ * 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 java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
Modified:
maven/plugins/trunk/maven-ear-plugin/src/test/java/org/apache/maven/plugin/ear/util/JavaEEVersionTest.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/src/test/java/org/apache/maven/plugin/ear/util/JavaEEVersionTest.java?rev=1636449&r1=1636448&r2=1636449&view=diff
==============================================================================
---
maven/plugins/trunk/maven-ear-plugin/src/test/java/org/apache/maven/plugin/ear/util/JavaEEVersionTest.java
(original)
+++
maven/plugins/trunk/maven-ear-plugin/src/test/java/org/apache/maven/plugin/ear/util/JavaEEVersionTest.java
Mon Nov 3 21:27:36 2014
@@ -30,84 +30,84 @@ public class JavaEEVersionTest
public void testGtSameVersion()
{
- assertFalse( JavaEEVersion.Five.gt( JavaEEVersion.Five ) );
+ assertFalse( JavaEEVersion.FIVE.gt( JavaEEVersion.FIVE ) );
}
public void testGtNextVersion()
{
- assertFalse( JavaEEVersion.Five.gt( JavaEEVersion.Six ) );
+ assertFalse( JavaEEVersion.FIVE.gt( JavaEEVersion.SIX ) );
}
public void testGtPreviousVersion()
{
- assertTrue( JavaEEVersion.Five.gt( JavaEEVersion.OneDotFour ) );
+ assertTrue( JavaEEVersion.FIVE.gt( JavaEEVersion.ONE_DOT_FOUR ) );
}
public void testGeSameVersion()
{
- assertTrue( JavaEEVersion.Five.ge( JavaEEVersion.Five ) );
+ assertTrue( JavaEEVersion.FIVE.ge( JavaEEVersion.FIVE ) );
}
public void testGePreviousVersion()
{
- assertTrue( JavaEEVersion.Five.ge( JavaEEVersion.OneDotFour ) );
+ assertTrue( JavaEEVersion.FIVE.ge( JavaEEVersion.ONE_DOT_FOUR ) );
}
public void testGeNextVersion()
{
- assertFalse( JavaEEVersion.Five.ge( JavaEEVersion.Six ) );
+ assertFalse( JavaEEVersion.FIVE.ge( JavaEEVersion.SIX ) );
}
public void testLtSameVersion()
{
- assertFalse( JavaEEVersion.Five.lt( JavaEEVersion.Five ) );
+ assertFalse( JavaEEVersion.FIVE.lt( JavaEEVersion.FIVE ) );
}
public void testLtPreviousVersion()
{
- assertFalse( JavaEEVersion.Five.lt( JavaEEVersion.OneDotFour ) );
+ assertFalse( JavaEEVersion.FIVE.lt( JavaEEVersion.ONE_DOT_FOUR ) );
}
public void testLtNextVersion()
{
- assertTrue( JavaEEVersion.Five.lt( JavaEEVersion.Six ) );
+ assertTrue( JavaEEVersion.FIVE.lt( JavaEEVersion.SIX ) );
}
public void testLeSameVersion()
{
- assertTrue( JavaEEVersion.Five.le( JavaEEVersion.Five ) );
+ assertTrue( JavaEEVersion.FIVE.le( JavaEEVersion.FIVE ) );
}
public void testLePreviousVersion()
{
- assertFalse( JavaEEVersion.Five.le( JavaEEVersion.OneDotFour ) );
+ assertFalse( JavaEEVersion.FIVE.le( JavaEEVersion.ONE_DOT_FOUR ) );
}
public void testLeNextVersion()
{
- assertTrue( JavaEEVersion.Five.le( JavaEEVersion.Six ) );
+ assertTrue( JavaEEVersion.FIVE.le( JavaEEVersion.SIX ) );
}
public void testEqSameVersion()
{
- assertTrue( JavaEEVersion.Five.eq( JavaEEVersion.Five ) );
+ assertTrue( JavaEEVersion.FIVE.eq( JavaEEVersion.FIVE ) );
}
public void testEqAnotherVersion()
{
- assertFalse( JavaEEVersion.Five.eq( JavaEEVersion.OneDotThree ) );
+ assertFalse( JavaEEVersion.FIVE.eq( JavaEEVersion.ONE_DOT_THREE ) );
}
public void testGetVersion()
{
- assertEquals( "5", JavaEEVersion.Five.getVersion() );
+ assertEquals( "5", JavaEEVersion.FIVE.getVersion() );
}
public void testGetJavaEEVersionValid()
{
try
{
- assertEquals( JavaEEVersion.Six, JavaEEVersion.getJavaEEVersion(
"6" ) );
+ assertEquals( JavaEEVersion.SIX, JavaEEVersion.getJavaEEVersion(
"6" ) );
}
catch ( InvalidJavaEEVersion invalidJavaEEVersion )
{
Modified:
maven/plugins/trunk/maven-ear-plugin/src/test/java/org/apache/maven/plugin/ear/util/ModuleIdentifierValidatorTest.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/src/test/java/org/apache/maven/plugin/ear/util/ModuleIdentifierValidatorTest.java?rev=1636449&r1=1636448&r2=1636449&view=diff
==============================================================================
---
maven/plugins/trunk/maven-ear-plugin/src/test/java/org/apache/maven/plugin/ear/util/ModuleIdentifierValidatorTest.java
(original)
+++
maven/plugins/trunk/maven-ear-plugin/src/test/java/org/apache/maven/plugin/ear/util/ModuleIdentifierValidatorTest.java
Mon Nov 3 21:27:36 2014
@@ -1,5 +1,24 @@
package org.apache.maven.plugin.ear.util;
+/*
+ * 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 static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
