Merge 0d25f46 into 0d60026

e-gineering · Dec 20, 2019 · 18fae3d · 18fae3d
2 parents 0d60026 + 0d25f46
commit 18fae3d
Show file tree

Hide file tree

Showing 13 changed files with 154 additions and 372 deletions.
diff --git a/README.md b/README.md
@@ -98,14 +98,7 @@ All of the solutions to these issues are implemented independently in different
                 <version>${gitflow.helper.plugin.version}</version>
                 <extensions>true</extensions>
                 <configuration>
-                    <!--
-                         These repository definitions expect either a configured repository id, or an inline definition
-                         like 'id::layout::url::unique'
-                         
-                         For example:
-                         
-                         release::default::https://some.server.path/content/repositories/test-releases::false
-                    -->
+                    <!-- Tell the plugins what repositories to use (by id) -->
                     <releaseDeploymentRepository>localnexus-releases</releaseDeploymentRepository>
                     <stageDeploymentRepository>localnexus-stage</stageDeploymentRepository>
                     <snapshotDeploymentRepository>localnexus-snapshots</snapshotDeploymentRepository>
@@ -207,38 +200,58 @@ plugins in the build process (deploy, site-deploy, etc.) will use the repositori
 
 **The repository properties should follow the following format**, `id::layout::url::uniqueVersion`.
 
-When using this plugin, the `<distributionManagement>` repository definitions can be completely removed from your pom.xml 
-The following configuration block:
+When using this plugin, the `<distributionManagement>` repository definitions should be removed from your pom.xml 
+This block, is replaced by defining 'normal' repositories which are then referenced by the `<id>` and used by the gitflow-helper-maven-plugin to retarget artifact repository deployment and resolution.
 
         <distributionManagement>
             <snapshotRepository>
                 <id>snapshots</id>
                 <layout>default</layout>
                 <url>https://some.server.path/content/repositories/snapshots</url>
-                <uniqueVersion>true</uniqueVersion>
             </snapshotRepository>
             <repository>
                 <id>releases</id>
                 <layout>default</layout>
                 <url>https://some.server.path/content/repositories/releases</url>
-                <uniqueVersion>false</uniqueVersion>
             </repository>
         </distributionManagement>
         
-Can be replaced with the following plugin configuration, which also introduces the stage repository.
+Keep in mind repositories can be defined in a user settings.xml as part of your development profiles to keep from repeating yourself in project files.
+Below is an example configuration for the gitflow-helper-maven-plugin.
 
     <project...>
     ...
+    <repositories>
+        <repository>
+            <id>snapshots</id>
+            <url>https://some.server.path/content/repositories/snapshots</url>
+            <snapshots><enabled>true</enabled></snapshots>
+            <releases><enabled>false</enabled></releases>
+        </repository>
+        <repository>
+            <id>test-releases</id>
+            <url>https://some.server.path/content/repositories/test-releases</url>
+            <snapshots><enabled>false</enabled></snapshots>
+            <releases><enabled>true</enabled></releases>
+        </repository>
+        <repository>
+            <id>releases</id>
+            <url>https://some.server.path/content/repositories/releases</url>
+            <snapshots><enabled>false</enabled></snapshots>
+            <releases><enabled>true</enabled></releases>
+        </repository>
+    </repositories>
+    ...
     <build>
         <plugins>
             <plugin>
                 <groupId>com.e-gineering</groupId>
                 <artifactId>gitflow-helper-maven-plugin</artifactId>
                 <version>${gitflow.helper.plugin.version}</version>
                 <configuration>
-                    <releaseDeploymentRepository>releases::default::https://some.server.path/content/repositories/releases::false</releaseDeploymentRepository>
-                    <stageDeploymentRepository>stage::default::https://some.server.path/content/repositories/stage::false</stageDeploymentRepository>
-                    <snapshotDeploymentRepository>snapshots::default::https://some.server.path/content/repositories/snapshots::true</snapshotDeploymentRepository>
+                    <releaseDeploymentRepository>releases</releaseDeploymentRepository>
+                    <stageDeploymentRepository>stage</stageDeploymentRepository>
+                    <snapshotDeploymentRepository>snapshots</snapshotDeploymentRepository>
                 </configuration>
                 <executions>
                     <execution>
@@ -405,7 +418,7 @@ You can then connect a remote debugger and step through the plugin code.
 ## Building with IntelliJ IDEA notes
 ### To Debug Test Code:
 Configure the Maven commandline to include
-`-DforkMode=never` You will likely get warnings when you run maven with this argument.
+`-DforkCount=0` 
 
 ### To inspect code-coverage results from Integration Tests:
 * Select the **Analyze** -> **Show Coverage Data** menu.

diff --git a/pom.xml b/pom.xml
@@ -74,17 +74,6 @@
             <version>3.6.0</version>
             <scope>provided</scope>
         </dependency>
-        <dependency>
-            <groupId>org.apache.maven</groupId>
-            <artifactId>maven-compat</artifactId>
-            <version>3.6.0</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.maven</groupId>
-            <artifactId>maven-plugin-api</artifactId>
-            <version>3.6.0</version>
-        </dependency>
         <dependency>
             <groupId>org.apache.maven.scm</groupId>
             <artifactId>maven-scm-api</artifactId>
@@ -106,17 +95,6 @@
             <version>3.6.0</version>
             <scope>provided</scope>
         </dependency>
-        <dependency>
-            <groupId>org.apache.maven</groupId>
-            <artifactId>maven-aether-provider</artifactId>
-            <version>3.3.9</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.eclipse.aether</groupId>
-            <artifactId>aether-util</artifactId>
-            <version>1.1.0</version>
-        </dependency>
     </dependencies>
 
     <build>