[maven-ear-plugin] branch MEAR-255 updated (7d6eec6 -> 568a562)

Previous Topic Next Topic
 
classic Classic list List threaded Threaded
2 messages Options
Reply | Threaded
Open this post in threaded view
|

[maven-ear-plugin] branch MEAR-255 updated (7d6eec6 -> 568a562)

khmarbaise
This is an automated email from the ASF dual-hosted git repository.

khmarbaise pushed a change to branch MEAR-255
in repository https://gitbox.apache.org/repos/asf/maven-ear-plugin.git.


 discard 7d6eec6  [MEAR-255] - Upgrade parent to 31
     new 568a562  [MEAR-255] - Upgrade parent to 31  o Fixed checkstyle reported issues related    to the upgrade.

This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version.  This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:

 * -- * -- B -- O -- O -- O   (7d6eec6)
            \
             N -- N -- N   refs/heads/MEAR-255 (568a562)

You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.

Any revisions marked "omit" are not gone; other references still
refer to them.  Any revisions marked "discard" are gone forever.

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .../org/apache/maven/plugins/ear/ApplicationXmlWriterContext.java     | 2 +-
 src/main/java/org/apache/maven/plugins/ear/EnvEntry.java              | 4 ++--
 src/main/java/org/apache/maven/plugins/ear/JbossConfiguration.java    | 2 +-
 src/main/java/org/apache/maven/plugins/ear/SecurityRole.java          | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

--
To stop receiving notification emails like this one, please contact
[hidden email].
Reply | Threaded
Open this post in threaded view
|

[maven-ear-plugin] 01/01: [MEAR-255] - Upgrade parent to 31 o Fixed checkstyle reported issues related to the upgrade.

khmarbaise
This is an automated email from the ASF dual-hosted git repository.

khmarbaise pushed a commit to branch MEAR-255
in repository https://gitbox.apache.org/repos/asf/maven-ear-plugin.git

commit 568a562adfde0f0c725c5894da3abf44d566ac25
Author: Karl Heinz Marbaise <[hidden email]>
AuthorDate: Tue Feb 13 19:46:18 2018 +0100

    [MEAR-255] - Upgrade parent to 31
     o Fixed checkstyle reported issues related
       to the upgrade.
---
 pom.xml                                                               | 2 +-
 .../org/apache/maven/plugins/ear/ApplicationXmlWriterContext.java     | 2 +-
 src/main/java/org/apache/maven/plugins/ear/EnvEntry.java              | 4 ++--
 src/main/java/org/apache/maven/plugins/ear/JbossConfiguration.java    | 2 +-
 src/main/java/org/apache/maven/plugins/ear/SecurityRole.java          | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/pom.xml b/pom.xml
index d61e198..be96438 100644
--- a/pom.xml
+++ b/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <artifactId>maven-plugins</artifactId>
     <groupId>org.apache.maven.plugins</groupId>
-    <version>30</version>
+    <version>31</version>
     <relativePath>../../pom/maven/maven-plugins/pom.xml</relativePath>
   </parent>
 
diff --git a/src/main/java/org/apache/maven/plugins/ear/ApplicationXmlWriterContext.java b/src/main/java/org/apache/maven/plugins/ear/ApplicationXmlWriterContext.java
index 314f330..8156489 100644
--- a/src/main/java/org/apache/maven/plugins/ear/ApplicationXmlWriterContext.java
+++ b/src/main/java/org/apache/maven/plugins/ear/ApplicationXmlWriterContext.java
@@ -55,7 +55,7 @@ class ApplicationXmlWriterContext
 
     private final Boolean initializeInOrder;
 
-    public ApplicationXmlWriterContext( File destinationFile, List<EarModule> earModules,
+    ApplicationXmlWriterContext( File destinationFile, List<EarModule> earModules,
                                         List<SecurityRole> securityRoles, List<EnvEntry> envEntries,
                                         List<EjbRef> ejbEntries, List<ResourceRef> resourceRefs, String displayName,
                                         String description, String libraryDirectory, String applicationName,
diff --git a/src/main/java/org/apache/maven/plugins/ear/EnvEntry.java b/src/main/java/org/apache/maven/plugins/ear/EnvEntry.java
index cd4884e..ce87323 100644
--- a/src/main/java/org/apache/maven/plugins/ear/EnvEntry.java
+++ b/src/main/java/org/apache/maven/plugins/ear/EnvEntry.java
@@ -53,7 +53,7 @@ class EnvEntry
 
     private final String lookupName;
 
-    public EnvEntry( String description, String name, String type, String value, String lookupName )
+    EnvEntry( String description, String name, String type, String value, String lookupName )
     {
         if ( StringUtils.isEmpty( name ) )
         {
@@ -152,4 +152,4 @@ class EnvEntry
             + getLookupName() + "]";
     }
 
-}
\ No newline at end of file
+}
diff --git a/src/main/java/org/apache/maven/plugins/ear/JbossConfiguration.java b/src/main/java/org/apache/maven/plugins/ear/JbossConfiguration.java
index e79283a..9e15a23 100644
--- a/src/main/java/org/apache/maven/plugins/ear/JbossConfiguration.java
+++ b/src/main/java/org/apache/maven/plugins/ear/JbossConfiguration.java
@@ -91,7 +91,7 @@ class JbossConfiguration
 
     private final String libraryDirectory;
 
-    public JbossConfiguration( String version, String securityDomain, String unauthenticatedPrincipal, String jmxName,
+    JbossConfiguration( String version, String securityDomain, String unauthenticatedPrincipal, String jmxName,
                                String loaderRepository, String moduleOrder, List<String> dataSources,
                                String libraryDirectory, String loaderRepositoryConfig, String loaderRepositoryClass,
                                String configParserClass )
diff --git a/src/main/java/org/apache/maven/plugins/ear/SecurityRole.java b/src/main/java/org/apache/maven/plugins/ear/SecurityRole.java
index 9ef85d8..6666a0a 100644
--- a/src/main/java/org/apache/maven/plugins/ear/SecurityRole.java
+++ b/src/main/java/org/apache/maven/plugins/ear/SecurityRole.java
@@ -48,7 +48,7 @@ class SecurityRole
 
     private final String descriptionId;
 
-    public SecurityRole( String roleName, String roleNameId, String roleId, String description, String descriptionId )
+    SecurityRole( String roleName, String roleNameId, String roleId, String description, String descriptionId )
     {
         if ( roleName == null )
         {

--
To stop receiving notification emails like this one, please contact
[hidden email].