From 4251bb7b58cbf8f6f6b033fbdeadce5b5387c41f Mon Sep 17 00:00:00 2001 From: Marten Lohstroh Date: Mon, 17 Jun 2024 21:54:40 -0700 Subject: [PATCH 1/2] Attempt to add dependency on commons-text (and remove commons-cli which is not longer needed --- org.lflang/lingua-franca | 2 +- org.lflang/pom.xml | 8 ++++---- pom.xml | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/org.lflang/lingua-franca b/org.lflang/lingua-franca index d420191..3eba547 160000 --- a/org.lflang/lingua-franca +++ b/org.lflang/lingua-franca @@ -1 +1 @@ -Subproject commit d4201912c65cfe6e944dbf12c6ce9cf446d6c90c +Subproject commit 3eba547ec6d8b138239c21c21dcb6aaad8be08ab diff --git a/org.lflang/pom.xml b/org.lflang/pom.xml index c27335d..1fd8729 100644 --- a/org.lflang/pom.xml +++ b/org.lflang/pom.xml @@ -53,11 +53,11 @@ false - + - commons-cli - commons-cli - ${commonsCliVersion} + org.apache.commons + commons-text + ${commonsTextVersion} org.eclipse.emf diff --git a/pom.xml b/pom.xml index 25ff093..b28e8d5 100644 --- a/pom.xml +++ b/pom.xml @@ -16,7 +16,7 @@ - 1.4 + 1.12.0 1.6.21 From 32b196ddddd828fa751b9161961d39aa04dbc94e Mon Sep 17 00:00:00 2001 From: Marten Lohstroh Date: Mon, 17 Jun 2024 22:55:19 -0700 Subject: [PATCH 2/2] Point lingua-franca submodule to latest master --- org.lflang/lingua-franca | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/org.lflang/lingua-franca b/org.lflang/lingua-franca index 3eba547..95b9465 160000 --- a/org.lflang/lingua-franca +++ b/org.lflang/lingua-franca @@ -1 +1 @@ -Subproject commit 3eba547ec6d8b138239c21c21dcb6aaad8be08ab +Subproject commit 95b9465a285126c2446d429378052500f01d5f2d