diff --git a/maven-plugin/pom.xml b/maven-plugin/pom.xml deleted file mode 100644 index ce1606ed6e..0000000000 --- a/maven-plugin/pom.xml +++ /dev/null @@ -1,178 +0,0 @@ - - - 4.0.0 - - - io.codearte.accurest - accurest-maven-project - 0.3-SNAPSHOT - - - accurest-maven-plugin - maven-plugin - - - - io.codearte.accurest - accurest-core - - - io.codearte.accurest - accurest-converters - - - org.codehaus.groovy - groovy-all - 2.4.6 - - - - ch.qos.logback - logback-core - 1.1.3 - - - org.slf4j - slf4j-simple - 1.7.12 - test - - - org.apache.maven - maven-core - ${mavenVersion} - test - - - org.apache.maven - maven-compat - ${mavenVersion} - test - - - - org.apache.maven - maven-plugin-api - ${mavenVersion} - provided - - - org.apache.maven.plugin-tools - maven-plugin-annotations - ${mavenPluginPluginVersion} - provided - - - - io.takari.maven.plugins - takari-plugin-testing - 2.8.0 - test - - - io.takari.maven.plugins - takari-plugin-integration-testing - 2.8.0 - pom - test - - - junit - junit - 4.12 - test - - - - - - - org.codehaus.plexus - plexus-component-metadata - - - - generate-metadata - generate-test-metadata - - - - - - maven-plugin-plugin - ${mavenPluginPluginVersion} - - true - - - - generated-helpmojo - - helpmojo - - - - generate-descriptor - - descriptor - - - - - - io.takari.maven.plugins - takari-lifecycle-plugin - 1.11.12 - true - - - testProperties - process-test-resources - - testProperties - - - - - - org.apache.maven.plugins - maven-failsafe-plugin - 2.19.1 - - - - integration-test - verify - - - - - - org.jacoco - jacoco-maven-plugin - 0.7.6.201602180812 - - - prepare-agent - - prepare-agent - - - - report - - report - - - - - - org.eluder.coveralls - coveralls-maven-plugin - 4.1.0 - - - - - - \ No newline at end of file diff --git a/pom.xml b/pom.xml index 5376fdfb3b..9a0da34fdf 100644 --- a/pom.xml +++ b/pom.xml @@ -4,19 +4,14 @@ 4.0.0 io.codearte.accurest - accurest-maven-project + accurest-maven-plugin + maven-plugin 0.3-SNAPSHOT Accurate Maven Plugin Project Accurate REST Maven Plugin https://github.com/Codearte/accurest-maven-plugin - - maven-plugin - - - pom - [3.2.1,) @@ -70,6 +65,86 @@ + + org.codehaus.plexus + plexus-component-metadata + 1.6 + + + + generate-metadata + generate-test-metadata + + + + + + maven-plugin-plugin + ${mavenPluginPluginVersion} + + true + + + + generated-helpmojo + + helpmojo + + + + generate-descriptor + + descriptor + + + + + + io.takari.maven.plugins + takari-lifecycle-plugin + 1.11.12 + true + + + testProperties + process-test-resources + + testProperties + + + + + + org.apache.maven.plugins + maven-failsafe-plugin + 2.19.1 + + + + integration-test + verify + + + + + + org.jacoco + jacoco-maven-plugin + 0.7.6.201602180812 + + + prepare-agent + + prepare-agent + + + + + + org.eluder.coveralls + coveralls-maven-plugin + 4.1.0 + com.smartcodeltd release-candidate-maven-plugin @@ -81,7 +156,7 @@ updateVersion - {{ api_version }}-${revision} + {{ api_version }}-beta-${revision} @@ -102,8 +177,16 @@ oss https://oss.sonatype.org/ - true - true + false + + + + org.apache.maven.plugins + maven-release-plugin + 2.5.3 + + false + true @@ -126,20 +209,80 @@ - - - - io.codearte.accurest - accurest-core - ${accurest.version} - - - io.codearte.accurest - accurest-converters - ${accurest.version} - - - + + + io.codearte.accurest + accurest-core + ${accurest.version} + + + io.codearte.accurest + accurest-converters + ${accurest.version} + + + org.codehaus.groovy + groovy-all + 2.4.6 + + + + ch.qos.logback + logback-core + 1.1.3 + + + org.slf4j + slf4j-simple + 1.7.12 + test + + + org.apache.maven + maven-core + ${mavenVersion} + test + + + org.apache.maven + maven-compat + ${mavenVersion} + test + + + + org.apache.maven + maven-plugin-api + ${mavenVersion} + provided + + + org.apache.maven.plugin-tools + maven-plugin-annotations + ${mavenPluginPluginVersion} + provided + + + + io.takari.maven.plugins + takari-plugin-testing + 2.8.0 + test + + + io.takari.maven.plugins + takari-plugin-integration-testing + 2.8.0 + pom + test + + + junit + junit + 4.12 + test + + @@ -199,7 +342,6 @@ false - tag-release deploy tag diff --git a/maven-plugin/src/main/java/io/codearte/accurest/maven/ConvertMojo.java b/src/main/java/io/codearte/accurest/maven/ConvertMojo.java similarity index 100% rename from maven-plugin/src/main/java/io/codearte/accurest/maven/ConvertMojo.java rename to src/main/java/io/codearte/accurest/maven/ConvertMojo.java diff --git a/maven-plugin/src/main/java/io/codearte/accurest/maven/GenerateStubsMojo.java b/src/main/java/io/codearte/accurest/maven/GenerateStubsMojo.java similarity index 100% rename from maven-plugin/src/main/java/io/codearte/accurest/maven/GenerateStubsMojo.java rename to src/main/java/io/codearte/accurest/maven/GenerateStubsMojo.java diff --git a/maven-plugin/src/main/java/io/codearte/accurest/maven/GenerateTestsMojo.java b/src/main/java/io/codearte/accurest/maven/GenerateTestsMojo.java similarity index 100% rename from maven-plugin/src/main/java/io/codearte/accurest/maven/GenerateTestsMojo.java rename to src/main/java/io/codearte/accurest/maven/GenerateTestsMojo.java diff --git a/maven-plugin/src/test/java/io/codearte/accurest/maven/PluginIT.java b/src/test/java/io/codearte/accurest/maven/PluginIT.java similarity index 100% rename from maven-plugin/src/test/java/io/codearte/accurest/maven/PluginIT.java rename to src/test/java/io/codearte/accurest/maven/PluginIT.java diff --git a/maven-plugin/src/test/java/io/codearte/accurest/maven/PluginUnitTest.java b/src/test/java/io/codearte/accurest/maven/PluginUnitTest.java similarity index 100% rename from maven-plugin/src/test/java/io/codearte/accurest/maven/PluginUnitTest.java rename to src/test/java/io/codearte/accurest/maven/PluginUnitTest.java diff --git a/maven-plugin/src/test/projects/basic/pom.xml b/src/test/projects/basic/pom.xml similarity index 100% rename from maven-plugin/src/test/projects/basic/pom.xml rename to src/test/projects/basic/pom.xml diff --git a/maven-plugin/src/test/projects/basic/src/test/accurest/Sample.groovy b/src/test/projects/basic/src/test/accurest/Sample.groovy similarity index 100% rename from maven-plugin/src/test/projects/basic/src/test/accurest/Sample.groovy rename to src/test/projects/basic/src/test/accurest/Sample.groovy diff --git a/maven-plugin/src/test/projects/pomless/Sample.groovy b/src/test/projects/pomless/Sample.groovy similarity index 100% rename from maven-plugin/src/test/projects/pomless/Sample.groovy rename to src/test/projects/pomless/Sample.groovy diff --git a/maven-plugin/src/test/projects/spring-boot-groovy/pom.xml b/src/test/projects/spring-boot-groovy/pom.xml similarity index 100% rename from maven-plugin/src/test/projects/spring-boot-groovy/pom.xml rename to src/test/projects/spring-boot-groovy/pom.xml diff --git a/maven-plugin/src/test/projects/spring-boot-groovy/src/main/groovy/com/ofg/twitter/place/PairIdController.groovy b/src/test/projects/spring-boot-groovy/src/main/groovy/com/ofg/twitter/place/PairIdController.groovy similarity index 100% rename from maven-plugin/src/test/projects/spring-boot-groovy/src/main/groovy/com/ofg/twitter/place/PairIdController.groovy rename to src/test/projects/spring-boot-groovy/src/main/groovy/com/ofg/twitter/place/PairIdController.groovy diff --git a/maven-plugin/src/test/projects/spring-boot-groovy/src/main/groovy/com/ofg/twitter/place/Tweet.java b/src/test/projects/spring-boot-groovy/src/main/groovy/com/ofg/twitter/place/Tweet.java similarity index 100% rename from maven-plugin/src/test/projects/spring-boot-groovy/src/main/groovy/com/ofg/twitter/place/Tweet.java rename to src/test/projects/spring-boot-groovy/src/main/groovy/com/ofg/twitter/place/Tweet.java diff --git a/maven-plugin/src/test/projects/spring-boot-groovy/src/main/java/io/codearte/sample/SampleSimpleBootApplication.java b/src/test/projects/spring-boot-groovy/src/main/java/io/codearte/sample/SampleSimpleBootApplication.java similarity index 100% rename from maven-plugin/src/test/projects/spring-boot-groovy/src/main/java/io/codearte/sample/SampleSimpleBootApplication.java rename to src/test/projects/spring-boot-groovy/src/main/java/io/codearte/sample/SampleSimpleBootApplication.java diff --git a/maven-plugin/src/test/projects/spring-boot-groovy/src/main/resources/application.properties b/src/test/projects/spring-boot-groovy/src/main/resources/application.properties similarity index 100% rename from maven-plugin/src/test/projects/spring-boot-groovy/src/main/resources/application.properties rename to src/test/projects/spring-boot-groovy/src/main/resources/application.properties diff --git a/maven-plugin/src/test/projects/spring-boot-groovy/src/test/groovy/com/ofg/twitter/place/AcceptanceTest.groovy b/src/test/projects/spring-boot-groovy/src/test/groovy/com/ofg/twitter/place/AcceptanceTest.groovy similarity index 100% rename from maven-plugin/src/test/projects/spring-boot-groovy/src/test/groovy/com/ofg/twitter/place/AcceptanceTest.groovy rename to src/test/projects/spring-boot-groovy/src/test/groovy/com/ofg/twitter/place/AcceptanceTest.groovy diff --git a/maven-plugin/src/test/projects/spring-boot-groovy/src/test/groovy/com/ofg/twitter/place/BaseMockMvcTest.groovy b/src/test/projects/spring-boot-groovy/src/test/groovy/com/ofg/twitter/place/BaseMockMvcTest.groovy similarity index 100% rename from maven-plugin/src/test/projects/spring-boot-groovy/src/test/groovy/com/ofg/twitter/place/BaseMockMvcTest.groovy rename to src/test/projects/spring-boot-groovy/src/test/groovy/com/ofg/twitter/place/BaseMockMvcTest.groovy diff --git a/maven-plugin/src/test/projects/spring-boot-groovy/src/test/java/io/codearte/sample/SampleSimpleBootApplicationTests.java b/src/test/projects/spring-boot-groovy/src/test/java/io/codearte/sample/SampleSimpleBootApplicationTests.java similarity index 100% rename from maven-plugin/src/test/projects/spring-boot-groovy/src/test/java/io/codearte/sample/SampleSimpleBootApplicationTests.java rename to src/test/projects/spring-boot-groovy/src/test/java/io/codearte/sample/SampleSimpleBootApplicationTests.java diff --git a/maven-plugin/src/test/projects/spring-boot-groovy/src/test/resources/logback-test.groovy b/src/test/projects/spring-boot-groovy/src/test/resources/logback-test.groovy similarity index 100% rename from maven-plugin/src/test/projects/spring-boot-groovy/src/test/resources/logback-test.groovy rename to src/test/projects/spring-boot-groovy/src/test/resources/logback-test.groovy diff --git a/maven-plugin/src/test/projects/spring-boot-groovy/src/test/resources/stubs/collerate_PlacesFrom_Tweet.groovy b/src/test/projects/spring-boot-groovy/src/test/resources/stubs/collerate_PlacesFrom_Tweet.groovy similarity index 100% rename from maven-plugin/src/test/projects/spring-boot-groovy/src/test/resources/stubs/collerate_PlacesFrom_Tweet.groovy rename to src/test/projects/spring-boot-groovy/src/test/resources/stubs/collerate_PlacesFrom_Tweet.groovy diff --git a/maven-plugin/src/test/projects/spring-boot-groovy/src/test/resources/stubs/moreComplexVersion.groovy b/src/test/projects/spring-boot-groovy/src/test/resources/stubs/moreComplexVersion.groovy similarity index 100% rename from maven-plugin/src/test/projects/spring-boot-groovy/src/test/resources/stubs/moreComplexVersion.groovy rename to src/test/projects/spring-boot-groovy/src/test/resources/stubs/moreComplexVersion.groovy diff --git a/maven-plugin/src/test/projects/spring-boot-java/pom.xml b/src/test/projects/spring-boot-java/pom.xml similarity index 100% rename from maven-plugin/src/test/projects/spring-boot-java/pom.xml rename to src/test/projects/spring-boot-java/pom.xml diff --git a/maven-plugin/src/test/projects/spring-boot-java/src/main/java/hello/Application.java b/src/test/projects/spring-boot-java/src/main/java/hello/Application.java similarity index 100% rename from maven-plugin/src/test/projects/spring-boot-java/src/main/java/hello/Application.java rename to src/test/projects/spring-boot-java/src/main/java/hello/Application.java diff --git a/maven-plugin/src/test/projects/spring-boot-java/src/main/java/hello/Greeting.java b/src/test/projects/spring-boot-java/src/main/java/hello/Greeting.java similarity index 100% rename from maven-plugin/src/test/projects/spring-boot-java/src/main/java/hello/Greeting.java rename to src/test/projects/spring-boot-java/src/main/java/hello/Greeting.java diff --git a/maven-plugin/src/test/projects/spring-boot-java/src/main/java/hello/GreetingController.java b/src/test/projects/spring-boot-java/src/main/java/hello/GreetingController.java similarity index 100% rename from maven-plugin/src/test/projects/spring-boot-java/src/main/java/hello/GreetingController.java rename to src/test/projects/spring-boot-java/src/main/java/hello/GreetingController.java diff --git a/maven-plugin/src/test/projects/spring-boot-java/src/test/accurest/greetings_ok.groovy b/src/test/projects/spring-boot-java/src/test/accurest/greetings_ok.groovy similarity index 100% rename from maven-plugin/src/test/projects/spring-boot-java/src/test/accurest/greetings_ok.groovy rename to src/test/projects/spring-boot-java/src/test/accurest/greetings_ok.groovy diff --git a/maven-plugin/src/test/projects/spring-boot-java/src/test/accurest/greetings_with_default_value.groovy b/src/test/projects/spring-boot-java/src/test/accurest/greetings_with_default_value.groovy similarity index 100% rename from maven-plugin/src/test/projects/spring-boot-java/src/test/accurest/greetings_with_default_value.groovy rename to src/test/projects/spring-boot-java/src/test/accurest/greetings_with_default_value.groovy diff --git a/maven-plugin/src/test/projects/spring-boot-java/src/test/java/hello/BaseMockMvcTest.java b/src/test/projects/spring-boot-java/src/test/java/hello/BaseMockMvcTest.java similarity index 100% rename from maven-plugin/src/test/projects/spring-boot-java/src/test/java/hello/BaseMockMvcTest.java rename to src/test/projects/spring-boot-java/src/test/java/hello/BaseMockMvcTest.java diff --git a/maven-plugin/src/test/projects/withStubs/pom.xml b/src/test/projects/withStubs/pom.xml similarity index 100% rename from maven-plugin/src/test/projects/withStubs/pom.xml rename to src/test/projects/withStubs/pom.xml diff --git a/maven-plugin/src/test/projects/withStubs/src/test/resources/stubs/Sample.groovy b/src/test/projects/withStubs/src/test/resources/stubs/Sample.groovy similarity index 100% rename from maven-plugin/src/test/projects/withStubs/src/test/resources/stubs/Sample.groovy rename to src/test/projects/withStubs/src/test/resources/stubs/Sample.groovy