Merge pull request #126 from LorenzoBettini/task_125-Use_Xtext_Build_…

…Utils_0.6.4 Task 125 use xtext build utils 0.6.4
LorenzoBettini · Sep 16, 2021 · d244b5c · d244b5c
2 parents 478c69f + efa2f5e
commit d244b5c
Show file tree

Hide file tree

Showing 11 changed files with 15 additions and 56 deletions.
diff --git a/domainmodel/org.eclipse.xtext.example.domainmodel/build.properties b/domainmodel/org.eclipse.xtext.example.domainmodel/build.properties
@@ -17,4 +17,6 @@ additional.bundles = org.eclipse.xtext.xbase,\
                      org.objectweb.asm,\
                      org.apache.commons.logging,\
                      org.apache.log4j,\
+                     com.ibm.icu,\
+                     de.itemis.xtext.antlr,\
                      jbase.mwe2
diff --git a/domainmodel/org.eclipse.xtext.example.domainmodel/pom.xml b/domainmodel/org.eclipse.xtext.example.domainmodel/pom.xml
@@ -31,17 +31,6 @@
             <phase>generate-sources</phase>
           </execution>
         </executions>
-        <dependencies>
-          <!-- This is required only for code generation.
-            Might be removed when Tycho 2.4.0 is released,
-            since it will be found in the additional.bundles of
-            build.properties -->
-          <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>jbase.mwe2</artifactId>
-            <version>${project.version}</version>
-          </dependency>
-        </dependencies>
       </plugin>
       <!-- Explicitly call xtend-maven-plugin after mwe2 -->
       <plugin>

diff --git a/jbase.example.jbasescript/build.properties b/jbase.example.jbasescript/build.properties
@@ -15,4 +15,7 @@ additional.bundles = org.eclipse.xtext.xbase,\
                      org.eclipse.emf.mwe2.lib,\
                      org.objectweb.asm,\
                      org.apache.commons.logging,\
+                     org.apache.log4j,\
+                     com.ibm.icu,\
+                     de.itemis.xtext.antlr,\
                      jbase.mwe2
diff --git a/jbase.example.jbasescript/pom.xml b/jbase.example.jbasescript/pom.xml
@@ -31,17 +31,6 @@
             <phase>generate-sources</phase>
           </execution>
         </executions>
-        <dependencies>
-          <!-- This is required only for code generation.
-            Might be removed when Tycho 2.4.0 is released,
-            since it will be found in the additional.bundles of
-            build.properties -->
-          <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>jbase.mwe2</artifactId>
-            <version>${project.version}</version>
-          </dependency>
-        </dependencies>
       </plugin>
       <!-- Explicitly call xtend-maven-plugin after mwe2 -->
       <plugin>

diff --git a/jbase.example.purejbase/build.properties b/jbase.example.purejbase/build.properties
@@ -15,4 +15,7 @@ additional.bundles = org.eclipse.xtext.xbase,\
                      org.eclipse.emf.mwe2.lib,\
                      org.objectweb.asm,\
                      org.apache.commons.logging,\
+                     org.apache.log4j,\
+                     com.ibm.icu,\
+                     de.itemis.xtext.antlr,\
                      jbase.mwe2
diff --git a/jbase.example.purejbase/pom.xml b/jbase.example.purejbase/pom.xml
@@ -31,17 +31,6 @@
             <phase>generate-sources</phase>
           </execution>
         </executions>
-        <dependencies>
-          <!-- This is required only for code generation.
-            Might be removed when Tycho 2.4.0 is released,
-            since it will be found in the additional.bundles of
-            build.properties -->
-          <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>jbase.mwe2</artifactId>
-            <version>${project.version}</version>
-          </dependency>
-        </dependencies>
       </plugin>
       <!-- Explicitly call xtend-maven-plugin after mwe2 -->
       <plugin>

diff --git a/jbase.parent/pom.xml b/jbase.parent/pom.xml
@@ -13,7 +13,7 @@
   <parent>
     <groupId>io.github.lorenzobettini.xtextutils</groupId>
     <artifactId>xtext-tycho-parent</artifactId>
-    <version>0.6.1</version>
+    <version>0.6.4</version>
     <relativePath></relativePath>
   </parent>
 
@@ -380,13 +380,6 @@
                 <id>org.eclipse.xtext.ui.codemining</id>
                 <versionRange>0.0.0</versionRange>
               </requirement>
-              <!-- to force the same version of jdt.compiler.apt and jdt.core
-                (for xtext-maven-plugin) -->
-              <requirement>
-                <type>eclipse-plugin</type>
-                <id>org.eclipse.jdt.compiler.apt</id>
-                <versionRange>0.0.0</versionRange>
-              </requirement>
             </extraRequirements>
           </dependency-resolution>
         </configuration>

diff --git a/jbase.testlanguage/build.properties b/jbase.testlanguage/build.properties
@@ -15,4 +15,7 @@ additional.bundles = org.eclipse.xtext.xbase,\
                      org.eclipse.emf.mwe2.lib,\
                      org.objectweb.asm,\
                      org.apache.commons.logging,\
+                     org.apache.log4j,\
+                     com.ibm.icu,\
+                     de.itemis.xtext.antlr,\
                      jbase.mwe2
diff --git a/jbase.testlanguage/pom.xml b/jbase.testlanguage/pom.xml
@@ -31,17 +31,6 @@
             <phase>generate-sources</phase>
           </execution>
         </executions>
-        <dependencies>
-          <!-- This is required only for code generation.
-            Might be removed when Tycho 2.4.0 is released,
-            since it will be found in the additional.bundles of
-            build.properties -->
-          <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>jbase.mwe2</artifactId>
-            <version>${project.version}</version>
-          </dependency>
-        </dependencies>
       </plugin>
       <!-- Explicitly call xtend-maven-plugin after mwe2 -->
       <plugin>

diff --git a/jbase/build.properties b/jbase/build.properties
@@ -17,4 +17,6 @@ additional.bundles = org.eclipse.xtext.xbase,\
                      org.eclipse.emf.mwe2.lib,\
                      org.objectweb.asm,\
                      org.apache.commons.logging,\
-                     org.apache.log4j
+                     org.apache.log4j,\
+                     com.ibm.icu,\
+                     de.itemis.xtext.antlr
diff --git a/jbase/pom.xml b/jbase/pom.xml
@@ -16,8 +16,6 @@
 
   <properties>
     <sonar.skip>false</sonar.skip>
-    <!-- Otherwise Sonar will scan xtend-gen both as source and as test -->
-    <sonar.tests></sonar.tests>
   </properties>
 
   <dependencies>
@@ -69,7 +67,6 @@
         </executions>
         <configuration>
           <classpathScope>compile</classpathScope>
-          <includePluginDependencies>true</includePluginDependencies>
           <cleanupDaemonThreads>false</cleanupDaemonThreads>
           <skip>${skipMWE2}</skip>
         </configuration>