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 2022/06/20 07:13:17 UTC

[openmeetings] branch master updated (b9b09e24c -> 9a8bddaea)

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 b9b09e24c [OPENMEETINGS-2732] wicket-bootstrap, font-awesome, spring, ical4j, h2, swagger
     new fec6e2510 OPENMEETINGS-2743 Add option to use bytebuddy for Wikcet cglib.
     new 9a8bddaea OPENMEETINGS-2743 Fix duplicated dependency.

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:
 openmeetings-server/src/site/xdoc/BuildInstructions.xml | 4 ++--
 openmeetings-web/pom.xml                                | 4 ++++
 pom.xml                                                 | 6 ++++++
 3 files changed, 12 insertions(+), 2 deletions(-)


[openmeetings] 01/02: OPENMEETINGS-2743 Add option to use bytebuddy for Wikcet cglib.

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 fec6e2510d5caf4188b94f09d25fa04d010e2444
Author: Sebastian <se...@apache.org>
AuthorDate: Sun Jun 19 15:05:32 2022 +1200

    OPENMEETINGS-2743 Add option to use bytebuddy for Wikcet cglib.
---
 openmeetings-server/src/site/xdoc/BuildInstructions.xml |  4 ++--
 openmeetings-web/pom.xml                                |  4 ++++
 pom.xml                                                 | 11 +++++++++++
 3 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/openmeetings-server/src/site/xdoc/BuildInstructions.xml b/openmeetings-server/src/site/xdoc/BuildInstructions.xml
index 3d8408ccc..76aa9a672 100644
--- a/openmeetings-server/src/site/xdoc/BuildInstructions.xml
+++ b/openmeetings-server/src/site/xdoc/BuildInstructions.xml
@@ -63,10 +63,10 @@
 		<section name="Tips and Gotchas">
 			<p>Eclipse ANSI colors plugin for colors in console</p>
 			<source><![CDATA[
-MAVEN_OPTS='-Xdebug -Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=n' mvn clean -P allModules,quick,mysql jetty:run-exploded
+MAVEN_OPTS='-Xdebug -Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=n' mvn clean -P allModules,quick,mysql jetty:run-exploded -Dwicket.ioc.useByteBuddy=true
 
 #Quick rebuild and run
-cd ..; mvn clean install -PallModules,quick,mysql -pl openmeetings-util,openmeetings-core; cd openmeetings-web; MAVEN_OPTS='-Xdebug -Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=n' mvn clean -P allModules,quick,mysql jetty:run-exploded
+cd ..; mvn clean install -PallModules,quick,mysql -pl openmeetings-util,openmeetings-core; cd openmeetings-web; MAVEN_OPTS='-Xdebug -Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=n' mvn clean -P allModules,quick,mysql jetty:run-exploded -Dwicket.ioc.useByteBuddy=true
 
 			]]></source>
 			<p>In case you would like to develop Openmeetings you need to run <i>"unpacked"</i> build: </p>
diff --git a/openmeetings-web/pom.xml b/openmeetings-web/pom.xml
index 821926217..33111bd45 100644
--- a/openmeetings-web/pom.xml
+++ b/openmeetings-web/pom.xml
@@ -47,6 +47,10 @@
 					<groupId>mysql</groupId>
 					<artifactId>mysql-connector-java</artifactId>
 				</dependency>
+				<dependency>
+					<groupId>net.bytebuddy</groupId>
+					<artifactId>byte-buddy</artifactId>
+				</dependency>
 			</dependencies>
 		</profile>
 		<profile>
diff --git a/pom.xml b/pom.xml
index 81d463fb9..f2113df54 100644
--- a/pom.xml
+++ b/pom.xml
@@ -132,6 +132,7 @@
 		<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.version>2.2.1</swagger.version>
+		<bytebuddy.version>1.12.10</bytebuddy.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>
@@ -869,6 +870,16 @@
 				<artifactId>mysql-connector-java</artifactId>
 				<version>${mysql.version}</version>
 			</dependency>
+			<dependency>
+				<groupId>mysql</groupId>
+				<artifactId>mysql-connector-java</artifactId>
+				<version>${mysql.version}</version>
+			</dependency>
+			<dependency>
+				<groupId>net.bytebuddy</groupId>
+				<artifactId>byte-buddy</artifactId>
+				<version>${bytebuddy.version}</version>
+			</dependency>
 			<dependency>
 				<groupId>org.webjars</groupId>
 				<artifactId>jasny-bootstrap</artifactId>


[openmeetings] 02/02: OPENMEETINGS-2743 Fix duplicated dependency.

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 9a8bddaeaf8f11b418f86b3d55be63bdd89e96ad
Author: Sebastian <se...@apache.org>
AuthorDate: Sun Jun 19 15:08:50 2022 +1200

    OPENMEETINGS-2743 Fix duplicated dependency.
---
 pom.xml | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/pom.xml b/pom.xml
index f2113df54..751648ac7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -870,11 +870,6 @@
 				<artifactId>mysql-connector-java</artifactId>
 				<version>${mysql.version}</version>
 			</dependency>
-			<dependency>
-				<groupId>mysql</groupId>
-				<artifactId>mysql-connector-java</artifactId>
-				<version>${mysql.version}</version>
-			</dependency>
 			<dependency>
 				<groupId>net.bytebuddy</groupId>
 				<artifactId>byte-buddy</artifactId>