mirror of
https://github.com/getsolus/packages.git
synced 2025-04-26 12:50:29 +03:00
b05598e1b3
Summary: **Changelog:** - New Graph Diagram to display any element in generic form. - Modelio now embeds the AdoptOpenJDK JRE instead of the Oracle JDK's JRE. - Fixed exception that may occur upon closing ArchiMate edition boxes. - Fixed issues with the XMI import/export. - Fixed issue with `R3250` audit rule. Test Plan: Open and create a new project Reviewers: #triage_team, JoshStrobl Reviewed By: #triage_team, JoshStrobl Subscribers: JoshStrobl Differential Revision: https://dev.getsol.us/D10343
245 lines
8.7 KiB
Diff
245 lines
8.7 KiB
Diff
From f4b0393ba32c6f177ace4348b3da478ddf910057 Mon Sep 17 00:00:00 2001
|
|
From: Campbell Jones <git@serebit.com>
|
|
Date: Mon, 11 Jan 2021 22:02:32 -0500
|
|
Subject: [PATCH] Fix building with maven and java 11
|
|
|
|
---
|
|
.../META-INF/MANIFEST.MF | 5 ++
|
|
.../build.properties | 8 +-
|
|
.../app.editors.richnote.libreoffice/pom.xml | 74 ++++++++++---------
|
|
.../META-INF/MANIFEST.MF | 2 +
|
|
.../build.properties | 4 +-
|
|
modelio/core/core.utils/META-INF/MANIFEST.MF | 1 +
|
|
modelio/core/core.utils/build.properties | 3 +-
|
|
modelio/core/core.utils/pom.xml | 31 ++++++++
|
|
pom.xml | 1 +
|
|
9 files changed, 92 insertions(+), 37 deletions(-)
|
|
|
|
diff --git a/modelio/app/app.editors.richnote.libreoffice/META-INF/MANIFEST.MF b/modelio/app/app.editors.richnote.libreoffice/META-INF/MANIFEST.MF
|
|
index 7ade3b26..5028fb12 100644
|
|
--- a/modelio/app/app.editors.richnote.libreoffice/META-INF/MANIFEST.MF
|
|
+++ b/modelio/app/app.editors.richnote.libreoffice/META-INF/MANIFEST.MF
|
|
@@ -4,6 +4,11 @@ Bundle-Name: Libreoffice
|
|
Bundle-SymbolicName: org.modelio.app.editors.richnote.libreoffice;singleton:=true
|
|
Bundle-Version: 4.1.0.qualifier
|
|
Bundle-ClassPath: res/,
|
|
+ target/dependency/juh.jar,
|
|
+ target/dependency/jurt.jar,
|
|
+ target/dependency/ridl.jar,
|
|
+ target/dependency/unoil.jar,
|
|
+ lib/javadesigner.jar,
|
|
.
|
|
Bundle-Activator: org.modelio.editors.richnote.libreoffice.plugin.LibreOfficeEditors
|
|
Bundle-Localization: plugin
|
|
diff --git a/modelio/app/app.editors.richnote.libreoffice/build.properties b/modelio/app/app.editors.richnote.libreoffice/build.properties
|
|
index 07f57432..31812342 100644
|
|
--- a/modelio/app/app.editors.richnote.libreoffice/build.properties
|
|
+++ b/modelio/app/app.editors.richnote.libreoffice/build.properties
|
|
@@ -10,4 +10,10 @@ bin.includes = META-INF/,\
|
|
runtime/bin/,\
|
|
res/,\
|
|
plugin.xml,\
|
|
- plugin.properties,plugin_fr.properties
|
|
+ plugin.properties,
|
|
+ plugin_fr.properties,
|
|
+ target/dependency/juh.jar,\
|
|
+ target/dependency/jurt.jar,\
|
|
+ target/dependency/ridl.jar,\
|
|
+ target/dependency/unoil.jar,\
|
|
+ lib/javadesigner.jar
|
|
diff --git a/modelio/app/app.editors.richnote.libreoffice/pom.xml b/modelio/app/app.editors.richnote.libreoffice/pom.xml
|
|
index 6ae43f1e..286adf61 100644
|
|
--- a/modelio/app/app.editors.richnote.libreoffice/pom.xml
|
|
+++ b/modelio/app/app.editors.richnote.libreoffice/pom.xml
|
|
@@ -21,39 +21,6 @@
|
|
<version>${tycho-version}</version>
|
|
<configuration>
|
|
<useProjectSettings>true</useProjectSettings>
|
|
- <extraClasspathElements>
|
|
-
|
|
- <extraClasspathElement>
|
|
- <groupId>org.modelio</groupId>
|
|
- <artifactId>javadesigner</artifactId>
|
|
- <version>2.2.0</version>
|
|
- </extraClasspathElement>
|
|
-
|
|
- <extraClasspathElement>
|
|
- <groupId>org.modelio.libreoffice</groupId>
|
|
- <artifactId>com.sun.star.juh</artifactId>
|
|
- <version>3.6.0</version>
|
|
- </extraClasspathElement>
|
|
-
|
|
- <extraClasspathElement>
|
|
- <groupId>org.modelio.libreoffice</groupId>
|
|
- <artifactId>com.sun.star.jurt</artifactId>
|
|
- <version>3.6.0</version>
|
|
- </extraClasspathElement>
|
|
-
|
|
- <extraClasspathElement>
|
|
- <groupId>org.modelio.libreoffice</groupId>
|
|
- <artifactId>com.sun.star.ridl</artifactId>
|
|
- <version>3.6.0</version>
|
|
- </extraClasspathElement>
|
|
-
|
|
- <extraClasspathElement>
|
|
- <groupId>org.modelio.libreoffice</groupId>
|
|
- <artifactId>com.sun.star.unoil</artifactId>
|
|
- <version>3.6.0</version>
|
|
- </extraClasspathElement>
|
|
-
|
|
- </extraClasspathElements>
|
|
</configuration>
|
|
</plugin>
|
|
|
|
@@ -108,9 +75,48 @@
|
|
</execution>
|
|
</executions>
|
|
</plugin>
|
|
-
|
|
+ <plugin>
|
|
+ <groupId>org.apache.maven.plugins</groupId>
|
|
+ <artifactId>maven-dependency-plugin</artifactId>
|
|
+ <version>2.10</version>
|
|
+ <executions>
|
|
+ <execution>
|
|
+ <id>copy-dependencies</id>
|
|
+ <phase>initialize</phase>
|
|
+ <goals>
|
|
+ <goal>copy-dependencies</goal>
|
|
+ </goals>
|
|
+ <configuration>
|
|
+ <includeScope>runtime</includeScope>
|
|
+ <stripVersion>true</stripVersion>
|
|
+ </configuration>
|
|
+ </execution>
|
|
+ </executions>
|
|
+ </plugin>
|
|
</plugins>
|
|
</build>
|
|
|
|
+ <dependencies>
|
|
+ <dependency>
|
|
+ <groupId>org.libreoffice</groupId>
|
|
+ <artifactId>juh</artifactId>
|
|
+ <version>6.4.3</version>
|
|
+ </dependency>
|
|
+ <dependency>
|
|
+ <groupId>org.libreoffice</groupId>
|
|
+ <artifactId>jurt</artifactId>
|
|
+ <version>6.4.3</version>
|
|
+ </dependency>
|
|
+ <dependency>
|
|
+ <groupId>org.libreoffice</groupId>
|
|
+ <artifactId>ridl</artifactId>
|
|
+ <version>6.4.3</version>
|
|
+ </dependency>
|
|
+ <dependency>
|
|
+ <groupId>org.libreoffice</groupId>
|
|
+ <artifactId>unoil</artifactId>
|
|
+ <version>6.4.3</version>
|
|
+ </dependency>
|
|
+ </dependencies>
|
|
</project>
|
|
|
|
diff --git a/modelio/app/app.editors.richnote.microsoft/META-INF/MANIFEST.MF b/modelio/app/app.editors.richnote.microsoft/META-INF/MANIFEST.MF
|
|
index 787f9ec9..8a73c162 100644
|
|
--- a/modelio/app/app.editors.richnote.microsoft/META-INF/MANIFEST.MF
|
|
+++ b/modelio/app/app.editors.richnote.microsoft/META-INF/MANIFEST.MF
|
|
@@ -22,5 +22,7 @@ Import-Package: javax.annotation;version="1.1.0",
|
|
javax.inject;version="1.0.0"
|
|
Bundle-Activator: org.modelio.editors.richnote.microsoft.plugin.MicrosoftEditors
|
|
Bundle-ClassPath: res/,
|
|
+ lib/javadesigner.jar,
|
|
+ lib/eclipse.jar,
|
|
.
|
|
|
|
diff --git a/modelio/app/app.editors.richnote.microsoft/build.properties b/modelio/app/app.editors.richnote.microsoft/build.properties
|
|
index 25f7d7a8..c0d3b40b 100644
|
|
--- a/modelio/app/app.editors.richnote.microsoft/build.properties
|
|
+++ b/modelio/app/app.editors.richnote.microsoft/build.properties
|
|
@@ -6,4 +6,6 @@ bin.includes = META-INF/,\
|
|
.,\
|
|
res/,\
|
|
e4model/,\
|
|
- plugin.xml
|
|
+ plugin.xml,\
|
|
+ lib/javadesigner.jar,\
|
|
+ lib/eclipse.jar
|
|
diff --git a/modelio/core/core.utils/META-INF/MANIFEST.MF b/modelio/core/core.utils/META-INF/MANIFEST.MF
|
|
index 86056bde..1ff7c597 100644
|
|
--- a/modelio/core/core.utils/META-INF/MANIFEST.MF
|
|
+++ b/modelio/core/core.utils/META-INF/MANIFEST.MF
|
|
@@ -15,6 +15,7 @@ Export-Package: org.modelio.vbasic.auth,
|
|
org.modelio.vbasic.version,
|
|
org.modelio.vbasic.xml
|
|
Bundle-ClassPath: res/,
|
|
+ target/dependency/jaxb-api.jar,
|
|
.
|
|
Require-Bundle: org.apache.httpcomponents.httpclient,
|
|
org.apache.httpcomponents.httpcore,
|
|
diff --git a/modelio/core/core.utils/build.properties b/modelio/core/core.utils/build.properties
|
|
index 05bd7f40..66382b56 100644
|
|
--- a/modelio/core/core.utils/build.properties
|
|
+++ b/modelio/core/core.utils/build.properties
|
|
@@ -7,4 +7,5 @@ javacTarget=1.8
|
|
bin.includes = META-INF/,\
|
|
.,\
|
|
res/,\
|
|
- lib/
|
|
+ lib/,\
|
|
+ target/dependency/jaxb-api.jar
|
|
diff --git a/modelio/core/core.utils/pom.xml b/modelio/core/core.utils/pom.xml
|
|
index 0dfba018..d597f1e8 100644
|
|
--- a/modelio/core/core.utils/pom.xml
|
|
+++ b/modelio/core/core.utils/pom.xml
|
|
@@ -12,4 +12,35 @@
|
|
<artifactId>org.modelio.core.utils</artifactId>
|
|
<packaging>eclipse-plugin</packaging>
|
|
|
|
+ <dependencies>
|
|
+ <dependency>
|
|
+ <groupId>javax.xml.bind</groupId>
|
|
+ <artifactId>jaxb-api</artifactId>
|
|
+ <version>2.3.0</version>
|
|
+ </dependency>
|
|
+ </dependencies>
|
|
+
|
|
+ <build>
|
|
+ <plugins>
|
|
+ <plugin>
|
|
+ <groupId>org.apache.maven.plugins</groupId>
|
|
+ <artifactId>maven-dependency-plugin</artifactId>
|
|
+ <version>2.10</version>
|
|
+ <executions>
|
|
+ <execution>
|
|
+ <id>copy-dependencies</id>
|
|
+ <phase>initialize</phase>
|
|
+ <goals>
|
|
+ <goal>copy-dependencies</goal>
|
|
+ </goals>
|
|
+ <configuration>
|
|
+ <includeScope>runtime</includeScope>
|
|
+ <stripVersion>true</stripVersion>
|
|
+ </configuration>
|
|
+ </execution>
|
|
+ </executions>
|
|
+ </plugin>
|
|
+ </plugins>
|
|
+ </build>
|
|
+
|
|
</project>
|
|
diff --git a/pom.xml b/pom.xml
|
|
index 0234a168..09840401 100644
|
|
--- a/pom.xml
|
|
+++ b/pom.xml
|
|
@@ -164,6 +164,7 @@ This pom executes a maven target on ALL the (eclipse) features that compose the
|
|
<version>${tycho-version}</version>
|
|
<configuration>
|
|
<encoding>UTF-8</encoding>
|
|
+ <compilerArgument>-warn:+discouraged,forbidden</compilerArgument>
|
|
</configuration>
|
|
</plugin>
|
|
</plugins>
|
|
--
|
|
2.30.0
|
|
|