#200 #201 Fix GitHub action builds

- Clean up libs in tests/org.eclipse.emfcloud.modelserver.tests
- Ensure examples directory is not excluded anymore for m2 deployment (we did not publish the example server launch since June!)
- Update guice dependencies to match p2 version (Reduces warnings on JAR startup)

.github/workflows/build.yml

@@ -9,13 +9,19 @@ jobs:
       fail-fast: false
       matrix:
         os: [windows-2019, macos-11]
+        maven: ['3.8.4']
 
     runs-on: ${{ matrix.os }}
     timeout-minutes: 20
 
     steps:
       - name: Checkout
         uses: actions/checkout@v2
+
+      - name: Set up Maven
+        uses: stCarolas/[email protected]
+        with:
+          maven-version: ${{ matrix.maven }}
 
       - name: Set up JDK 11
         uses: actions/setup-java@v1
@@ -31,18 +37,24 @@ jobs:
       fail-fast: false
       matrix:
         os: [windows-2019, macos-11]
+        maven: ['3.8.4']
 
     runs-on: ${{ matrix.os }}
     timeout-minutes: 20
 
     steps:
       - name: Checkout
         uses: actions/checkout@v2
+
+      - name: Set up Maven
+        uses: stCarolas/[email protected]
+        with:
+          maven-version: ${{ matrix.maven }}
 
       - name: Set up JDK 11
         uses: actions/setup-java@v1
         with:
           java-version: 11
 
       - name: Build with Maven
-        run: mvn -B -Pp2 clean verify --file pom.xml
+        run: mvn -B -Pp2 clean verify -debug --file pom.xml

pom.xml

@@ -46,6 +46,7 @@
 
 	<modules>
 		<module>bundles</module>
+		<module>examples</module>
 	</modules>
 
 	<!-- Properties -->
@@ -86,7 +87,8 @@
 		<!-- Dependency Versions: Version of dependencies provided by the target 
 			platform in p2. We try to match the p2-version if possible. -->
 		<apache.logging.log4j.version>2.17.1</apache.logging.log4j.version>
-		<google.guice.version>3.0</google.guice.version>
+		<google.guice.version>5.0.1</google.guice.version>
+		<google.guice.multibindings.version>4.2.3</google.guice.multibindings.version>
 		<google.guava.version>30.1-jre</google.guava.version>
 		<jackson.databind.version>2.12.1</jackson.databind.version>
 		<eclipse.core.runtime.version>3.7.0</eclipse.core.runtime.version>
@@ -401,12 +403,11 @@
 					<groupId>com.google.inject</groupId>
 					<artifactId>guice</artifactId>
 					<version>${google.guice.version}</version>
-					<classifier>no_aop</classifier>
 				</dependency>
 				<dependency>
 					<groupId>com.google.inject.extensions</groupId>
 					<artifactId>guice-multibindings</artifactId>
-					<version>${google.guice.version}</version>
+					<version>${google.guice.multibindings.version}</version>
 				</dependency>
 				<dependency>
 					<groupId>com.google.guava</groupId>
@@ -581,7 +582,6 @@
 				</property>
 			</activation>
 			<modules>
-				<module>examples</module>
 				<module>releng</module>
 				<module>tests</module>
 			</modules>

tests/org.eclipse.emfcloud.modelserver.tests/.classpath

@@ -6,8 +6,8 @@
 		</attributes>
 	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry exported="true" kind="lib" path="lib/okhttp-mock-1.4.1.jar" sourcepath="lib/okhttp-mock-1.4.1-sources.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/mockito-inline-2.23.0.jar" sourcepath="lib/mockito-inline-2.23.0-sources.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/mockito-inline-3.2.4.jar" sourcepath="lib/mockito-inline-3.2.4-sources.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/okhttp-mock-1.5.0.jar" sourcepath="lib/okhttp-mock-1.5.0-sources.jar"/>
 	<classpathentry kind="src" path="src/">
 		<attributes>
 			<attribute name="test" value="true"/>

tests/org.eclipse.emfcloud.modelserver.tests/META-INF/MANIFEST.MF

@@ -13,7 +13,7 @@ Require-Bundle: org.eclipse.emf.common;bundle-version="[2.17.0,3.0.0)",
 Export-Package: okhttp3.mock,
  okhttp3.mock.matchers,
  org.eclipse.emfcloud.modelserver.tests.util
-Bundle-ClassPath: lib/okhttp-mock-1.4.1.jar,
- lib/mockito-inline-2.23.0.jar,
- .
+Bundle-ClassPath: .,
+ lib/mockito-inline-3.2.4.jar,
+ lib/okhttp-mock-1.5.0.jar
 Bundle-Vendor: EclipseSource

tests/org.eclipse.emfcloud.modelserver.tests/build.properties

@@ -2,5 +2,5 @@ source.. = src/
 output.. = target/classes/
 bin.includes = META-INF/,\
                .,\
-               lib/okhttp-mock-1.4.1.jar,\
-               lib/mockito-inline-2.23.0.jar
+               lib/okhttp-mock-1.5.0.jar,\
+               lib/mockito-inline-3.2.4.jar

tests/org.eclipse.emfcloud.modelserver.tests/lib/.gitignore

@@ -0,0 +1 @@
+!*

tests/org.eclipse.emfcloud.modelserver.tests/pom.xml

@@ -10,23 +10,18 @@
    <artifactId>org.eclipse.emfcloud.modelserver.tests</artifactId>
    <packaging>${package.type}</packaging>
 
-   <profiles>
-      <profile>
-         <id>m2</id>
-         <dependencies>
-            <dependency>
-               <groupId>org.mockito</groupId>
-               <artifactId>mockito-inline</artifactId>
-               <version>${mockito.inline.version}</version>
-            </dependency>
-            <dependency>
-               <groupId>com.github.gmazzo</groupId>
-               <artifactId>okhttp-mock</artifactId>
-               <version>${gmazzo.okhttp.mock.version}</version>
-            </dependency>
-         </dependencies>
-      </profile>
-   </profiles>
+   <dependencies>
+      <dependency>
+         <groupId>org.mockito</groupId>
+         <artifactId>mockito-inline</artifactId>
+         <version>${mockito.inline.version}</version>
+      </dependency>
+      <dependency>
+         <groupId>com.github.gmazzo</groupId>
+         <artifactId>okhttp-mock</artifactId>
+         <version>${gmazzo.okhttp.mock.version}</version>
+      </dependency>
+   </dependencies>
 
    <build>
       <plugins>