Commit Graph

32 Commits

Author SHA1 Message Date
4c7f54d2be Denote Spark 2.9.1 Release 2020-08-25 13:14:31 -05:00
5916368145 march master branch toward 2.9.1-SNAPSHOT 2020-08-17 08:13:37 -05:00
f1465b521d Denote Spark 2.9.0 Release 2020-08-17 07:13:31 -05:00
6eb7905d45 Add OWASP dependency check to build
The check is currenty optional and placed
inside the profile 'owasp-check'.
One can directly invoke the plugin via
 'mvn org.owasp:dependency-check-maven:check'
An attempt at resolving SPARK-2113.
2020-08-16 19:14:51 +02:00
6b89d28ef7 Bump Bouncy Castle to 1.66 2020-08-08 15:55:38 +03:00
4af4d40e9c Merge pull request #482 from Neustradamus/bouncycastle
SPARK-2146: Bouncy Castle 1.65 instead of 1.57
2020-08-08 15:46:50 +03:00
c9ae731781 Merge pull request #492 from guusdk/SPARK-2068_emoticons
SPARK-2068: Restore emoticons
2020-08-03 01:09:01 +03:00
08ee639b04 SPARK-2068: Restore emoticons
This commit fixes the distribution packaging to include the emoticons. Additionally, the code that verifies if emoticons exist in the user home directory is a bit more error resistant now.
2020-08-03 00:04:14 +02:00
b3131e3911 SPARK-2132: Replace JxBrowser with Lobobrowser
This commit reverts back the change from Lobobrowser to JxBrowser, as we failed to get a license for JxBrowser.

As a result, the Meet plugin (which depends features not supported by Lobobrowser) was excluded from the Maven project.
2020-08-02 22:52:30 +02:00
1d9bec0a9d Bouncy Castle 1.65 instead of 1.57
Bouncy Castle 1.65 instead of 1.57: https://www.bouncycastle.org/releasenotes.html
- http://www.bouncycastle.org/latest_releases.html

CVEs: https://www.cvedetails.com/vulnerability-list/vendor_id-7637/Bouncycastle.html
2020-04-11 08:47:50 +02:00
4156ee0fed Use HTTPS instead of HTTP to resolve dependencies
This fixes a security vulnerability in this project where the `pom.xml`
files were configuring Maven to resolve dependencies over HTTP instead of
HTTPS.

