Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
dbarashev committed Feb 10, 2022
2 parents abc5a37 + e0959a2 commit 940c18a
Show file tree
Hide file tree
Showing 4 changed files with 104 additions and 31 deletions.
70 changes: 70 additions & 0 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,70 @@
# For most projects, this workflow file will not need changing; you simply need
# to commit it to your repository.
#
# You may wish to alter this file to override the set of languages analyzed,
# or to provide custom queries or build logic.
#
# ******** NOTE ********
# We have attempted to detect the languages in your repository. Please check
# the `language` matrix defined below to confirm you have the correct set of
# supported CodeQL languages.
#
name: "CodeQL"

on:
push:
branches: [ master ]
pull_request:
# The branches below must be a subset of the branches above
branches: [ master ]
schedule:
- cron: '37 15 * * 1'

jobs:
analyze:
name: Analyze
runs-on: ubuntu-latest
permissions:
actions: read
contents: read
security-events: write

strategy:
fail-fast: false
matrix:
language: [ 'java' ]
# CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby' ]
# Learn more about CodeQL language support at https://git.io/codeql-language-support

steps:
- name: Checkout repository
uses: actions/checkout@v2

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@v1
with:
languages: ${{ matrix.language }}
# If you wish to specify custom queries, you can do so here or in a config file.
# By default, queries listed here will override any specified in a config file.
# Prefix the list here with "+" to use these queries and those in the config file.
# queries: ./path/to/local/query, your-org/your-repo/queries@main

# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
# If this step fails, then you should remove it and run the build manually (see below)
- name: Autobuild
uses: github/codeql-action/autobuild@v1

# ℹ️ Command-line programs to run using the OS shell.
# 📚 https://git.io/JvXDl

# ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
# and modify them (or add more) to build your code if your project
# uses a compiled language

