Merge remote-tracking branch 'origin/master' into sdo/updateRepoLink

NOTICE.md

@@ -33,37 +33,9 @@ The project maintains the following source code repositories:
 
 This project leverages the following third party content.
 
-ANTLR Runtime only: (3.2)
+Dependencies automatically captured by the license-check-plugin: [DEPENDENCIES](DEPENDENCIES)
 
-* License: New BSD license
-
-Apache Commons Logging Jar (1.2.0)
-
-* License: Apache License, 2.0
-
-Apache Log4J (1.2.24)
-
-* License: Apache License, 2.0
-
-ASM (9.5.0)
-
-* License: New BSD license
-
-Google Guava (30.1.0)
-
-* License: Apache License 2.0
-
-Google Guava (33.0.0)
-
-* License: Apache License 2.0
-
-Google Guice / Inject Core API (5.0.1)
-
-* License: Apache License, 2.0
-
-ICU4J (74.2)
-
-* License: ICU
+The following third-party content and licences are either not automatically captured or are used in the [elk-models](https://github.com/eclipse/elk-models) repository.
 
 libavoid (0.3.1)
 

build/RELEASE.md

@@ -7,8 +7,9 @@ The Eclipse release process is described in more detail in the [Eclipse Project
 1. Add a new release on ELK's [project page](https://projects.eclipse.org/projects/modeling.elk).
 1. For major releases:
     1. Update NOTICE.md file with relevant information regarding used third-party content.
-    1. Have [PMC](mailto:[email protected]) approve the release documentation.
-    1. Schedule a release review. Release reviews run for a minimum of one week and conclude on the first and third Wednesdays of each month.
+    2. Run `mvn org.eclipse.dash:license-tool-plugin:license-check -Dmaven.repo.local=./mvnrepo clean -Dtycho.target.eager=true -Dmaven.test.skip=true -Ddash.summary=../DEPENDENCIES` and commit the updated DEPENDENCIES file.
+    3. Have [PMC](mailto:[email protected]) approve the release documentation.
+    4. Schedule a release review. Release reviews run for a minimum of one week and conclude on the first and third Wednesdays of each month.
 
 
 ## The Release Branch

build/pom.xml

@@ -140,6 +140,21 @@
   <!-- Modify the build process to add Tycho and configure some utility plug-ins. -->
   <build>
     <plugins>
+
+      <!-- license-check plugin to automatically generate dependency list -->
+      <plugin>
+        <groupId>org.eclipse.dash</groupId>
+        <artifactId>license-tool-plugin</artifactId>
+        <version>1.1.0</version>
+        <executions>
+          <execution>
+          <id>license-check</id>
+          <goals>
+            <goal>license-check</goal>
+          </goals>
+          </execution>
+        </executions>
+      </plugin>
 
       <!-- We need tycho to build eclipse plugins -->
       <plugin>
@@ -427,6 +442,14 @@
 
   <!-- Maven plugin repositories -->
   <pluginRepositories>
+    <pluginRepository>
+      <id>dash-licenses-releases</id>
+      <url>https://repo.eclipse.org/content/repositories/dash-licenses-releases/</url>
+      <snapshots>
+        <enabled>true</enabled>
+      </snapshots>
+    </pluginRepository>
+
     <pluginRepository>
       <id>central</id>
       <name>Maven Plugin Repository</name>

plugins/org.eclipse.elk.graph.json/pom.xml

@@ -33,7 +33,7 @@
     <dependency>
       <groupId>com.google.code.gson</groupId>
       <artifactId>gson</artifactId>
-      <version>[2.7.0,2.9.0)</version>
+      <version>[2.7.0,)</version>
     </dependency>
     <dependency>
       <groupId>org.eclipse.elk</groupId>

plugins/org.eclipse.elk.graph.json/src/org/eclipse/elk/graph/json/JsonAdapter.xtend

@@ -186,6 +186,14 @@ final class JsonAdapter {
         }
     }
 
+    // - - - - - - - - - - - - - - - - - - -
+    // Remove members from a json object
+    // - - - - - - - - - - - - - - - - - - -
+
+    def void removeJsonObj(JsonObject o, String element) {
+        o.remove(element)
+    }
+
     // - - - - - - - - - - - - - - - - - - -
     // Add to a json array
     // - - - - - - - - - - - - - - - - - - -

plugins/org.eclipse.elk.graph.json/src/org/eclipse/elk/graph/json/JsonImporter.xtend

@@ -627,6 +627,7 @@ final class JsonImporter {
                 }
 
             ]
+            jsonObj.removeJsonObj("sections")
             jsonObj.addJsonObj("sections", sections)
         }