Merge pull request #12 from progress/zerovian/fix_maven2_location

fix plugin name and maven2 location
progress · Jan 29, 2020 · 545aee1 · 545aee1
2 parents 4f6813a + 712b37d
commit 545aee1
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/build.gradle b/build.gradle
@@ -86,13 +86,13 @@ def pluginList = [
     new GradlePluginMetaData(
         "${project.name}-base",
         'A Gradle base plugin for ABL language support based on PCT',
-        'oe.espresso.latte.latte-base',
+        'oe.espresso.latte-base',
         'oe.espresso.latte.LatteBasePlugin'
     ),
     new GradlePluginMetaData(
         "${project.name}",
         'A Gradle plugin for ABL language support based on PCT',
-        'oe.espresso.latte.latte',
+        'oe.espresso.latte',
         "oe.espresso.latte.LattePlugin"
     )
 ]

diff --git a/src/main/groovy/oe/espresso/latte/LatteBasePlugin.groovy b/src/main/groovy/oe/espresso/latte/LatteBasePlugin.groovy
@@ -25,7 +25,7 @@ class LatteBasePlugin implements Plugin<Project> {
     void addRsswRepository(Project target) {
         target.repositories {
             maven {
-                url 'https://repo1.maven.org'
+                url 'https://repo1.maven.org/maven2'
             }
         }
     }

diff --git a/src/test/groovy/oe/espresso/latte/LatteBasePluginTest.groovy b/src/test/groovy/oe/espresso/latte/LatteBasePluginTest.groovy
@@ -11,7 +11,7 @@ class LatteBasePluginTest extends Specification {
 
     def setup() {
         project = ProjectBuilder.builder().build()
-        project.pluginManager.apply 'oe.espresso.latte.latte-base'
+        project.pluginManager.apply 'oe.espresso.latte-base'
     }
 
     def 'can be applied'() {

diff --git a/src/test/groovy/oe/espresso/latte/LattePluginTest.groovy b/src/test/groovy/oe/espresso/latte/LattePluginTest.groovy
@@ -16,7 +16,7 @@ class LattePluginTest {
     @Before
     void setup() {
         project = ProjectBuilder.builder().build()
-        project.pluginManager.apply 'oe.espresso.latte.latte'
+        project.pluginManager.apply 'oe.espresso.latte'
     }
 
     @Test