fixes #1264 fixed artefact name in no-dependencies pom which caused issue with gradle builds

Author: jamesdbloom

changelog.md

@@ -13,7 +13,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 -
 
 ### Fixed
--
+- fixed artefact name in no-dependencies pom which caused issue with gradle builds
 
 ## [5.13.1] - 2022-04-02
 

mockserver-client-java/dependency-reduced-pom.xml

@@ -9,7 +9,7 @@
 
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>mockserver-client-java</artifactId>
+    <artifactId>mockserver-client-java-no-dependencies</artifactId>
     <version>@project.version</version>
 
     <name>MockServer Java Client</name>

mockserver-integration-testing/dependency-reduced-pom.xml

@@ -9,7 +9,7 @@
 
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>mockserver-integration-testing</artifactId>
+    <artifactId>mockserver-integration-testing-no-dependencies</artifactId>
     <version>@project.version</version>
 
     <name>MockServer Integration Test</name>

mockserver-junit-jupiter/dependency-reduced-pom.xml

@@ -9,7 +9,7 @@
 
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>mockserver-junit-jupiter</artifactId>
+    <artifactId>mockserver-junit-jupiter-no-dependencies</artifactId>
     <version>@project.version</version>
 
     <name>MockServer JUnit Jupiter Integration</name>

mockserver-junit-rule/dependency-reduced-pom.xml

@@ -9,7 +9,7 @@
 
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>mockserver-junit-rule</artifactId>
+    <artifactId>mockserver-junit-rule-no-dependencies</artifactId>
     <version>@project.version</version>
 
     <name>MockServer JUnit 4 Integration</name>

mockserver-netty/dependency-reduced-pom.xml

@@ -9,7 +9,7 @@
 
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>mockserver-netty</artifactId>
+    <artifactId>mockserver-netty-no-dependencies</artifactId>
     <version>@project.version</version>
 
     <name>MockServer &amp; Proxy Netty</name>

mockserver-netty/pom.xml

@@ -223,8 +223,8 @@
                                 <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
                                     <mainClass>org.mockserver.cli.Main</mainClass>
                                 </transformer>
-                                <transformer implementation="org.apache.maven.plugins.shade.resource.ApacheLicenseResourceTransformer" />
-                                <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer" />
+                                <transformer implementation="org.apache.maven.plugins.shade.resource.ApacheLicenseResourceTransformer"/>
+                                <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/>
                                 <transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
                                     <resource>META-INF/LICENSE</resource>
                                 </transformer>
@@ -451,13 +451,13 @@
                     </execution>
                 </executions>
             </plugin>
-            <!-- shaded dependency integration tests -->
+            <!-- shaded dependency maven integration tests -->
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-invoker-plugin</artifactId>
                 <version>3.2.2</version>
                 <configuration>
-                     <skipInvocation>${skipTests}</skipInvocation>
+                    <skipInvocation>${skipTests}</skipInvocation>
                     <debug>false</debug>
                     <streamLogs>false</streamLogs>
                     <showErrors>false</showErrors>
@@ -485,7 +485,7 @@
                     <settingsFile>src/integration-tests/settings.xml</settingsFile>
                     <!--<mavenOpts>-agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=5005</mavenOpts>-->
                     <pomIncludes>
-                        <pomInclude>**/pom.xml</pomInclude>
+                        <pomInclude>maven-**/pom.xml</pomInclude>
                     </pomIncludes>
                     <goals>
                         <goal>test</goal>
@@ -501,6 +501,30 @@
                     </execution>
                 </executions>
             </plugin>
+            <!-- shaded dependency gradle integration tests -->
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>exec-maven-plugin</artifactId>
+                <version>3.0.0</version>
+                <inherited>false</inherited>
+                <configuration>
+                    <skip>${skipTests}</skip>
+                    <workingDirectory>src/integration-tests</workingDirectory>
+                </configuration>
+                <executions>
+                    <execution>
+                        <id>gradle_integration_tests</id>
+                        <phase>install</phase>
+                        <goals>
+                            <goal>exec</goal>
+                        </goals>
+                        <configuration>
+                            <executable>gradle_integration_tests.sh</executable>
+                            <arguments>${project.version}</arguments>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
         </plugins>
     </build>
 

mockserver-netty/src/integration-tests/gradle-netty-no-dependencies-dependencies/build.gradle

@@ -0,0 +1,19 @@
+plugins {
+    id 'java'
+    id 'groovy'
+}
+
+repositories {
+    mavenLocal()
+    maven { url "https://oss.sonatype.org/content/repositories/snapshots" }
+    mavenCentral()
+}
+
+dependencies {
+
+    implementation "org.mock-server:mockserver-client-java-no-dependencies:${project.findProperty('mockserverVersion')}"
+    implementation "org.mock-server:mockserver-netty-no-dependencies:${project.findProperty('mockserverVersion')}"
+    testImplementation "org.mock-server:mockserver-integration-testing-no-dependencies:${project.findProperty('mockserverVersion')}"
+
+}
+

mockserver-netty/src/integration-tests/netty-jar-with-dependencies-dependency/src/test/java/org/mockserver/ClientAndServerMockTest.java renamed to mockserver-netty/src/integration-tests/gradle-netty-no-dependencies-dependencies/src/test/java/org/mockserver/ClientAndServerMockTest.java

@@ -0,0 +1,19 @@
+plugins {
+    id 'java'
+    id 'groovy'
+}
+
+repositories {
+    mavenLocal()
+    maven { url "https://oss.sonatype.org/content/repositories/snapshots" }
+    mavenCentral()
+}
+
+dependencies {
+
+    implementation "org.mock-server:mockserver-client-java:${project.findProperty('mockserverVersion')}:shaded"
+    implementation "org.mock-server:mockserver-netty:${project.findProperty('mockserverVersion')}:shaded"
+    testImplementation "org.mock-server:mockserver-integration-testing:${project.findProperty('mockserverVersion')}:shaded"
+
+}
+

mockserver-netty/src/integration-tests/netty-jar-with-dependencies-dependency/src/test/java/org/mockserver/ClientAndServerProxyTest.java renamed to mockserver-netty/src/integration-tests/gradle-netty-no-dependencies-dependencies/src/test/java/org/mockserver/ClientAndServerProxyTest.java

@@ -0,0 +1,5 @@
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.1-all.zip
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists