From 620c53539f2c2a1c857ff4830db2c2d9935e54a7 Mon Sep 17 00:00:00 2001
From: Maximiliano Osorio
Date: Tue, 20 Jun 2023 11:26:15 -0400
Subject: [PATCH 1/2] Solve dependencies conflict (#159)
* fix: remove class path
* add: image
* fix: clean code
* fix: clean code
* add: version of ontapi
* clean code
---
.gitignore | 109 ++++++++++++
.settings/org.eclipse.core.resources.prefs | 2 -
docker-compose.yml | 7 +-
planner/.classpath | 58 -------
planner/.project | 47 ------
.../org.eclipse.core.resources.prefs | 5 -
planner/.settings/org.eclipse.jdt.core.prefs | 12 --
.../org.eclipse.wst.common.component | 5 -
....eclipse.wst.common.project.facet.core.xml | 5 -
.../org.eclipse.wst.validation.prefs | 2 -
planner/pom.xml | 8 +-
portal/.classpath | 57 -------
portal/.project | 48 ------
portal/.settings/org.eclipse.jdt.core.prefs | 24 ---
.../org.eclipse.wst.common.component | 156 ------------------
...se.wst.common.project.facet.core.prefs.xml | 7 -
....eclipse.wst.common.project.facet.core.xml | 8 -
.../org.eclipse.wst.validation.prefs | 2 -
18 files changed, 121 insertions(+), 441 deletions(-)
delete mode 100644 .settings/org.eclipse.core.resources.prefs
delete mode 100644 planner/.classpath
delete mode 100644 planner/.project
delete mode 100644 planner/.settings/org.eclipse.core.resources.prefs
delete mode 100644 planner/.settings/org.eclipse.jdt.core.prefs
delete mode 100644 planner/.settings/org.eclipse.wst.common.component
delete mode 100644 planner/.settings/org.eclipse.wst.common.project.facet.core.xml
delete mode 100644 planner/.settings/org.eclipse.wst.validation.prefs
delete mode 100644 portal/.classpath
delete mode 100644 portal/.project
delete mode 100644 portal/.settings/org.eclipse.jdt.core.prefs
delete mode 100644 portal/.settings/org.eclipse.wst.common.component
delete mode 100644 portal/.settings/org.eclipse.wst.common.project.facet.core.prefs.xml
delete mode 100644 portal/.settings/org.eclipse.wst.common.project.facet.core.xml
delete mode 100644 portal/.settings/org.eclipse.wst.validation.prefs
diff --git a/.gitignore b/.gitignore
index eb3b41fa..8129e2c0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,6 @@
+portal/.classpath
+planner/.classpath
+.settings
target
!/.gitignore
!/.travis.yml
@@ -42,6 +45,10 @@ tmp/
*~.nib
local.properties
.settings/
+portal/.settings/
+planner/.settings/
+portal/.project/
+planner/.project/
.loadpath
.recommenders
@@ -100,3 +107,105 @@ local.properties
# End of https://www.toptal.com/developers/gitignore/api/eclipse
+# Created by https://www.toptal.com/developers/gitignore/api/eclipse
+# Edit at https://www.toptal.com/developers/gitignore?templates=eclipse
+
+### Eclipse ###
+.metadata
+bin/
+tmp/
+*.tmp
+*.bak
+*.swp
+*~.nib
+local.properties
+.settings/
+.loadpath
+.recommenders
+
+# External tool builders
+.externalToolBuilders/
+
+# Locally stored "Eclipse launch configurations"
+*.launch
+
+# PyDev specific (Python IDE for Eclipse)
+*.pydevproject
+
+# CDT-specific (C/C++ Development Tooling)
+.cproject
+
+# CDT- autotools
+.autotools
+
+# Java annotation processor (APT)
+.factorypath
+
+# PDT-specific (PHP Development Tools)
+.buildpath
+
+# sbteclipse plugin
+.target
+
+# Tern plugin
+.tern-project
+
+# TeXlipse plugin
+.texlipse
+
+# STS (Spring Tool Suite)
+.springBeans
+
+# Code Recommenders
+.recommenders/
+
+# Annotation Processing
+.apt_generated/
+.apt_generated_test/
+
+# Scala IDE specific (Scala & Java development for Eclipse)
+.cache-main
+.scala_dependencies
+.worksheet
+
+# Uncomment this line if you wish to ignore the project description file.
+# Typically, this file would be tracked if it contains build/dependency configurations:
+#.project
+
+### Eclipse Patch ###
+# Spring Boot Tooling
+.sts4-cache/
+
+# End of https://www.toptal.com/developers/gitignore/api/eclipse
+
+# Created by https://www.toptal.com/developers/gitignore/api/java
+# Edit at https://www.toptal.com/developers/gitignore?templates=java
+
+### Java ###
+# Compiled class file
+*.class
+
+# Log file
+*.log
+
+# BlueJ files
+*.ctxt
+
+# Mobile Tools for Java (J2ME)
+.mtj.tmp/
+
+# Package Files #
+*.jar
+*.war
+*.nar
+*.ear
+*.zip
+*.tar.gz
+*.rar
+
+# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
+hs_err_pid*
+replay_pid*
+
+# End of https://www.toptal.com/developers/gitignore/api/java
+
diff --git a/.settings/org.eclipse.core.resources.prefs b/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index 99f26c02..00000000
--- a/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,2 +0,0 @@
-eclipse.preferences.version=1
-encoding/=UTF-8
diff --git a/docker-compose.yml b/docker-compose.yml
index 3edf03cb..8d22bc5c 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,7 +1,10 @@
-version: '3'
+version: "3"
services:
wings:
- image: "ikcap/wings:latest"
+ image: ikcap/wings:latest
+ build:
+ context: .
+ dockerfile: wings-docker/docker/default/Dockerfile
environment:
WINGS_MODE: dind
volumes:
diff --git a/planner/.classpath b/planner/.classpath
deleted file mode 100644
index 94fadc55..00000000
--- a/planner/.classpath
+++ /dev/null
@@ -1,58 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/planner/.project b/planner/.project
deleted file mode 100644
index c59db190..00000000
--- a/planner/.project
+++ /dev/null
@@ -1,47 +0,0 @@
-
-
- wings-planner
-
-
-
-
-
- org.eclipse.wst.common.project.facet.core.builder
-
-
-
-
- org.eclipse.jdt.core.javabuilder
-
-
-
-
- org.eclipse.wst.validation.validationbuilder
-
-
-
-
- org.eclipse.m2e.core.maven2Builder
-
-
-
-
-
- org.eclipse.jem.workbench.JavaEMFNature
- org.eclipse.wst.common.modulecore.ModuleCoreNature
- org.eclipse.jdt.core.javanature
- org.eclipse.m2e.core.maven2Nature
- org.eclipse.wst.common.project.facet.core.nature
-
-
-
- 1683829391606
-
- 30
-
- org.eclipse.core.resources.regexFilterMatcher
- node_modules|\.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__
-
-
-
-
diff --git a/planner/.settings/org.eclipse.core.resources.prefs b/planner/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index cdfe4f1b..00000000
--- a/planner/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,5 +0,0 @@
-eclipse.preferences.version=1
-encoding//src/main/java=UTF-8
-encoding//src/test/java=UTF-8
-encoding//src/test/resources=UTF-8
-encoding/=UTF-8
diff --git a/planner/.settings/org.eclipse.jdt.core.prefs b/planner/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 26aef1a5..00000000
--- a/planner/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,12 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
-org.eclipse.jdt.core.compiler.compliance=1.8
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
-org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=ignore
-org.eclipse.jdt.core.compiler.processAnnotations=enabled
-org.eclipse.jdt.core.compiler.release=disabled
-org.eclipse.jdt.core.compiler.source=1.8
diff --git a/planner/.settings/org.eclipse.wst.common.component b/planner/.settings/org.eclipse.wst.common.component
deleted file mode 100644
index f5af1afd..00000000
--- a/planner/.settings/org.eclipse.wst.common.component
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-
-
-
diff --git a/planner/.settings/org.eclipse.wst.common.project.facet.core.xml b/planner/.settings/org.eclipse.wst.common.project.facet.core.xml
deleted file mode 100644
index fb95c457..00000000
--- a/planner/.settings/org.eclipse.wst.common.project.facet.core.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-
-
-
diff --git a/planner/.settings/org.eclipse.wst.validation.prefs b/planner/.settings/org.eclipse.wst.validation.prefs
deleted file mode 100644
index 04cad8cb..00000000
--- a/planner/.settings/org.eclipse.wst.validation.prefs
+++ /dev/null
@@ -1,2 +0,0 @@
-disabled=06target
-eclipse.preferences.version=1
diff --git a/planner/pom.xml b/planner/pom.xml
index d2337291..c554b4e3 100644
--- a/planner/pom.xml
+++ b/planner/pom.xml
@@ -17,7 +17,7 @@
0.1.53
- 1.3.0
+ 1.3.2
0.8.11
2.2.4
4.5
@@ -129,6 +129,12 @@
${commons-io.version}
+
+
+ net.sourceforge.owlapi
+ owlapi-distribution
+ 5.1.6
+
\ No newline at end of file
diff --git a/portal/.classpath b/portal/.classpath
deleted file mode 100644
index 6330fa28..00000000
--- a/portal/.classpath
+++ /dev/null
@@ -1,57 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/portal/.project b/portal/.project
deleted file mode 100644
index 51da256b..00000000
--- a/portal/.project
+++ /dev/null
@@ -1,48 +0,0 @@
-
-
- wings-portal
-
-
-
-
-
- org.eclipse.jdt.core.javabuilder
-
-
-
-
- org.eclipse.wst.common.project.facet.core.builder
-
-
-
-
- org.eclipse.wst.validation.validationbuilder
-
-
-
-
- org.eclipse.m2e.core.maven2Builder
-
-
-
-
-
- org.eclipse.jem.workbench.JavaEMFNature
- org.eclipse.wst.common.modulecore.ModuleCoreNature
- org.eclipse.jdt.core.javanature
- org.eclipse.m2e.core.maven2Nature
- org.eclipse.wst.common.project.facet.core.nature
- org.eclipse.wst.jsdt.core.jsNature
-
-
-
- 1683829391608
-
- 30
-
- org.eclipse.core.resources.regexFilterMatcher
- node_modules|\.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__
-
-
-
-
diff --git a/portal/.settings/org.eclipse.jdt.core.prefs b/portal/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 7fdcd9c8..00000000
--- a/portal/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,24 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.annotation.nonnull=org.eclipse.jdt.annotation.NonNull
-org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable
-org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.8
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
-org.eclipse.jdt.core.compiler.problem.nullAnnotationInferenceConflict=error
-org.eclipse.jdt.core.compiler.problem.nullReference=warning
-org.eclipse.jdt.core.compiler.problem.nullSpecViolation=error
-org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore
-org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
-org.eclipse.jdt.core.compiler.processAnnotations=enabled
-org.eclipse.jdt.core.compiler.release=disabled
-org.eclipse.jdt.core.compiler.source=1.8
diff --git a/portal/.settings/org.eclipse.wst.common.component b/portal/.settings/org.eclipse.wst.common.component
deleted file mode 100644
index eb239089..00000000
--- a/portal/.settings/org.eclipse.wst.common.component
+++ /dev/null
@@ -1,156 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- uses
-
-
- uses
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/portal/.settings/org.eclipse.wst.common.project.facet.core.prefs.xml b/portal/.settings/org.eclipse.wst.common.project.facet.core.prefs.xml
deleted file mode 100644
index cc813850..00000000
--- a/portal/.settings/org.eclipse.wst.common.project.facet.core.prefs.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
-
-
-
-
-
diff --git a/portal/.settings/org.eclipse.wst.common.project.facet.core.xml b/portal/.settings/org.eclipse.wst.common.project.facet.core.xml
deleted file mode 100644
index a157d93b..00000000
--- a/portal/.settings/org.eclipse.wst.common.project.facet.core.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-
-
-
-
-
-
diff --git a/portal/.settings/org.eclipse.wst.validation.prefs b/portal/.settings/org.eclipse.wst.validation.prefs
deleted file mode 100644
index 04cad8cb..00000000
--- a/portal/.settings/org.eclipse.wst.validation.prefs
+++ /dev/null
@@ -1,2 +0,0 @@
-disabled=06target
-eclipse.preferences.version=1
From 194e83d18dc27fdce9c4a108eec5a4502ace2fb6 Mon Sep 17 00:00:00 2001
From: Maximiliano Osorio
Date: Tue, 20 Jun 2023 11:47:45 -0400
Subject: [PATCH 2/2] Release 5.4.3
---
core/pom.xml | 2 +-
planner/pom.xml | 2 +-
pom.xml | 2 +-
portal/pom.xml | 2 +-
portal/src/main/webapp/html/home.html | 2 +-
5 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/core/pom.xml b/core/pom.xml
index 63c1ae1a..24e7cc6c 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -6,7 +6,7 @@
4.0.0
edu.isi.wings
wings-core
- 5.4.2
+ 5.4.3
Wings Core
pom
Wings project for the IKCAP group
diff --git a/planner/pom.xml b/planner/pom.xml
index c554b4e3..bef94211 100644
--- a/planner/pom.xml
+++ b/planner/pom.xml
@@ -11,7 +11,7 @@
edu.isi.wings
wings-core
- 5.4.2
+ 5.4.3
../core/pom.xml
diff --git a/pom.xml b/pom.xml
index 0f924f1c..c8337139 100644
--- a/pom.xml
+++ b/pom.xml
@@ -12,7 +12,7 @@
edu.isi.wings
wings-core
- 5.4.2
+ 5.4.3
core/pom.xml
diff --git a/portal/pom.xml b/portal/pom.xml
index b9c6ad16..cdb830fa 100644
--- a/portal/pom.xml
+++ b/portal/pom.xml
@@ -11,7 +11,7 @@
edu.isi.wings
wings-core
- 5.4.2
+ 5.4.3
../core/pom.xml
diff --git a/portal/src/main/webapp/html/home.html b/portal/src/main/webapp/html/home.html
index 130a782c..4f19c2fd 100644
--- a/portal/src/main/webapp/html/home.html
+++ b/portal/src/main/webapp/html/home.html
@@ -87,6 +87,6 @@ About Wings
- You are running WINGS version: 5.4.2
+ You are running WINGS version: 5.4.3