Skip to content

Commit 4407f4d

Browse files
author
Manty
committed
supports macOS Big Sur
1 parent 2ea2aa5 commit 4407f4d

File tree

11 files changed

+212
-208
lines changed

11 files changed

+212
-208
lines changed

‎scouter.client.build/.project

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<projectDescription>
3-
<name>scouter.client.build</name>
3+
<name>scouter.client.parent</name>
44
<comment></comment>
55
<projects>
66
</projects>

‎scouter.client.build/pom.xml

Lines changed: 16 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<module>../scouter.client.product</module>
1212
</modules>
1313
<properties>
14-
<tycho-version>1.3.0</tycho-version>
14+
<tycho-version>2.3.0</tycho-version>
1515
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
1616
</properties>
1717
<repositories>
@@ -20,17 +20,26 @@
2020
<!-- <layout>p2</layout> -->
2121
<!-- <url>https://download.eclipse.org/releases/2018-12/</url> -->
2222
<!-- </repository> -->
23-
<repository>
24-
<id>eclipse-simultaneous-2018-09</id>
25-
<layout>p2</layout>
26-
<url>https://download.eclipse.org/releases/2018-09/</url>
27-
</repository>
23+
24+
<repository>
25+
<id>eclipse-simultaneous-2021-09</id>
26+
<layout>p2</layout>
27+
<url>https://download.eclipse.org/releases/2021-09/</url>
28+
</repository>
29+
2830
<!-- <repository> -->
2931
<!-- <id>eclipse-photon</id> -->
3032
<!-- <layout>p2</layout> -->
3133
<!-- <url>https://download.eclipse.org/releases/photon</url> -->
3234
<!-- </repository> -->
3335
</repositories>
36+
<pluginRepositories>
37+
<pluginRepository>
38+
<id>tycho-snapshots</id>
39+
<url>https://repo.eclipse.org/content/repositories/tycho-snapshots/</url>
40+
</pluginRepository>
41+
</pluginRepositories>
42+
3443
<build>
3544
<plugins>
3645
<plugin>
@@ -44,13 +53,8 @@
4453
<groupId>org.eclipse.tycho</groupId>
4554
<artifactId>target-platform-configuration</artifactId>
4655
<version>${tycho-version}</version>
47-
<configuration>
56+
<configuration>
4857
<environments>
49-
<environment>
50-
<os>win32</os>
51-
<ws>win32</ws>
52-
<arch>x86</arch>
53-
</environment>
5458
<environment>
5559
<os>win32</os>
5660
<ws>win32</ws>

‎scouter.client.feature/.project

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,23 @@
1-
<?xml version="1.0" encoding="UTF-8"?>
2-
<projectDescription>
3-
<name>scouter.client.feature</name>
4-
<comment></comment>
5-
<projects>
6-
</projects>
7-
<buildSpec>
8-
<buildCommand>
9-
<name>org.eclipse.pde.FeatureBuilder</name>
10-
<arguments>
11-
</arguments>
12-
</buildCommand>
13-
<buildCommand>
14-
<name>org.eclipse.m2e.core.maven2Builder</name>
15-
<arguments>
16-
</arguments>
17-
</buildCommand>
18-
</buildSpec>
19-
<natures>
20-
<nature>org.eclipse.m2e.core.maven2Nature</nature>
21-
<nature>org.eclipse.pde.FeatureNature</nature>
22-
</natures>
23-
</projectDescription>
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<projectDescription>
3+
<name>scouter.client.feature</name>
4+
<comment></comment>
5+
<projects>
6+
</projects>
7+
<buildSpec>
8+
<buildCommand>
9+
<name>org.eclipse.pde.FeatureBuilder</name>
10+
<arguments>
11+
</arguments>
12+
</buildCommand>
13+
<buildCommand>
14+
<name>org.eclipse.m2e.core.maven2Builder</name>
15+
<arguments>
16+
</arguments>
17+
</buildCommand>
18+
</buildSpec>
19+
<natures>
20+
<nature>org.eclipse.m2e.core.maven2Nature</nature>
21+
<nature>org.eclipse.pde.FeatureNature</nature>
22+
</natures>
23+
</projectDescription>

‎scouter.client.product/.project

