Merge pull request #809 from stalep/master

changed aesh cli to inherit from the build parent fixes #783
quarkusio · Feb 8, 2019 · 26e5897 · 26e5897
2 parents b0f56f3 + 25898fa
commit 26e5897
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 7 deletions.
diff --git a/build-parent/pom.xml b/build-parent/pom.xml
@@ -33,6 +33,7 @@
       <!-- Enable APT by default for Eclipse -->
       <m2e.apt.activation>jdt_apt</m2e.apt.activation>
 
+      <aesh.version>1.11</aesh.version>
       <jandex.version>2.1.0.Final</jandex.version>
       <resteasy.version>4.0.0.Beta8</resteasy.version>
       <opentracing.version>0.31.0</opentracing.version>
@@ -978,6 +979,12 @@
             <artifactId>jandex</artifactId>
             <version>${jandex.version}</version>
          </dependency>
+         <dependency>
+            <groupId>org.aesh</groupId>
+            <artifactId>aesh</artifactId>
+            <version>${aesh.version}</version>
+         </dependency>
+
 
          <dependency>
             <groupId>org.jboss.classfilewriter</groupId>

diff --git a/cli/aesh/pom.xml b/cli/aesh/pom.xml
@@ -18,16 +18,19 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>shamrock-build-parent</artifactId>
+        <groupId>org.jboss.shamrock</groupId>
+        <version>1.0.0.Alpha1-SNAPSHOT</version>
+      	<relativePath>../../build-parent/pom.xml</relativePath>
+    </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <groupId>org.jboss.shamrock</groupId>
     <artifactId>shamrock-cli</artifactId>
     <name>Shamrock - CLI Native Tool</name>
-    <version>1.0.0.Alpha1-SNAPSHOT</version>
 
     <properties>
         <test.level>INFO</test.level>
-
         <!-- maven-compiler-plugin -->
         <maven.compiler.target>1.8</maven.compiler.target>
         <maven.compiler.source>1.8</maven.compiler.source>
@@ -42,14 +45,10 @@
         <dependency>
             <groupId>org.aesh</groupId>
             <artifactId>aesh</artifactId>
-            <version>1.11</version>
         </dependency>
-
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <version>4.12</version>
-            <scope>test</scope>
         </dependency>
     </dependencies>