Signed-off-by: Jonathan Leitschuh <Jonathan.Leitschuh@gmail.com>
2020-02-11 15:35:29 +01:00
e0bfe053f1 SPARK-2112 update dependencies 2019-04-18 11:13:16 +03:00
f35aaf2f2d Fix maven assembly plugin version in core/pom.xml
Fixup from f40b4452f3
2019-03-09 17:09:27 +01:00
5b35a8b4dd Remove duplicate version declaration 2019-03-07 07:49:00 +01:00
411d19fb4e Use Smack 4.3.3-SNAPSHOT 2019-02-25 20:59:14 +01:00
f40b4452f3 Update Maven plugins 2019-02-25 20:59:04 +01:00
e918bf50f6 Remove smack-core dependency
as this is a transitive dependency, it does not need to be declared
explicitly.
2019-02-24 00:28:03 +01:00
eafbd2573c Update Smack to 4.3 2018-07-04 14:16:46 +02:00
ff6dc8d4c5 Let core not depend on the emoticons packs
Those are additional and not strictly required (although
recommended). The hard dependency makes the 'exec:java' maven goal
fail if the emoticons artifacts are not installed (typically in the
local maven repository).
2018-06-20 08:05:04 +02:00
0a159aa2d7 Add exec-maven-plugin to run Spark from sources 2018-06-19 14:13:43 +02:00
6cc5826a7f SPARK-2047: Improve version number detection. 2018-01-18 12:39:32 +01:00
c4d3da06ff Merge pull request #368 from deleolajide/plugin-meet-0.4.0
Openfire meetings pluginfor Spark 0.4.0
2017-08-16 16:24:27 +02:00
8b5b1f17fd update lookandfeel version to 2.0.1 2017-08-14 18:01:33 +08:00
45c9153112 made meet plugin compatible with openfire ofmeet plugin 0.9.x
made meet plugin compatible with maven build
replaced electron chromium web browser with built-in jxbrowser
2017-08-13 18:34:44 +01:00
f7c09f7088 SPARK-1966, SPARK-1952, SPARK-1969, SPARK-1970, SPARK-1971 and partially SPARK-1968 2017-08-03 22:47:40 +02:00
a69eb3835c Merge pull request #355 from guusdk/efficiency
Efficiency
2017-07-23 11:42:22 +03:00
a47a46e37c SPARK-1965: Replace emoticon archives with separate files in version control
Instead of adding the zip files to git, this commit adds the unzipped content, and ensures that the Maven build generates the zip files. This way, editing is a lot easier, and changes are better tracked.
2017-07-23 00:30:53 +02:00
a2d9f7082a Extensions extraction 2017-06-30 12:14:00 +02:00
11b1dbb347 Don't declare transitive Smack dependencies
The artifacts smack-resolver-javax and smack-sasl-javax are transitive
dependencies of smack-java7. That is all we need to depend on.
2017-04-04 15:41:25 +02:00
2e6993df43 Fix for improvement: SPARK-1872.
Added new image cropping library.
Implemented resizing of large images.
2017-03-25 08:21:08 +01:00
3602a8a5f4 Preparing for next version number for Spark: 2.9.0. (#306) 2017-02-22 23:14:23 +02:00
6c64f5cba4 SPARK-1791: Maven (#305)
* SPARK-1791: Re-organize into a Maven structure.

This commit re-organizes the Spark code base into a Apache Maven-compatible struture.

The project in this commit can be used to create a working Spark instance, by executing:

    mvn clean package

An assembly (tied to the package phase) is used to generate a distributable directory.

The includes EJ-Technologies install4j configuration file has been adjusted to reflect the changes, and can be used to generate most types of distributables. This requires the non-free install4j application to be installed at the host that executes the build.

The build currently misses all 'external' plugins. Work remains to be done to move that into a Maven structure. A future improvement to this structure could include splitting off the assembly part from the core module, into a dedicated module, that allows for easy inclusiong of plugin-module artifacts.

* SPARK-1791: Replace JTattoo source with Maven artifact.

The JTattoo theme can be retrieved as a Maven artifact. No need to include the original source code in Spark.

* SPARK-1791: Moved Roar plugin into Maven structure

This commit reorganizes the bulk of the code for the Roar plugin into a Maven structure. It is not a functional Maven module yet though.

* SPARK-1791: Introduce parent project.

This commit adds a parent project, that wraps the pre-existing 'core' module. It is expected that other modules (for example, plugins) are added to this parent project later.

* SPARK-1791: Remove Ant from Travis config.

The Travis Continuous Integration platform should no longer try to execute the Apache Ant script, that has now been replaced by the pom.xml files from Maven.

* SPARK-1791: Distributales should include plugins.

The earlier structure generated the Spark distributables from the 'core' module. This module did not contain optional features (notably: plugins). This in turn made it impossible to include those optional features in the distributables.

To work around this problem, the distributables are now created in a dedicated module (aptly named 'distribution'). This module defines dependencies and assembly references to other modules of which artifacts need to be included in the distributables.

As a proof-of-concept, the 'roar' plugin was re-instated.

* SPARK-1791: Removing Roar plugin Ant buildscript.

* SPARK-1791: Replaced lobobrowser with JxBrowser (eval)

The project for the embedded browser that we used, lobobrowser, is defunct. Maven artifacts are not to be found.

A possible replacement is JxBrowser (by TeamDev). This software is proprietary, but they do offer free licenses to open source software.

In order to evaluate wether we'd like to apply for one, this commit replaces lobobrowser with JxBrowser. An evaluation license is included, but will no longer be valid in 30 days from now.

* SPARK-1791: Moving Fastpath plugin from Ant to Maven.

* SPARK-1791: Moving Battleships plugin from Ant to Maven.

Note that the code does not compile properly (SPARK-1818). I have disabled the Maven module (and sent Wolf an email).

* SPARK-1791: Moving Growl plugin from Ant to Maven

This plugin probably won't work properly, as it depends on a native library. We would better use one of the Java implementations for the GNTP protocol instead (SPARK-1880), which should improve portability.

* SPARK-1880: Growl plugin should use java binding.

Instead of the old native library that was used, the plugin now makes use of a Java-based API.

* SPARK-1791: Moving Apple plugin from Ant to Maven.

* SPARK-1791: Moving Reversi plugin from Ant to Maven.

* SPARK-1791: Moving TicTacToe plugin from Ant to Maven.

* SPARK-1791: Moving Flashing plugin from Ant to Maven.

* SPARK-1791: Moving Google plugin from Ant to Maven.

* SPARK-1791: Restoring the internal 'idle' plugin.

The 'idle' plugin was an internal (in core) that was initially not migrated from Ant to Maven. It depended on both an unknown libary, as well as the 'phone' internal plugin, which had issues of its own.

This commit restores the 'idle' plugin, by providing a reference to the previously unknown library (JNA), and removing the dependency to the 'phone' internal plugin.

* SPARK-1791: Moving Jingle plugin from Ant to Maven.

As this plugin depends on the internal 'phone' plugin, which has issues, I've left the module out of the Maven parent pom.

* SPARK-1791: Moving TransferGuard plugin from Ant to Maven.

* SPARK-1791: Moving Translator plugin from Ant to Maven.

* SPARK-1791: Moving OTR plugin from Ant to Maven.

There's a compatibility issue with the third party otr library that is being used (Maven has a different version than the one that shipped with Spark). I've not included this plugin as a Maven module to prevent build failures.

* SPARK-1791: Moving Spelling plugin from Ant to Maven.

I'm unable to find the correct maven artifact for the jmyspell dependency. As a result, the Maven module for this plugin is commented in the parent pom.

* SPARK-1791: Moving SIP plugin from Ant to Maven.

This plugin does not compile properly, with the existing dependencies (and/or missing 'phone' internal plugin). It's maven module has not been added to the parent pom.

* SPARK-1791: Moving SystemTray plugin from Ant to Maven.

The directory in which this plugin lived was named 'linux'. This has been renamed to match the plugin name: 'systemtray'.

* SPARK-1791: Moving plugin Meet from Ant to Maven.

There's a compilation problem, for which the plugin has not been added to the parent pom.

* SPARK-1791: Removing directory that held binary builds for previously commercial plugins.

* SPARK-1791: Removing old build scripts.

* SPARK-1791: Removed all third party libraries.

These are now managed by Maven.

* SPARK-1791: Removing IDE project files.

* SPARK-1791: Removing the old Spark plugin template.

* SPARK-1791: Removing deb and rpm buildfiles (we now use install4j for this).

* SPARK-1791: Removing installer-files (we now use install4j for this).

* SPARK-1791: Moved docbook content to core module.

* SPARK-1791: Add distributables that embed JRE.

Some people prefer to have a JRE embedded in the download, which makes the installer pretty much self-containing.

* SPARK-1791: Restore Mac Notification Center of Roar plugin.

* SPARK-1791: Delete the Google plugin.

The Google plugin provides integration with Google Desktop. This application was discontinued in 2011. There's no longer a need for this plugin.

* SPARK-1791: Upgrade JTattoo look-and-feel from 1.6.7 to 1.6.11.

* SPARK-1881: Upgrade Smack from 4.1.7 to 4.1.9.

* SPARK-1791: Replace duplicate assembly descriptors.

* SPARK-1791: Move plugin pom.xml boilerplate into one parent module.

The first draft of the Maven structure for Spark introduced a lot of boilerplate pom.xml content. In this commit, a new module is introduced that, when used as a parent module for a plugin, removes most of the duplication.

The parent provides:
- A dependency on Spark core
- The assembly-plugin, configured to transform a module (that has the correct sturcture) into a workable plugin jar.

* SPARK-1791 / SPARK-1688: Restoring and updating Look and Feels.

* SPARK-1791: Adding metadata from plugin.xml into pom.xml

The project data from the plugin.xml is used to populate the related fields in the Maven pom.xml.

Also, all plugin version numbers were increased. Although the Mavenization of Spark should not have introduced changes, it can't be ruled out.

* SPARK-1791: Populate plugin.xml from pom.xml

Both the pom.xml file and the plugin.xml file define the plugin name, version and description. It is error prone to keep both files in sync. Instead, the plugin.xml file should be popluated from the data that is in the pom.xml file.

Maven resource filtering is employed for this purpose. The drawback of this approach is that the plugin.xml file needs to be a Maven resource, which makes it part of the jar file. This means that this file is included twice in each plugin: once in the 'outer' plugin jar file, and once in the jar file that contains the plugin's compiled sources.

* SPARK-1791: Define version number.

When building, Maven will add the project name and version in the manifest of the jar. This manifest is now used when displaying the version number of Spark.

Unlike Subversion, Git does not have consecutive build numbers. I've removed that identifier from the Spark source.

* SPARK-1791 / /SPARK-1883: When installing, uninstall previous version.

By uninstalling the previous version, old libraries will be removed.
2017-02-22 20:22:44 +02:00