Lines changed: 17 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,17 @@
1-
<?xml version="1.0" encoding="UTF-8"?>
2-
<projectDescription>
3-
<name>scouter.client.product</name>
4-
<comment></comment>
5-
<projects>
6-
</projects>
7-
<buildSpec>
8-
<buildCommand>
9-
<name>org.eclipse.jdt.core.javabuilder</name>
10-
<arguments>
11-
</arguments>
12-
</buildCommand>
13-
<buildCommand>
14-
<name>org.eclipse.m2e.core.maven2Builder</name>
15-
<arguments>
16-
</arguments>
17-
</buildCommand>
18-
</buildSpec>
19-
<natures>
20-
<nature>org.eclipse.m2e.core.maven2Nature</nature>
21-
<nature>org.eclipse.jdt.core.javanature</nature>
22-
</natures>
23-
</projectDescription>
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<projectDescription>
3+
<name>scouter.client.product</name>
4+
<comment></comment>
5+
<projects>
6+
</projects>
7+
<buildSpec>
8+
<buildCommand>
9+
<name>org.eclipse.m2e.core.maven2Builder</name>
10+
<arguments>
11+
</arguments>
12+
</buildCommand>
13+
</buildSpec>
14+
<natures>
15+
<nature>org.eclipse.m2e.core.maven2Nature</nature>
16+
</natures>
17+
</projectDescription>

‎scouter.client.product/scouter.client.product

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@
4242
<launcher name="scouter">
4343
<linux icon="icons/launcher.xpm"/>
4444
<macosx icon="icons/launcher.icns"/>
45-
<solaris/>
4645
<win useIco="true">
4746
<ico path="icons/launcher.ico"/>
4847
<bmp/>
@@ -60,11 +59,14 @@
6059
<feature id="scouter.client.feature"/>
6160
<feature id="org.eclipse.emf.ecore"/>
6261
<feature id="org.eclipse.emf.common"/>
62+
<feature id="org.eclipse.e4.rcp" installMode="root"/>
63+
<feature id="org.eclipse.draw2d" installMode="root"/>
6364
</features>
6465

6566
<configurations>
6667
<plugin id="org.eclipse.core.runtime" autoStart="true" startLevel="2" />
67-
<plugin id="org.eclipse.equinox.ds" autoStart="true" startLevel="2" />
68+
<plugin id="org.apache.felix.scr" autoStart="true" startLevel="2" />
69+
<!-- plugin id="org.eclipse.equinox.ds" autoStart="true" startLevel="2" / -->
6870
</configurations>
6971

7072
<preferencesInfo>

‎scouter.client/.classpath

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<classpath>
3-
<classpathentry exported="true" kind="lib" path="lib/activation-1.1.1.jar"/>
4-
<classpathentry exported="true" kind="lib" path="lib/jaxb-api-2.3.1.jar"/>
5-
<classpathentry exported="true" kind="lib" path="lib/jaxb-core-2.3.0.1.jar"/>
6-
<classpathentry exported="true" kind="lib" path="lib/jaxb-impl-2.3.0.1.jar"/>
73
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
84
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
9-
<classpathentry kind="src" path="src"/>
5+
<classpathentry kind="src" path="src/"/>
106
<classpathentry exported="true" kind="lib" path="lib/scouter.common.jar" sourcepath="/scouter.common"/>
7+
<classpathentry exported="true" kind="lib" path="lib/scouter.server.jar"/>
118
<classpathentry exported="true" kind="lib" path="lib/hibernate-core-3.3.2.GA.jar"/>
129
<classpathentry exported="true" kind="lib" path="lib/opencsv-2.4.jar"/>
1310
<classpathentry exported="true" kind="lib" path="lib/opal-1.0.3.jar"/>
14-
<classpathentry kind="lib" path="lib/scouter.server.jar"/>
11+
<classpathentry exported="true" kind="lib" path="lib/activation-1.1.1.jar"/>
12+
<classpathentry exported="true" kind="lib" path="lib/jaxb-api-2.3.1.jar"/>
13+
<classpathentry exported="true" kind="lib" path="lib/jaxb-core-2.3.0.1.jar"/>
14+
<classpathentry exported="true" kind="lib" path="lib/jaxb-impl-2.3.0.1.jar"/>
1515
<classpathentry kind="output" path="target/classes"/>
1616
</classpath>

