Skip to content

Commit 264304a

Browse files
viktor44viktor44
committed
macos distr
1 parent 37e27cc commit 264304a

File tree

7 files changed

+120
-119
lines changed

7 files changed

+120
-119
lines changed

‎.github/workflows/release.yml

Lines changed: 47 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -1,46 +1,47 @@
1-
name: Release
2-
3-
on:
4-
push:
5-
tags:
6-
- 'v*'
7-
8-
jobs:
9-
10-
MacOs:
11-
runs-on: macos-13
12-
steps:
13-
- uses: actions/checkout@v4
14-
- uses: actions/setup-java@v4
15-
with:
16-
java-version: '17'
17-
distribution: 'temurin'
18-
architecture: x64
19-
- run: |
20-
./mvnw clean package --batch-mode --no-transfer-progress
21-
- run: |
22-
$JAVA_HOME/bin/jpackage @target/jpackage-macos.args --type dmg
23-
shell: cmd
24-
- uses: softprops/action-gh-release@v2
25-
with:
26-
draft: true
27-
files: target/distr/win/*.dmg
28-
29-
Windows:
30-
runs-on: windows-2019
31-
steps:
32-
- uses: actions/checkout@v4
33-
- uses: actions/setup-java@v4
34-
with:
35-
java-version: '17'
36-
distribution: 'temurin'
37-
architecture: x64
38-
- run: |
39-
./mvnw clean package --batch-mode --no-transfer-progress
40-
- run: |
41-
%JAVA_HOME%\bin\jpackage.exe @target\jpackage-win.args --type exe
42-
shell: cmd
43-
- uses: softprops/action-gh-release@v2
44-
with:
45-
draft: true
46-
files: target/distr/win/*.exe
1+
name: Release
2+
3+
on:
4+
push:
5+
tags:
6+
- 'v*'
7+
8+
jobs:
9+
10+
MacOs:
11+
runs-on: macos-13
12+
steps:
13+
- uses: actions/checkout@v4
14+
- uses: actions/setup-java@v4
15+
with:
16+
java-version: '17'
17+
distribution: 'temurin'
18+
architecture: x64
19+
- run: |
20+
chmod 755 mvnw
21+
./mvnw clean package --batch-mode --no-transfer-progress
22+
- run: |
23+
$JAVA_HOME/bin/jpackage @target/jpackage-macos.args --type dmg
24+
shell: cmd
25+
- uses: softprops/action-gh-release@v2
26+
with:
27+
draft: true
28+
files: target/distr/win/*.dmg
29+
30+
Windows:
31+
runs-on: windows-2019
32+
steps:
33+
- uses: actions/checkout@v4
34+
- uses: actions/setup-java@v4
35+
with:
36+
java-version: '17'
37+
distribution: 'temurin'
38+
architecture: x64
39+
- run: |
40+
./mvnw clean package --batch-mode --no-transfer-progress
41+
- run: |
42+
%JAVA_HOME%\bin\jpackage.exe @target\jpackage-win.args --type exe
43+
shell: cmd
44+
- uses: softprops/action-gh-release@v2
45+
with:
46+
draft: true
47+
files: target/distr/win/*.exe

‎.mvn/wrapper/maven-wrapper.properties

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
1-
# Licensed to the Apache Software Foundation (ASF) under one
2-
# or more contributor license agreements. See the NOTICE file
3-
# distributed with this work for additional information
4-
# regarding copyright ownership. The ASF licenses this file
5-
# to you under the Apache License, Version 2.0 (the
6-
# "License"); you may not use this file except in compliance
7-
# with the License. You may obtain a copy of the License at
8-
#
9-
# http://www.apache.org/licenses/LICENSE-2.0
10-
#
11-
# Unless required by applicable law or agreed to in writing,
12-
# software distributed under the License is distributed on an
13-
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
14-
# KIND, either express or implied. See the License for the
15-
# specific language governing permissions and limitations
16-
# under the License.
17-
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.6/apache-maven-3.9.6-bin.zip
18-
wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar
1+
# Licensed to the Apache Software Foundation (ASF) under one
2+
# or more contributor license agreements. See the NOTICE file
3+
# distributed with this work for additional information
4+
# regarding copyright ownership. The ASF licenses this file
5+
# to you under the Apache License, Version 2.0 (the
6+
# "License"); you may not use this file except in compliance
7+
# with the License. You may obtain a copy of the License at
8+
#
9+
# http://www.apache.org/licenses/LICENSE-2.0
10+
#
11+
# Unless required by applicable law or agreed to in writing,
12+
# software distributed under the License is distributed on an
13+
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
14+
# KIND, either express or implied. See the License for the
15+
# specific language governing permissions and limitations
16+
# under the License.
17+
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.6/apache-maven-3.9.6-bin.zip
18+
wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar

‎README.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
# ZooInspector-N
2-
3-
ZooInspector-N is a desktop application for browsing and editing ZooKeeper instances.
4-
5-
Based on ZooInspector with many improvements
1+
# ZooInspector-N
2+
3+
ZooInspector-N is a desktop application for browsing and editing ZooKeeper instances.
4+
5+
Based on ZooInspector with many improvements

‎src/assembly/jpackage-macos.args

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
--icon etc/distr/app.icns
2-
--input target/out/lib
3-
--dest target/distr/macos
4-
--name ZooInspectorN
5-
--vendor Viktor44
6-
--app-version ${parsedVersion.majorVersion}.${parsedVersion.minorVersion}
7-
--main-jar ${project.build.finalName}.jar
8-
1+
--icon etc/distr/app.icns
2+
--input target/out/lib
3+
--dest target/distr/macos
4+
--name ZooInspectorN
5+
--vendor Viktor44
6+
--app-version ${parsedVersion.majorVersion}.${parsedVersion.minorVersion}
7+
--main-jar ${project.build.finalName}.jar
8+

‎src/assembly/jpackage-win.args

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
--icon etc\distr\app.ico
2-
--input target\out\lib
3-
--dest target\distr\win
4-
--name ZooInspectorN
5-
--vendor Viktor44
6-
--app-version ${parsedVersion.majorVersion}.${parsedVersion.minorVersion}
7-
--main-jar ${project.build.finalName}.jar
8-
1+
--icon etc\distr\app.ico
2+
--input target\out\lib
3+
--dest target\distr\win
4+
--name ZooInspectorN
5+
--vendor Viktor44
6+
--app-version ${parsedVersion.majorVersion}.${parsedVersion.minorVersion}
7+
--main-jar ${project.build.finalName}.jar
8+

‎src/assembly/src.xml

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,30 @@
1-
<?xml version="1.0" encoding="UTF-8"?>
2-
<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2"
3-
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4-
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2
5-
http://maven.apache.org/xsd/assembly-1.1.2.xsd">
6-
<id>distr</id>
7-
<formats>
8-
<format>zip</format>
9-
</formats>
10-
<baseDirectory>${project.artifactId}</baseDirectory>
11-
<includeBaseDirectory>true</includeBaseDirectory>
12-
<fileSets>
13-
<fileSet>
14-
<directory>${project.build.directory}/out</directory>
15-
<outputDirectory>/</outputDirectory>
16-
<fileMode>0777</fileMode>
17-
<includes>
18-
<include>**/*.sh</include>
19-
</includes>
20-
</fileSet>
21-
<fileSet>
22-
<directory>${project.build.directory}/out</directory>
23-
<outputDirectory>/</outputDirectory>
24-
<fileMode>0666</fileMode>
25-
<excludes>
26-
<exclude>**/*.sh</exclude>
27-
</excludes>
28-
</fileSet>
29-
</fileSets>
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2"
3+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4+
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2
5+
http://maven.apache.org/xsd/assembly-1.1.2.xsd">
6+
<id>distr</id>
7+
<formats>
8+
<format>zip</format>
9+
</formats>
10+
<baseDirectory>${project.artifactId}</baseDirectory>
11+
<includeBaseDirectory>true</includeBaseDirectory>
12+
<fileSets>
13+
<fileSet>
14+
<directory>${project.build.directory}/out</directory>
15+
<outputDirectory>/</outputDirectory>
16+
<fileMode>0777</fileMode>
17+
<includes>
18+
<include>**/*.sh</include>
19+
</includes>
20+
</fileSet>
21+
<fileSet>
22+
<directory>${project.build.directory}/out</directory>
23+
<outputDirectory>/</outputDirectory>
24+
<fileMode>0666</fileMode>
25+
<excludes>
26+
<exclude>**/*.sh</exclude>
27+
</excludes>
28+
</fileSet>
29+
</fileSets>
3030
</assembly>

‎src/main/resources/defaultConnectionSettings.cfg

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
hosts=localhost\:2181
2-
encryptionManager=org.apache.zookeeper.inspector.encryption.BasicDataEncryptionManager
3-
authData=
4-
timeout=10000
5-
authScheme=
1+
hosts=localhost\:2181
2+
encryptionManager=org.apache.zookeeper.inspector.encryption.BasicDataEncryptionManager
3+
authData=
4+
timeout=10000
5+
authScheme=

0 commit comments

Comments
 (0)