Skip to content

Commit 620c535

Browse files
authored
Solve dependencies conflict (#159)
* fix: remove class path * add: image * fix: clean code * fix: clean code * add: version of ontapi * clean code
1 parent 636e07f commit 620c535

18 files changed

+121
-441
lines changed

.gitignore

Lines changed: 109 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
portal/.classpath
2+
planner/.classpath
3+
.settings
14
target
25
!/.gitignore
36
!/.travis.yml
@@ -42,6 +45,10 @@ tmp/
4245
*~.nib
4346
local.properties
4447
.settings/
48+
portal/.settings/
49+
planner/.settings/
50+
portal/.project/
51+
planner/.project/
4552
.loadpath
4653
.recommenders
4754

@@ -100,3 +107,105 @@ local.properties
100107

101108
# End of https://www.toptal.com/developers/gitignore/api/eclipse
102109

110+
# Created by https://www.toptal.com/developers/gitignore/api/eclipse
111+
# Edit at https://www.toptal.com/developers/gitignore?templates=eclipse
112+
113+
### Eclipse ###
114+
.metadata
115+
bin/
116+
tmp/
117+
*.tmp
118+
*.bak
119+
*.swp
120+
*~.nib
121+
local.properties
122+
.settings/
123+
.loadpath
124+
.recommenders
125+
126+
# External tool builders
127+
.externalToolBuilders/
128+
129+
# Locally stored "Eclipse launch configurations"
130+
*.launch
131+
132+
# PyDev specific (Python IDE for Eclipse)
133+
*.pydevproject
134+
135+
# CDT-specific (C/C++ Development Tooling)
136+
.cproject
137+
138+
# CDT- autotools
139+
.autotools
140+
141+
# Java annotation processor (APT)
142+
.factorypath
143+
144+
# PDT-specific (PHP Development Tools)
145+
.buildpath
146+
147+
# sbteclipse plugin
148+
.target
149+
150+
# Tern plugin
151+
.tern-project
152+
153+
# TeXlipse plugin
154+
.texlipse
155+
156+
# STS (Spring Tool Suite)
157+
.springBeans
158+
159+
# Code Recommenders
160+
.recommenders/
161+
162+
# Annotation Processing
163+
.apt_generated/
164+
.apt_generated_test/
165+
166+
# Scala IDE specific (Scala & Java development for Eclipse)
167+
.cache-main
168+
.scala_dependencies
169+
.worksheet
170+
171+
# Uncomment this line if you wish to ignore the project description file.
172+
# Typically, this file would be tracked if it contains build/dependency configurations:
173+
#.project
174+
175+
### Eclipse Patch ###
176+
# Spring Boot Tooling
177+
.sts4-cache/
178+
179+
# End of https://www.toptal.com/developers/gitignore/api/eclipse
180+
181+
# Created by https://www.toptal.com/developers/gitignore/api/java
182+
# Edit at https://www.toptal.com/developers/gitignore?templates=java
183+
184+
### Java ###
185+
# Compiled class file
186+
*.class
187+
188+
# Log file
189+
*.log
190+
191+
# BlueJ files
192+
*.ctxt
193+
194+
# Mobile Tools for Java (J2ME)
195+
.mtj.tmp/
196+
197+
# Package Files #
198+
*.jar
199+
*.war
200+
*.nar
201+
*.ear
202+
*.zip
203+
*.tar.gz
204+
*.rar
205+
206+
# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
207+
hs_err_pid*
208+
replay_pid*
209+
210+
# End of https://www.toptal.com/developers/gitignore/api/java
211+

.settings/org.eclipse.core.resources.prefs

Lines changed: 0 additions & 2 deletions
This file was deleted.

docker-compose.yml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
1-
version: '3'
1+
version: "3"
22
services:
33
wings:
4-
image: "ikcap/wings:latest"
4+
image: ikcap/wings:latest
5+
build:
6+
context: .
7+
dockerfile: wings-docker/docker/default/Dockerfile
58
environment:
69
WINGS_MODE: dind
710
volumes:

planner/.classpath

Lines changed: 0 additions & 58 deletions
This file was deleted.

planner/.project

Lines changed: 0 additions & 47 deletions
This file was deleted.

planner/.settings/org.eclipse.core.resources.prefs

Lines changed: 0 additions & 5 deletions
This file was deleted.

planner/.settings/org.eclipse.jdt.core.prefs

Lines changed: 0 additions & 12 deletions
This file was deleted.

planner/.settings/org.eclipse.wst.common.component

Lines changed: 0 additions & 5 deletions
This file was deleted.

planner/.settings/org.eclipse.wst.common.project.facet.core.xml

Lines changed: 0 additions & 5 deletions
This file was deleted.

planner/.settings/org.eclipse.wst.validation.prefs

Lines changed: 0 additions & 2 deletions
This file was deleted.

0 commit comments

Comments
 (0)