‎scouter.client/.project

Lines changed: 34 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,34 @@
1-
<?xml version="1.0" encoding="UTF-8"?>
2-
<projectDescription>
3-
<name>scouter.client</name>
4-
<comment></comment>
5-
<projects>
6-
</projects>
7-
<buildSpec>
8-
<buildCommand>
9-
<name>org.eclipse.jdt.core.javabuilder</name>
10-
<arguments>
11-
</arguments>
12-
</buildCommand>
13-
<buildCommand>
14-
<name>org.eclipse.pde.ManifestBuilder</name>
15-
<arguments>
16-
</arguments>
17-
</buildCommand>
18-
<buildCommand>
19-
<name>org.eclipse.pde.SchemaBuilder</name>
20-
<arguments>
21-
</arguments>
22-
</buildCommand>
23-
<buildCommand>
24-
<name>org.eclipse.m2e.core.maven2Builder</name>
25-
<arguments>
26-
</arguments>
27-
</buildCommand>
28-
</buildSpec>
29-
<natures>
30-
<nature>org.eclipse.m2e.core.maven2Nature</nature>
31-
<nature>org.eclipse.pde.PluginNature</nature>
32-
<nature>org.eclipse.jdt.core.javanature</nature>
33-
</natures>
34-
</projectDescription>
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<projectDescription>
3+
<name>scouter.client</name>
4+
<comment></comment>
5+
<projects>
6+
</projects>
7+
<buildSpec>
8+
<buildCommand>
9+
<name>org.eclipse.jdt.core.javabuilder</name>
10+
<arguments>
11+
</arguments>
12+
</buildCommand>
13+
<buildCommand>
14+
<name>org.eclipse.pde.ManifestBuilder</name>
15+
<arguments>
16+
</arguments>
17+
</buildCommand>
18+
<buildCommand>
19+
<name>org.eclipse.pde.SchemaBuilder</name>
20+
<arguments>
21+
</arguments>
22+
</buildCommand>
23+
<buildCommand>
24+
<name>org.eclipse.m2e.core.maven2Builder</name>
25+
<arguments>
26+
</arguments>
27+
</buildCommand>
28+
</buildSpec>
29+
<natures>
30+
<nature>org.eclipse.m2e.core.maven2Nature</nature>
31+
<nature>org.eclipse.pde.PluginNature</nature>
32+
<nature>org.eclipse.jdt.core.javanature</nature>
33+
</natures>
34+
</projectDescription>

‎scouter.client/META-INF/MANIFEST.MF

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@ Bundle-Version: 1.0.0.qualifier
66
Bundle-Activator: scouter.client.Activator
77
Bundle-Localization: message/localization
88
Bundle-Vendor: Scouter Project
9-
Require-Bundle: org.eclipse.ui,
9+
Require-Bundle:
10+
org.eclipse.ui,
1011
org.eclipse.core.runtime,
1112
org.eclipse.ui.console,
1213
org.eclipse.draw2d,
@@ -20,7 +21,10 @@ Require-Bundle: org.eclipse.ui,
2021
org.eclipse.core.databinding.observable,
2122
org.eclipse.core.databinding.property,
2223
org.eclipse.jface.databinding,
23-
com.ibm.icu
24+
com.ibm.icu,
25+
org.eclipse.swt,
26+
org.eclipse.e4.core.commands,
27+
org.eclipse.e4.ui.services
2428
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
2529
Bundle-ActivationPolicy: lazy
2630
Bundle-ClassPath: .,

‎scouter.client/pom.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
<groupId>org.apache.maven.plugins</groupId>
88
<artifactId>maven-compiler-plugin</artifactId>
99
<configuration>
10-
<source>1.8</source>
11-
<target>1.8</target>
10+
<source>11</source>
11+
<target>11</target>
1212
</configuration>
1313
</plugin>
1414
</plugins>
@@ -21,4 +21,4 @@
2121
</parent>
2222
<artifactId>scouter.client</artifactId>
2323
<packaging>eclipse-plugin</packaging>
24-
</project>
24+
</project>

0 commit comments

Comments
 (0)