1. 22 Dec, 2017 1 commit
    • Guus der Kinderen's avatar
      OF-546 Add install4j support to the Maven build. (#992) · 9a16f0dc
      Guus der Kinderen authored
      * Add install4j support to the Maven build.
      
      Using the 'install4j' profile on a server that has a suitable install4j and JREs, Maven can now
      generate install4j builds, using: mvn -P install4j clean package
      
      Note that Maven, even without the install4j profile, will no longer output the build artifacts
      in /target. Instead, these are now outputted into /distribution/target/distribution-base/
      
      * Make Ant build work with changed Maven structure.
      9a16f0dc
  2. 21 Dec, 2017 1 commit
  3. 19 Dec, 2017 1 commit
  4. 08 Dec, 2017 1 commit
  5. 04 Dec, 2017 1 commit
  6. 03 Dec, 2017 1 commit
  7. 28 Nov, 2017 2 commits
  8. 23 Nov, 2017 1 commit
    • Guus der Kinderen's avatar
      OF-546: Exclude MINA bundles · b65e67dc
      Guus der Kinderen authored
      By default, the MINA artifacts pull in 'bundle' instead of 'jar' dependencies. This confuses Intellij,
      and likely, other tooling. This commit excludes the 'bundle' dependencies, instead relying on the
      fact that all excluded dependency-dependencies are present (as first-level dependencies of the project
      itself).
      
      This commit should not introduce any functional changes, but should facilitate developers.
      b65e67dc
  9. 17 Nov, 2017 1 commit
    • daryl herzmann's avatar
      Denote Openfire 4.2.0-beta (#928) · 0390a6b8
      daryl herzmann authored
      * Denote Openfire 4.2.0-beta
      
      * Bump maven openfire version to 4.2.0-beta
      
      via mvn versions:set -DnewVersion=4.2.0-beta -DartifactId=*  -DgroupId=*
      
      and had to manually edit
       * src/plugins/jingleNodes/pom.xml
       * src/plugins/kraken/pom.xml
       * src/plugins/pom.xml
       * src/plugins/rayo/pom.xml
       * src/plugins/sip/pom.xml
      
      * update changelog and date
      
      * bump beta release date
      0390a6b8
  10. 06 Oct, 2017 1 commit
  11. 28 Sep, 2017 1 commit
  12. 07 Aug, 2017 1 commit
  13. 25 May, 2017 1 commit
    • Guus der Kinderen's avatar
      OF-546: Move Maven POM files into source directory. · 79ae79bf
      Guus der Kinderen authored
      I continue to be thoroughly confused by having two directories per plugin, one for the plugin sources, and one for the maven build. This commit merges both directories.
      
      As a side effect, various plugin unit tests are now executed by default. Some failed, for which I applied fixes.
      
      This commit also adds some plugins to the Maven structure that previously were not.
      79ae79bf
  14. 16 May, 2017 1 commit
  15. 24 Apr, 2017 3 commits
    • Guus der Kinderen's avatar
      OF-546: Update HSQLDB dependency to match included library. · 404a63d9
      Guus der Kinderen authored
      The HSQLDB library that ships with Openfire (for Ant) is newer than the
      dependency that's defined in Maven. This introduces a compatibility issue
      at runtime:
      
      > org.jivesoftware.database.SchemaManager - Unexpected token: FILES in statement [ SET FILES]
      
      The difference is likely an oversight, caused by us taking a very long time
      to merge the Maven PR. At the time it was created, the dependency was still okay.
      404a63d9
    • Guus der Kinderen's avatar
      OF-546: Exclude Avalon from Proxool · 311ab09b
      Guus der Kinderen authored
      The Avalon framework is a dependency of the Proxool Maven artificat, but was
      never included as a library to Openfire prior the move to Maven (so, we can
      do without).
      
      The Avalon dependency itself has a dependency of servlet-api 2.3, which is
      unwanted, and causes issues when compiling JSPs.
      311ab09b
    • Guus der Kinderen's avatar
      6fbd4127
  16. 19 Apr, 2017 2 commits
  17. 19 Mar, 2017 1 commit
  18. 16 Mar, 2017 3 commits
    • Guus der Kinderen's avatar
      Another few Maven dependencies. (#762) · 0709c399
      Guus der Kinderen authored
      This commit introduces some dependencies that were added to Openfire since the original Maven stucture was build. With these, the Maven build should compile again.
      0709c399
    • Christian Schudt's avatar
      d5ce5e5c
    • Christian Schudt's avatar
      Migrate build process from Ant to Maven (WIP). · f5ee1de2
      Christian Schudt authored
      The Maven structure is:
      -/
      --dbutil (used by xmppserver)
      --i18n (used by starter and xmppserver)
      --starter (launcher and starter package, startup.jar)
      --xmppserver (nearly everything in the src dir, openfire.jar)
      --webadmin (admin plugin)
      --plugins
      ---broadcast
      ---...
      
      I've also added Maven plugins to mimic partial behavior of the Ant build (copying dependencies, bin/conf folder, ...)
      
      This commit addresses issues OF-546.
      
      I reconfigured the pom.xmls to work with the existing directory structure, (instead of default src/main/java), so that the current src folder stays untouched.
      
      What it can do:
      - Run tests successfully
      - Generate JavaDoc
      - Assemble most plugin jars (without JSP)
      - Assemble admin plugin (without JSP)
      - Generate a source zip/tar.gz for distribution (as the download page offers it currently)
      - Build the startup.jar and openfire.jar, copy it in the right directory, so that Openfire can be run with `java -jar startup.jar`
      
      What it can't do:
      - Build executables for every platform (e.g. install4j, *.dmg, ...)
      - Build some plugins (e.g. ofmeet) due to non-Maven dependencies.
      
      Todos:
      - Fix these issues
      - Move source code to the correct paths, e.g. /src to xmppserver/src/main/java
      f5ee1de2