#140 Update to emfcloud.checkstyle 0.1.0-RC02 (#141)

* #140 Update to emfcloud.checkstyle 0.1.0-RC02

The new release candiate uses a ruleset that is compliant with Checkstyle 8.44 as default.
This ensures that the checkstyle config can also be used in the latest Eclipse Relaease (8.44).
If you don't use the latest Eclipse release it's still recommended to update to the latest eclipse-checkstyle plugin version. However, the old checkstyle config (8.39) is still available and can be set in the project-specific properties.

Fixes #140

* Add resources that changed after importing all projects via maven

README.md

@@ -393,7 +393,8 @@ All involved code must adhere to the provided codestyle and checkstyle settings.
 - Install the Eclipse Checkstyle Plug-in via its update site `https://checkstyle.org/eclipse-cs/#!/install`.
 
 #### Configure Checkstyle
-To configure Checkstyle for the new project right click on the project, choose `Checkstyle > Configure project(s) from blueprint...` and select `org.eclipse.emfcloud.modelserver.common` as blueprint project.
+This project uses the common checkstyle ruleset from EMF.cloud. Please follow the [instructions for usage in Eclipse](https://github.com/eclipse-emfcloud/emfcloud/tree/master/codestyle#usage-in-eclipse-ide) to configure this ruleset for a new project.
+To configure Checkstyle for a new project in the same workspace your can also right click on the project, choose `Checkstyle > Configure project(s) from blueprint...` and select `org.eclipse.emfcloud.modelserver.common` as blueprint project.
 Run `Checkstyle > Check Code with Checkstyle` to make sure Checkstyle is activated correctly.
 
 #### Import Existing Projects

bundles/.project

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.emfcloud.modelserver.bundles.parent</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
+	</natures>
+</projectDescription>

bundles/.settings/org.eclipse.core.resources.prefs

@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8

bundles/.settings/org.eclipse.m2e.core.prefs

@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1

bundles/org.eclipse.emfcloud.modelserver.client/.checkstyle

@@ -1,12 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<fileset-config file-format-version="1.2.0" simple-config="true" sync-formatter="false">
-  <local-check-config name="EMF.cloud Checkstyle" location="https://raw.githubusercontent.com/eclipse-emfcloud/emfcloud/master/codestyle/org.eclipse.emfcloud.checkstyle/src/main/resources/emfcloud-checkstyle.xml" type="remote" description="The central checkstyle configuration for emfcloud">
-    <additional-data name="cache-props-file-location" value="EMFcloud Checkstyle_1618908540765_cache.properties"/>
+<fileset-config file-format-version="1.2.0" simple-config="false" sync-formatter="false">
+  <local-check-config name="EMF.cloud Checkstyle (8.39)" location="https://raw.githubusercontent.com/eclipse-emfcloud/emfcloud/master/codestyle/org.eclipse.emfcloud.checkstyle/src/main/resources/emfcloud-checkstyle-8.39.xml" type="remote" description="The central checkstyle configuration for EMF.cloud Checkstyle Version 8.39">
+    <additional-data name="cache-props-file-location" value="EMF.cloud Checkstyle (8.39)_1638214328569_cache.properties"/>
+    <additional-data name="cache-file-location" value="EMF.cloud Checkstyle (8.39)_1638214328569_cache.xml"/>
     <additional-data name="cache-file" value="true"/>
-    <additional-data name="cache-file-location" value="EMFcloud Checkstyle_1618908540765_cache.xml"/>
   </local-check-config>
-  <fileset name="all" enabled="true" check-config-name="EMF.cloud Checkstyle" local="true">
+  <local-check-config name="EMF.cloud Checkstyle (8.44)" location="https://raw.githubusercontent.com/eclipse-emfcloud/emfcloud/master/codestyle/org.eclipse.emfcloud.checkstyle/src/main/resources/emfcloud-checkstyle-8.44.xml" type="remote" description="The central checkstyle configuration for EMF.cloud Checkstyle Version 8.44">
+    <additional-data name="cache-props-file-location" value="EMF.cloud Checkstyle (8.44)_1638214295838_cache.properties"/>
+    <additional-data name="cache-file-location" value="EMF.cloud Checkstyle (8.44)_1638214295838_cache.xml"/>
+    <additional-data name="cache-file" value="true"/>
+  </local-check-config>
+  <fileset name="all non-generated" enabled="true" check-config-name="EMF.cloud Checkstyle (8.44)" local="true">
     <file-match-pattern match-pattern="." include-pattern="true"/>
+    <file-match-pattern match-pattern="src-gen" include-pattern="false"/>
   </fileset>
 </fileset-config>

bundles/org.eclipse.emfcloud.modelserver.common/.checkstyle

@@ -1,12 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<fileset-config file-format-version="1.2.0" simple-config="true" sync-formatter="false">
-  <local-check-config name="EMF.cloud Checkstyle" location="https://raw.githubusercontent.com/eclipse-emfcloud/emfcloud/master/codestyle/org.eclipse.emfcloud.checkstyle/src/main/resources/emfcloud-checkstyle.xml" type="remote" description="The central checkstyle configuration for emfcloud">
-    <additional-data name="cache-props-file-location" value="EMFcloud Checkstyle_1618908540765_cache.properties"/>
+<fileset-config file-format-version="1.2.0" simple-config="false" sync-formatter="false">
+  <local-check-config name="EMF.cloud Checkstyle (8.39)" location="https://raw.githubusercontent.com/eclipse-emfcloud/emfcloud/master/codestyle/org.eclipse.emfcloud.checkstyle/src/main/resources/emfcloud-checkstyle-8.39.xml" type="remote" description="The central checkstyle configuration for EMF.cloud Checkstyle Version 8.39">
+    <additional-data name="cache-props-file-location" value="EMF.cloud Checkstyle (8.39)_1638214328569_cache.properties"/>
+    <additional-data name="cache-file-location" value="EMF.cloud Checkstyle (8.39)_1638214328569_cache.xml"/>
     <additional-data name="cache-file" value="true"/>
-    <additional-data name="cache-file-location" value="EMFcloud Checkstyle_1618908540765_cache.xml"/>
   </local-check-config>
-  <fileset name="all" enabled="true" check-config-name="EMF.cloud Checkstyle" local="true">
+  <local-check-config name="EMF.cloud Checkstyle (8.44)" location="https://raw.githubusercontent.com/eclipse-emfcloud/emfcloud/master/codestyle/org.eclipse.emfcloud.checkstyle/src/main/resources/emfcloud-checkstyle-8.44.xml" type="remote" description="The central checkstyle configuration for EMF.cloud Checkstyle Version 8.44">
+    <additional-data name="cache-props-file-location" value="EMF.cloud Checkstyle (8.44)_1638214295838_cache.properties"/>
+    <additional-data name="cache-file-location" value="EMF.cloud Checkstyle (8.44)_1638214295838_cache.xml"/>
+    <additional-data name="cache-file" value="true"/>
+  </local-check-config>
+  <fileset name="all non-generated" enabled="true" check-config-name="EMF.cloud Checkstyle (8.44)" local="true">
     <file-match-pattern match-pattern="." include-pattern="true"/>
+    <file-match-pattern match-pattern="src-gen" include-pattern="false"/>
   </fileset>
 </fileset-config>

bundles/org.eclipse.emfcloud.modelserver.edit/.checkstyle

@@ -1,12 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<fileset-config file-format-version="1.2.0" simple-config="true" sync-formatter="false">
-  <local-check-config name="EMF.cloud Checkstyle" location="https://raw.githubusercontent.com/eclipse-emfcloud/emfcloud/master/codestyle/org.eclipse.emfcloud.checkstyle/src/main/resources/emfcloud-checkstyle.xml" type="remote" description="The central checkstyle configuration for emfcloud">
-    <additional-data name="cache-props-file-location" value="EMFcloud Checkstyle_1618908540765_cache.properties"/>
+<fileset-config file-format-version="1.2.0" simple-config="false" sync-formatter="false">
+  <local-check-config name="EMF.cloud Checkstyle (8.39)" location="https://raw.githubusercontent.com/eclipse-emfcloud/emfcloud/master/codestyle/org.eclipse.emfcloud.checkstyle/src/main/resources/emfcloud-checkstyle-8.39.xml" type="remote" description="The central checkstyle configuration for EMF.cloud Checkstyle Version 8.39">
+    <additional-data name="cache-props-file-location" value="EMF.cloud Checkstyle (8.39)_1638214328569_cache.properties"/>
+    <additional-data name="cache-file-location" value="EMF.cloud Checkstyle (8.39)_1638214328569_cache.xml"/>
     <additional-data name="cache-file" value="true"/>
-    <additional-data name="cache-file-location" value="EMFcloud Checkstyle_1618908540765_cache.xml"/>
   </local-check-config>
-  <fileset name="all" enabled="true" check-config-name="EMF.cloud Checkstyle" local="true">
+  <local-check-config name="EMF.cloud Checkstyle (8.44)" location="https://raw.githubusercontent.com/eclipse-emfcloud/emfcloud/master/codestyle/org.eclipse.emfcloud.checkstyle/src/main/resources/emfcloud-checkstyle-8.44.xml" type="remote" description="The central checkstyle configuration for EMF.cloud Checkstyle Version 8.44">
+    <additional-data name="cache-props-file-location" value="EMF.cloud Checkstyle (8.44)_1638214295838_cache.properties"/>
+    <additional-data name="cache-file-location" value="EMF.cloud Checkstyle (8.44)_1638214295838_cache.xml"/>
+    <additional-data name="cache-file" value="true"/>
+  </local-check-config>
+  <fileset name="all non-generated" enabled="true" check-config-name="EMF.cloud Checkstyle (8.44)" local="true">
     <file-match-pattern match-pattern="." include-pattern="true"/>
+    <file-match-pattern match-pattern="src-gen" include-pattern="false"/>
   </fileset>
 </fileset-config>

bundles/org.eclipse.emfcloud.modelserver.emf/.checkstyle

@@ -1,12 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<fileset-config file-format-version="1.2.0" simple-config="true" sync-formatter="false">
-  <local-check-config name="EMF.cloud Checkstyle" location="https://raw.githubusercontent.com/eclipse-emfcloud/emfcloud/master/codestyle/org.eclipse.emfcloud.checkstyle/src/main/resources/emfcloud-checkstyle.xml" type="remote" description="The central checkstyle configuration for emfcloud">
-    <additional-data name="cache-props-file-location" value="EMFcloud Checkstyle_1618908540765_cache.properties"/>
+<fileset-config file-format-version="1.2.0" simple-config="false" sync-formatter="false">
+  <local-check-config name="EMF.cloud Checkstyle (8.39)" location="https://raw.githubusercontent.com/eclipse-emfcloud/emfcloud/master/codestyle/org.eclipse.emfcloud.checkstyle/src/main/resources/emfcloud-checkstyle-8.39.xml" type="remote" description="The central checkstyle configuration for EMF.cloud Checkstyle Version 8.39">
+    <additional-data name="cache-props-file-location" value="EMF.cloud Checkstyle (8.39)_1638214328569_cache.properties"/>
+    <additional-data name="cache-file-location" value="EMF.cloud Checkstyle (8.39)_1638214328569_cache.xml"/>
     <additional-data name="cache-file" value="true"/>
-    <additional-data name="cache-file-location" value="EMFcloud Checkstyle_1618908540765_cache.xml"/>
   </local-check-config>
-  <fileset name="all" enabled="true" check-config-name="EMF.cloud Checkstyle" local="true">
+  <local-check-config name="EMF.cloud Checkstyle (8.44)" location="https://raw.githubusercontent.com/eclipse-emfcloud/emfcloud/master/codestyle/org.eclipse.emfcloud.checkstyle/src/main/resources/emfcloud-checkstyle-8.44.xml" type="remote" description="The central checkstyle configuration for EMF.cloud Checkstyle Version 8.44">
+    <additional-data name="cache-props-file-location" value="EMF.cloud Checkstyle (8.44)_1638214295838_cache.properties"/>
+    <additional-data name="cache-file-location" value="EMF.cloud Checkstyle (8.44)_1638214295838_cache.xml"/>
+    <additional-data name="cache-file" value="true"/>
+  </local-check-config>
+  <fileset name="all non-generated" enabled="true" check-config-name="EMF.cloud Checkstyle (8.44)" local="true">
     <file-match-pattern match-pattern="." include-pattern="true"/>
+    <file-match-pattern match-pattern="src-gen" include-pattern="false"/>
   </fileset>
 </fileset-config>

bundles/org.eclipse.emfcloud.modelserver.lib/.checkstyle

@@ -1,12 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<fileset-config file-format-version="1.2.0" simple-config="true" sync-formatter="false">
-  <local-check-config name="EMF.cloud Checkstyle" location="https://raw.githubusercontent.com/eclipse-emfcloud/emfcloud/master/codestyle/org.eclipse.emfcloud.checkstyle/src/main/resources/emfcloud-checkstyle.xml" type="remote" description="The central checkstyle configuration for emfcloud">
-    <additional-data name="cache-props-file-location" value="EMFcloud Checkstyle_1618908540765_cache.properties"/>
+<fileset-config file-format-version="1.2.0" simple-config="false" sync-formatter="false">
+  <local-check-config name="EMF.cloud Checkstyle (8.39)" location="https://raw.githubusercontent.com/eclipse-emfcloud/emfcloud/master/codestyle/org.eclipse.emfcloud.checkstyle/src/main/resources/emfcloud-checkstyle-8.39.xml" type="remote" description="The central checkstyle configuration for EMF.cloud Checkstyle Version 8.39">
+    <additional-data name="cache-props-file-location" value="EMF.cloud Checkstyle (8.39)_1638214328569_cache.properties"/>
+    <additional-data name="cache-file-location" value="EMF.cloud Checkstyle (8.39)_1638214328569_cache.xml"/>
     <additional-data name="cache-file" value="true"/>
-    <additional-data name="cache-file-location" value="EMFcloud Checkstyle_1618908540765_cache.xml"/>
   </local-check-config>
-  <fileset name="all" enabled="true" check-config-name="EMF.cloud Checkstyle" local="true">
+  <local-check-config name="EMF.cloud Checkstyle (8.44)" location="https://raw.githubusercontent.com/eclipse-emfcloud/emfcloud/master/codestyle/org.eclipse.emfcloud.checkstyle/src/main/resources/emfcloud-checkstyle-8.44.xml" type="remote" description="The central checkstyle configuration for EMF.cloud Checkstyle Version 8.44">
+    <additional-data name="cache-props-file-location" value="EMF.cloud Checkstyle (8.44)_1638214295838_cache.properties"/>
+    <additional-data name="cache-file-location" value="EMF.cloud Checkstyle (8.44)_1638214295838_cache.xml"/>
+    <additional-data name="cache-file" value="true"/>
+  </local-check-config>
+  <fileset name="all non-generated" enabled="true" check-config-name="EMF.cloud Checkstyle (8.44)" local="true">
     <file-match-pattern match-pattern="." include-pattern="true"/>
+    <file-match-pattern match-pattern="src-gen" include-pattern="false"/>
   </fileset>
 </fileset-config>

bundles/org.eclipse.emfcloud.modelserver.lib/.classpath

@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry exported="true" kind="lib" path="lib/websocket-api-9.4.43.v20210629.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/websocket-servlet-9.4.43.v20210629.jar"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
 		<attributes>
 			<attribute name="module" value="true"/>
@@ -15,5 +13,7 @@
 	<classpathentry exported="true" kind="lib" path="lib/kotlin-stdlib-common-1.4.10.jar" sourcepath="lib/kotlin-stdlib-common-1.4.10-sources.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/okhttp-4.9.0.jar" sourcepath="lib/okhttp-4.9.0-sources.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/okio-2.10.0.jar" sourcepath="lib/okio-2.10.0-sources.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/websocket-api-9.4.43.v20210629.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/websocket-servlet-9.4.43.v20210629.jar"/>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>

bundles/org.eclipse.emfcloud.modelserver.lib/.project

@@ -20,6 +20,11 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>net.sf.eclipsecs.core.CheckstyleBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 		<buildCommand>
 			<name>org.eclipse.m2e.core.maven2Builder</name>
 			<arguments>
@@ -30,5 +35,6 @@
 		<nature>org.eclipse.m2e.core.maven2Nature</nature>
 		<nature>org.eclipse.pde.PluginNature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>net.sf.eclipsecs.core.CheckstyleNature</nature>
 	</natures>
 </projectDescription>

examples/.project

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.emfcloud.modelserver.examples.parent</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
+	</natures>
+</projectDescription>

examples/.settings/org.eclipse.core.resources.prefs

@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8

examples/.settings/org.eclipse.m2e.core.prefs

@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1

examples/org.eclipse.emfcloud.modelserver.coffee.model/.checkstyle

@@ -1,12 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<fileset-config file-format-version="1.2.0" simple-config="true" sync-formatter="false">
-  <local-check-config name="EMF.cloud Checkstyle" location="https://raw.githubusercontent.com/eclipse-emfcloud/emfcloud/master/codestyle/org.eclipse.emfcloud.checkstyle/src/main/resources/emfcloud-checkstyle.xml" type="remote" description="The central checkstyle configuration for emfcloud">
-    <additional-data name="cache-props-file-location" value="EMFcloud Checkstyle_1618908540765_cache.properties"/>
+<fileset-config file-format-version="1.2.0" simple-config="false" sync-formatter="false">
+  <local-check-config name="EMF.cloud Checkstyle (8.39)" location="https://raw.githubusercontent.com/eclipse-emfcloud/emfcloud/master/codestyle/org.eclipse.emfcloud.checkstyle/src/main/resources/emfcloud-checkstyle-8.39.xml" type="remote" description="The central checkstyle configuration for EMF.cloud Checkstyle Version 8.39">
+    <additional-data name="cache-props-file-location" value="EMF.cloud Checkstyle (8.39)_1638214328569_cache.properties"/>
+    <additional-data name="cache-file-location" value="EMF.cloud Checkstyle (8.39)_1638214328569_cache.xml"/>
     <additional-data name="cache-file" value="true"/>
-    <additional-data name="cache-file-location" value="EMFcloud Checkstyle_1618908540765_cache.xml"/>
   </local-check-config>
-  <fileset name="all" enabled="true" check-config-name="EMF.cloud Checkstyle" local="true">
+  <local-check-config name="EMF.cloud Checkstyle (8.44)" location="https://raw.githubusercontent.com/eclipse-emfcloud/emfcloud/master/codestyle/org.eclipse.emfcloud.checkstyle/src/main/resources/emfcloud-checkstyle-8.44.xml" type="remote" description="The central checkstyle configuration for EMF.cloud Checkstyle Version 8.44">
+    <additional-data name="cache-props-file-location" value="EMF.cloud Checkstyle (8.44)_1638214295838_cache.properties"/>
+    <additional-data name="cache-file-location" value="EMF.cloud Checkstyle (8.44)_1638214295838_cache.xml"/>
+    <additional-data name="cache-file" value="true"/>
+  </local-check-config>
+  <fileset name="all non-generated" enabled="true" check-config-name="EMF.cloud Checkstyle (8.44)" local="true">
     <file-match-pattern match-pattern="." include-pattern="true"/>
+    <file-match-pattern match-pattern="src-gen" include-pattern="false"/>
   </fileset>
 </fileset-config>