You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by so...@apache.org on 2021/09/02 10:55:45 UTC
[openmeetings] branch master updated (6e202af -> 2f802e9)
This is an automated email from the ASF dual-hosted git repository.
solomax pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/openmeetings.git.
from 6e202af Merge pull request #147 from apache/feature/OPENMEETINGS-2420-generate-swagger-improvements
new 0d08259 [OPENMEETINGS-2420] whitespaces, dependency versions
new 2f802e9 [OPENMEETINGS-2652] test is fixed
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../test/java/org/apache/openmeetings/web/TestCalendar.java | 2 +-
.../org/apache/openmeetings/webservice/NetTestWebService.java | 2 +-
pom.xml | 10 ++++++++--
3 files changed, 10 insertions(+), 4 deletions(-)
[openmeetings] 01/02: [OPENMEETINGS-2420] whitespaces,
dependency versions
Posted by so...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
solomax pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/openmeetings.git
commit 0d082594b3e36437177306b6aff8d426697419e2
Author: Maxim Solodovnik <so...@gmail.com>
AuthorDate: Thu Sep 2 17:54:58 2021 +0700
[OPENMEETINGS-2420] whitespaces, dependency versions
---
.../org/apache/openmeetings/webservice/NetTestWebService.java | 2 +-
pom.xml | 10 ++++++++--
2 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/NetTestWebService.java b/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/NetTestWebService.java
index ba264b5..6e54572 100644
--- a/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/NetTestWebService.java
+++ b/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/NetTestWebService.java
@@ -44,7 +44,7 @@ import org.springframework.stereotype.Service;
import io.swagger.v3.oas.annotations.tags.Tag;
/**
- *
+ *
* The Service contains methods to trigger a network test
*
*/
diff --git a/pom.xml b/pom.xml
index 485352d..f5306e2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -77,6 +77,7 @@
<forbiddenapis.version>3.1</forbiddenapis.version>
<maven-checkstyle-plugin.version>3.1.1</maven-checkstyle-plugin.version>
<frontend-maven-plugin.version>1.11.0</frontend-maven-plugin.version>
+ <swagger-plugin.version>2.1.6</swagger-plugin.version>
<!-- dependency versions -->
<junit.version>5.7.1</junit.version>
<wicket.version>9.4.0</wicket.version>
@@ -129,7 +130,7 @@
<jaxb-runtime.version>2.3.3</jaxb-runtime.version>
<jquery-ui-touch-punch.version>0.2.3-2</jquery-ui-touch-punch.version>
<apacheds-test-framework.version>2.0.0.AM26</apacheds-test-framework.version>
- <swagger.core.v3.version>2.1.10</swagger.core.v3.version>
+ <swagger.version>2.1.10</swagger.version>
<!-- Exclude all generated code -->
<sonar.exclusions>file:**/generated-sources/**, file:**/jquery-ui.css, file:**/cssemoticons.js, file:**/bootstrap-confirmation.js</sonar.exclusions>
<sonar.java.coveragePlugin>jacoco</sonar.java.coveragePlugin>
@@ -962,7 +963,7 @@
<dependency>
<groupId>io.swagger.core.v3</groupId>
<artifactId>swagger-annotations</artifactId>
- <version>${swagger.core.v3.version}</version>
+ <version>${swagger.version}</version>
</dependency>
<!-- TESTS -->
@@ -1601,6 +1602,11 @@
<artifactId>maven-source-plugin</artifactId>
<version>${maven-source-plugin.version}</version>
</plugin>
+ <plugin>
+ <groupId>io.openapitools.swagger</groupId>
+ <artifactId>swagger-maven-plugin</artifactId>
+ <version>${swagger-plugin.version}</version>
+ </plugin>
</plugins>
</pluginManagement>
</build>
[openmeetings] 02/02: [OPENMEETINGS-2652] test is fixed
Posted by so...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
solomax pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/openmeetings.git
commit 2f802e9d7d1b0df69e79dacb2eb18958585b7465
Author: Maxim Solodovnik <so...@gmail.com>
AuthorDate: Thu Sep 2 17:55:36 2021 +0700
[OPENMEETINGS-2652] test is fixed
---
.../src/test/java/org/apache/openmeetings/web/TestCalendar.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/openmeetings-web/src/test/java/org/apache/openmeetings/web/TestCalendar.java b/openmeetings-web/src/test/java/org/apache/openmeetings/web/TestCalendar.java
index 80e4e33..4d14dfe 100644
--- a/openmeetings-web/src/test/java/org/apache/openmeetings/web/TestCalendar.java
+++ b/openmeetings-web/src/test/java/org/apache/openmeetings/web/TestCalendar.java
@@ -39,7 +39,7 @@ import com.googlecode.wicket.jquery.ui.calendar.CalendarView;
import de.agilecoders.wicket.core.markup.html.bootstrap.navbar.Navbar;
class TestCalendar extends AbstractWicketTester {
- private static final String PATH_APPOINTMENT_DLG = String.format("%s:appointment", PATH_CHILD);
+ private static final String PATH_APPOINTMENT_DLG = String.format("%s:calendarAppointment", PATH_CHILD);
private static final String PATH_APPOINTMENT_DLG_FRM = String.format("%s:appForm", PATH_APPOINTMENT_DLG);
@Test