#- run: |
# make bootstrap
# make release

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v1
5 changes: 1 addition & 4 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,11 +1,8 @@
GanttProject
============
[![Build Status](https://travis-ci.org/bardsoftware/ganttproject.svg?branch=master)](https://travis-ci.org/bardsoftware/ganttproject) [![Dependency Status](https://www.versioneye.com/user/projects/5ac791f20fb24f0ac49c5731/badge.svg?style=flat-square)](https://www.versioneye.com/user/projects/5ac791f20fb24f0ac49c5731)
[![FOSSA Status](https://app.fossa.io/api/projects/git%2Bgithub.com%2Fbardsoftware%2Fganttproject.svg?type=shield)](https://app.fossa.io/projects/git%2Bgithub.com%2Fbardsoftware%2Fganttproject?ref=badge_shield)

GanttProject is an open-source desktop project scheduling and management tool. It is written in Java/Swing.



## License
[![FOSSA Status](https://app.fossa.io/api/projects/git%2Bgithub.com%2Fbardsoftware%2Fganttproject.svg?type=large)](https://app.fossa.io/projects/git%2Bgithub.com%2Fbardsoftware%2Fganttproject?ref=badge_large)
GanttProject is distributed under GPLv3
60 changes: 33 additions & 27 deletions ganttproject-builder/HouseBuildingSample.gan
Original file line number Diff line number Diff line change
@@ -1,14 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?><project name="" company="" webLink="" view-date="2020-12-01" view-index="0" gantt-divider-location="369" resource-divider-location="322" version="3.0.2914" locale="en">
<?xml version="1.0" encoding="UTF-8"?><project name="" company="" webLink="" view-date="2022-01-01" view-index="0" gantt-divider-location="404" resource-divider-location="322" version="3.2.3200" locale="en">
<description/>
<view zooming-state="default:8" id="gantt-chart">
<field id="tpd3" name="Name" width="158" order="0"/>
<field id="tpd4" name="Begin date" width="70" order="1"/>
<field id="tpd5" name="End date" width="67" order="2"/>
<field id="tpd12" name="Cost" width="68" order="3"/>
<field id="tpd3" name="Name" width="200" order="0"/>
<field id="tpd4" name="Begin date" width="75" order="1"/>
<field id="tpd5" name="End date" width="75" order="2"/>
<field id="tpd12" name="Cost" width="38" order="3"/>
<option id="taskLabelUp" value=""/>
<option id="taskLabelLeft" value="name"/>
<option id="filter.completedTasks" value="false"/>
<timeline>
<![CDATA[49]]>
</timeline>
</view>
<view id="resource-table">
<field id="0" name="Name" width="159" order="0"/>
<field id="1" name="Default role" width="157" order="1"/>
<field id="0" name="Name" width="160" order="0"/>
<field id="1" name="Default role" width="158" order="1"/>
</view>
<!-- -->
<calendars>
Expand All @@ -35,61 +41,61 @@
<taskproperty id="tpd8" name="coordinator" type="default" valuetype="text"/>
<taskproperty id="tpd9" name="predecessorsr" type="default" valuetype="text"/>
</taskproperties>
<task id="0" name="Architectural design" color="#99ccff" meeting="false" start="2020-12-23" duration="25" complete="85" expand="true">
<task id="9" name="Create draft of architecture" color="#99ccff" meeting="false" start="2020-12-23" duration="10" complete="100" expand="true">
<task id="0" name="Architectural design" color="#99ccff" meeting="false" start="2022-02-10" duration="25" complete="85" expand="true">
<task id="9" name="Create draft of architecture" color="#99ccff" meeting="false" start="2022-02-10" duration="10" complete="100" expand="true">
<depend id="10" type="2" difference="0" hardness="Strong"/>
<depend id="12" type="2" difference="0" hardness="Strong"/>
</task>
<task id="10" name="Prepare construction documents" color="#99ccff" meeting="false" start="2021-01-06" duration="15" complete="75" expand="true">
<task id="10" name="Prepare construction documents" color="#99ccff" meeting="false" start="2022-02-24" duration="15" complete="75" expand="true">
<depend id="17" type="2" difference="0" hardness="Strong"/>
</task>
<task id="17" name="Agreement on architectural plan " color="#000000" meeting="true" start="2021-01-27" duration="0" complete="0" expand="true">
<task id="17" name="Agreement on architectural plan " color="#000000" meeting="true" start="2022-03-17" duration="0" complete="0" expand="true">
<depend id="1" type="2" difference="0" hardness="Strong"/>
</task>
</task>
<task id="11" name="Interior design" color="#99ccff" meeting="false" start="2021-01-06" duration="10" complete="33" expand="true">
<task id="11" name="Interior design" color="#99ccff" meeting="false" start="2022-02-24" duration="10" complete="33" expand="true">
<depend id="6" type="2" difference="0" hardness="Strong"/>
<task id="12" name="Pre-design" color="#99ccff" meeting="false" start="2021-01-06" duration="5" complete="100" expand="true">
<task id="12" name="Pre-design" color="#99ccff" meeting="false" start="2022-02-24" duration="5" complete="100" expand="true">
<depend id="13" type="2" difference="0" hardness="Strong"/>
<depend id="14" type="2" difference="0" hardness="Strong"/>
</task>
<task id="13" name="Furniture selection" color="#99ccff" meeting="false" start="2021-01-13" duration="5" complete="0" expand="true"/>
<task id="14" name="Equipment planning" color="#99ccff" meeting="false" start="2021-01-13" duration="5" complete="0" expand="true">
<task id="13" name="Furniture selection" color="#99ccff" meeting="false" start="2022-03-03" duration="5" complete="0" expand="true"/>
<task id="14" name="Equipment planning" color="#99ccff" meeting="false" start="2022-03-03" duration="5" complete="0" expand="true">
<notes>
<![CDATA[Embedded devices, kitchen, washing machine, dryer etc]]>
</notes>
</task>
</task>
<task id="7" name="Construction phase" color="#99ccff" meeting="false" start="2021-01-27" duration="75" complete="0" expand="true">
<task id="7" name="Construction phase" color="#99ccff" meeting="false" start="2022-03-17" duration="75" complete="0" expand="true">
<depend id="20" type="2" difference="0" hardness="Strong"/>
<task id="1" name="Foundation building" color="#99ccff" meeting="false" start="2021-01-27" duration="15" complete="0" expand="false">
<task id="1" name="Foundation building" color="#99ccff" meeting="false" start="2022-03-17" duration="15" complete="0" expand="true">
<depend id="2" type="2" difference="0" hardness="Strong"/>
</task>
<task id="2" name="Ground Floor building" color="#99ccff" meeting="false" start="2021-02-17" duration="20" complete="0" expand="false">
<task id="2" name="Ground Floor building" color="#99ccff" meeting="false" start="2022-04-07" duration="20" complete="0" expand="true">
<depend id="4" type="2" difference="0" hardness="Strong"/>
</task>
<task id="4" name="First Floor building" color="#99ccff" meeting="false" start="2021-03-17" duration="20" complete="0" expand="false">
<task id="4" name="First Floor building" color="#99ccff" meeting="false" start="2022-05-05" duration="20" complete="0" expand="true">
<depend id="5" type="2" difference="0" hardness="Strong"/>
</task>
<task id="5" name="Roof" color="#99ccff" meeting="false" start="2021-04-14" duration="10" complete="0" expand="false">
<task id="5" name="Roof" color="#99ccff" meeting="false" start="2022-06-02" duration="10" complete="0" expand="true">
<depend id="18" type="2" difference="0" hardness="Strong"/>
</task>
<task id="16" name="Connect to communications" color="#99ccff" meeting="false" start="2021-04-28" duration="10" complete="0" expand="true"/>
<task id="18" name="Construction completed " color="#000000" meeting="true" start="2021-04-28" duration="0" complete="0" expand="true">
<task id="16" name="Connect to communications" color="#99ccff" meeting="false" start="2022-06-16" duration="10" complete="0" expand="true"/>
<task id="18" name="Construction completed " color="#000000" meeting="true" start="2022-06-16" duration="0" complete="0" expand="true">
<depend id="6" type="2" difference="0" hardness="Strong"/>
<depend id="16" type="2" difference="0" hardness="Strong"/>
</task>
</task>
<task id="8" name="Decoration phase" color="#99ccff" meeting="false" start="2021-04-28" duration="10" complete="0" expand="true">
<task id="6" name="Walls" color="#99ccff" meeting="false" start="2021-04-28" duration="5" complete="0" expand="false">
<task id="8" name="Decoration phase" color="#99ccff" meeting="false" start="2022-06-16" duration="10" complete="0" expand="true">
<task id="6" name="Walls" color="#99ccff" meeting="false" start="2022-06-16" duration="5" complete="0" expand="true">
<depend id="15" type="2" difference="0" hardness="Strong"/>
</task>
<task id="15" name="Furniture" color="#99ccff" meeting="false" start="2021-05-05" duration="3" complete="0" expand="true">
<task id="15" name="Furniture" color="#99ccff" meeting="false" start="2022-06-23" duration="3" complete="0" expand="true">
<depend id="20" type="2" difference="0" hardness="Strong"/>
</task>
<task id="20" name="Bring your family here" color="#000000" meeting="true" start="2021-05-12" duration="0" complete="0" expand="true"/>
<task id="20" name="Bring your family here" color="#000000" meeting="true" start="2022-06-30" duration="0" complete="0" expand="true"/>
</task>
<task id="49" name="GanttProject 3.0 Release Candidate" color="#ff3333" meeting="true" start="2020-12-23" duration="0" complete="0" thirdDate="2018-02-06" thirdDate-constraint="0" expand="true">
<task id="49" name="GanttProject 3.2" color="#ff3333" meeting="true" start="2022-02-10" duration="0" complete="0" thirdDate="2018-02-06" thirdDate-constraint="0" expand="true">
<depend id="0" type="2" difference="0" hardness="Rubber"/>
</task>
</tasks>
Expand Down
Binary file modified ganttproject/lib/core/eclipsito.jar
Binary file not shown.

0 comments on commit 940c18a

Please sign in to comment.