From 783d5edd0dabf7ee275590197fe363dac8aff51f Mon Sep 17 00:00:00 2001 From: Eduardo Ramos Date: Thu, 3 Jan 2019 19:29:30 +0100 Subject: [PATCH 01/37] Update gitignore --- .gitignore | 176 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 176 insertions(+) diff --git a/.gitignore b/.gitignore index 879e777462..153b49dd74 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,178 @@ .DS_Store **/target/** + +# Created by https://www.gitignore.io/api/maven,eclipse,netbeans,intellij +# Edit at https://www.gitignore.io/?templates=maven,eclipse,netbeans,intellij + +### Eclipse ### + +.metadata +bin/ +tmp/ +*.tmp +*.bak +*.swp +*~.nib +local.properties +.settings/ +.loadpath +.recommenders + +# External tool builders +.externalToolBuilders/ + +# Locally stored "Eclipse launch configurations" +*.launch + +# PyDev specific (Python IDE for Eclipse) +*.pydevproject + +# CDT-specific (C/C++ Development Tooling) +.cproject + +# CDT- autotools +.autotools + +# Java annotation processor (APT) +.factorypath + +# PDT-specific (PHP Development Tools) +.buildpath + +# sbteclipse plugin +.target + +# Tern plugin +.tern-project + +# TeXlipse plugin +.texlipse + +# STS (Spring Tool Suite) +.springBeans + +# Code Recommenders +.recommenders/ + +# Annotation Processing +.apt_generated/ + +# Scala IDE specific (Scala & Java development for Eclipse) +.cache-main +.scala_dependencies +.worksheet + +### Eclipse Patch ### +# Eclipse Core +.project + +# JDT-specific (Eclipse Java Development Tools) +.classpath + +# Annotation Processing +.apt_generated + +.sts4-cache/ + +### Intellij ### +# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio and WebStorm +# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839 + +# User-specific stuff +.idea/**/workspace.xml +.idea/**/tasks.xml +.idea/**/usage.statistics.xml +.idea/**/dictionaries +.idea/**/shelf + +# Generated files +.idea/**/contentModel.xml + +# Sensitive or high-churn files +.idea/**/dataSources/ +.idea/**/dataSources.ids +.idea/**/dataSources.local.xml +.idea/**/sqlDataSources.xml +.idea/**/dynamic.xml +.idea/**/uiDesigner.xml +.idea/**/dbnavigator.xml + +# Gradle +.idea/**/gradle.xml +.idea/**/libraries + +# Gradle and Maven with auto-import +# When using Gradle or Maven with auto-import, you should exclude module files, +# since they will be recreated, and may cause churn. Uncomment if using +# auto-import. +# .idea/modules.xml +# .idea/*.iml +# .idea/modules + +# CMake +cmake-build-*/ + +# Mongo Explorer plugin +.idea/**/mongoSettings.xml + +# File-based project format +*.iws + +# IntelliJ +out/ + +# mpeltonen/sbt-idea plugin +.idea_modules/ + +# JIRA plugin +atlassian-ide-plugin.xml + +# Cursive Clojure plugin +.idea/replstate.xml + +# Crashlytics plugin (for Android Studio and IntelliJ) +com_crashlytics_export_strings.xml +crashlytics.properties +crashlytics-build.properties +fabric.properties + +# Editor-based Rest Client +.idea/httpRequests + +# Android studio 3.1+ serialized cache file +.idea/caches/build_file_checksums.ser + +### Intellij Patch ### +# Comment Reason: https://github.com/joeblau/gitignore.io/issues/186#issuecomment-215987721 + +# *.iml +# modules.xml +# .idea/misc.xml +# *.ipr + +# Sonarlint plugin +.idea/sonarlint + +### Maven ### +target/ +pom.xml.tag +pom.xml.releaseBackup +pom.xml.versionsBackup +pom.xml.next +release.properties +dependency-reduced-pom.xml +buildNumber.properties +.mvn/timing.properties +.mvn/wrapper/maven-wrapper.jar + +### NetBeans ### +**/nbproject/private/ +**/nbproject/Makefile-*.mk +**/nbproject/Package-*.bash +build/ +nbbuild/ +dist/ +nbdist/ +.nb-gradle/ + +# End of https://www.gitignore.io/api/maven,eclipse,netbeans,intellij From 81802614865d63ab558a1c6f1605a36c84f9b068 Mon Sep 17 00:00:00 2001 From: Eduardo Ramos Date: Tue, 5 Oct 2021 10:58:33 +0200 Subject: [PATCH 02/37] Fix old netbeans maven repository url --- modules/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/pom.xml b/modules/pom.xml index 3d3cbfaa18..66d613e6c1 100644 --- a/modules/pom.xml +++ b/modules/pom.xml @@ -63,7 +63,7 @@ netbeans NetBeans - http://bits.netbeans.org/nexus/content/groups/netbeans/ + https://netbeans.apidesign.org/maven2/ false From d6d27b0ac2788a6030b614ed6701ea11d063b505 Mon Sep 17 00:00:00 2001 From: Mathieu Bastian Date: Thu, 3 Feb 2022 20:26:22 +0100 Subject: [PATCH 03/37] Update version to 0.9.3-SNAPSHOT and fix some dependencies --- .gitignore | 3 +- README.md | 62 +++++++++++++++++----------------- modules/pom.xml | 90 +++++++++++++++++++------------------------------ pom.xml | 15 +++++---- 4 files changed, 76 insertions(+), 94 deletions(-) diff --git a/.gitignore b/.gitignore index 153b49dd74..9dc341eaba 100644 --- a/.gitignore +++ b/.gitignore @@ -145,7 +145,8 @@ fabric.properties ### Intellij Patch ### # Comment Reason: https://github.com/joeblau/gitignore.io/issues/186#issuecomment-215987721 -# *.iml +*.iml +.idea/ # modules.xml # .idea/misc.xml # *.ipr diff --git a/README.md b/README.md index abdba38774..21bdd55943 100644 --- a/README.md +++ b/README.md @@ -2,39 +2,11 @@ This repository is an out-of-the-box development environment for Gephi plugins. Gephi plugins are implemented in Java and can extend [Gephi](https://gephi.org) in many different ways, adding or improving features. Getting started is easy with this repository but also checkout the [Bootcamp](https://github.com/gephi/gephi-plugins-bootcamp) for examples of plugins you can create. -## Migrate Gephi 0.8 plugins - -The process in which plugins are developed and submitted had an overhaul when Gephi 0.9 was released. Details can be read on this article: [Plugin development gets new tools and opens-up to the community](https://gephi.wordpress.com/2015/12/16/plugin-development-gets-new-tools-and-opens-up-to-the-community/). - -This section is a step-by-step guide to migrate 0.8 plugins. Before going through the code and configuration, let's summerize the key differences between the two environements. - -- The 0.8 base is built using Ant, whereas the 0.9 uses Maven. These two are significantly different. If you aren't familiar with Maven, you can start with [Maven in 5 Minutes]( https://maven.apache.org/guides/getting-started/maven-in-five-minutes.html). Maven configurations are defined in the `pom.xml` files. -- The 0.8 base finds the Gephi modules into the `platform` folder checked in the repository, whereas the 0.9 base downloads everything from the central Maven repository, where all Gephi modules are available. -- Maven requires to separate source files (e.g. .java) and resources files (e.g. .properties) into distinct folders. Sources are located in `src/main/java` and resources in `src/main/resources`. - -A custom `migrate` goal is available in the [Gephi Maven Plugin](https://github.com/gephi/gephi-maven-plugin) to facilitate the migration from 0.8 to 0.9. This automated process migrates ant-based plugins to maven and takes care of copying the configuration and code. Follow these steps to migrate your plugin: - -- Fork and checkout this repository: - - git clone git@github.com:username/gephi-plugins.git - -If you've already had a forked repository based on 0.8 we suggest to save your code somewhere, delete it and fork again as the history was cleared. - -- Copy your plugin folder at the root of this directory. - -- Run this command: - - mvn org.gephi:gephi-maven-plugin:migrate - -This command will detect the ant-based plugin and migrate it. The resulting folder is then located into the `modules` folder. - -The plugin code can then be inspected in Netbeans or built via command line with `mvn clean package`. - ## Get started ### Requirements -Developing Gephi plugins requires [JDK 7](http://www.oracle.com/technetwork/java/javase/downloads/index.html) or later and [Maven](http://maven.apache.org/). Although any IDE/Editor can be used, [Netbeans IDE](https://netbeans.org/) is recommend as Gephi itself is based on [Netbeans Platform](https://netbeans.org/features/platform/index.html). +Developing Gephi plugins requires JDK 8 or later and [Maven](http://maven.apache.org/). Although any IDE/Editor can be used, [Netbeans IDE](https://netbeans.org/) is recommended as Gephi itself is based on [Netbeans Platform](https://netbeans.org/features/platform/index.html). ### Create a plugin @@ -76,7 +48,7 @@ Run the following command to compile and build your plugin: mvn clean package -In addition of compiling and building the JAR and NBM, this command uses the `Gephi Maven Plugin` to verify the plugin's configuration. In care something is wrong it will fail and indicte the reason. +In addition to compiling and building the JAR and NBM, this command uses the `Gephi Maven Plugin` to verify the plugin's configuration. In case something is wrong it will fail and indicate the reason. ### Run Gephi with plugin @@ -102,7 +74,7 @@ Submitting a Gephi plugin for approval is a simple process based on GitHub's [pu ## Update a plugin -Updating a Gephi plugin has the same process as submiting it for the first time. Don't forget to merge from upstream's master branch. +Updating a Gephi plugin has the same process as submitting it for the first time. Don't forget to merge from upstream's master branch. ## IDE Support @@ -201,3 +173,31 @@ It's the same thing. We say module because Gephi is a modular application and is #### When running the plugin in Netbeans I get an error "Running standalone modules or suites requires..." This error appears when you try to run a module. To run Gephi with your plugin you need to run the `gephi-plugins` project, not your module. + +## Migrate Gephi 0.8 plugins + +The process in which plugins are developed and submitted had an overhaul when Gephi 0.9 was released. Details can be read on this article: [Plugin development gets new tools and opens-up to the community](https://gephi.wordpress.com/2015/12/16/plugin-development-gets-new-tools-and-opens-up-to-the-community/). + +This section is a step-by-step guide to migrate 0.8 plugins. Before going through the code and configuration, let's summerize the key differences between the two environements. + +- The 0.8 base is built using Ant, whereas the 0.9 uses Maven. These two are significantly different. If you aren't familiar with Maven, you can start with [Maven in 5 Minutes]( https://maven.apache.org/guides/getting-started/maven-in-five-minutes.html). Maven configurations are defined in the `pom.xml` files. +- The 0.8 base finds the Gephi modules into the `platform` folder checked in the repository, whereas the 0.9 base downloads everything from the central Maven repository, where all Gephi modules are available. +- Maven requires to separate source files (e.g. .java) and resources files (e.g. .properties) into distinct folders. Sources are located in `src/main/java` and resources in `src/main/resources`. + +A custom `migrate` goal is available in the [Gephi Maven Plugin](https://github.com/gephi/gephi-maven-plugin) to facilitate the migration from 0.8 to 0.9. This automated process migrates ant-based plugins to maven and takes care of copying the configuration and code. Follow these steps to migrate your plugin: + +- Fork and checkout this repository: + + git clone git@github.com:username/gephi-plugins.git + +If you've already had a forked repository based on 0.8 we suggest to save your code somewhere, delete it and fork again as the history was cleared. + +- Copy your plugin folder at the root of this directory. + +- Run this command: + + mvn org.gephi:gephi-maven-plugin:migrate + +This command will detect the ant-based plugin and migrate it. The resulting folder is then located into the `modules` folder. + +The plugin code can then be inspected in Netbeans or built via command line with `mvn clean package`. diff --git a/modules/pom.xml b/modules/pom.xml index 66d613e6c1..c44345ebc5 100644 --- a/modules/pom.xml +++ b/modules/pom.xml @@ -4,7 +4,7 @@ org.gephi gephi-plugin-parent - 0.9.2 + 0.9.3-SNAPSHOT pom gephi-plugins-parent @@ -46,8 +46,8 @@ UTF-8 - 0.9.2 - RELEASE82 + 0.9.3-SNAPSHOT + RELEASE126 @@ -60,14 +60,6 @@ true - - netbeans - NetBeans - https://netbeans.apidesign.org/maven2/ - - false - - @@ -103,11 +95,6 @@ io-exporter-preview ${gephi.version} - - org.gephi - lib.validation - ${gephi.version} - org.gephi preview-export-ui @@ -143,16 +130,6 @@ io-importer-api ${gephi.version} - - org.gephi - io-processor-plugin - ${gephi.version} - - - org.gephi - processor-plugin-ui - ${gephi.version} - org.gephi project-ui @@ -198,11 +175,6 @@ algorithms-plugin ${gephi.version} - - org.gephi - gleem - ${gephi.version} - org.gephi mostrecentfiles-api @@ -285,7 +257,7 @@ org.gephi - desktop-banner + desktop-window ${gephi.version} @@ -328,11 +300,6 @@ export-plugin-ui ${gephi.version} - - org.gephi - desktop-recent-files - ${gephi.version} - org.gephi desktop-io-export @@ -418,11 +385,6 @@ ui-library-wrapper ${gephi.version} - - org.gephi - ui-propertyeditor - ${gephi.version} - org.netbeans.api org-openide-dialogs @@ -433,11 +395,6 @@ org-openide-filesystems ${netbeans.version} - - org.netbeans.modules - org-netbeans-modules-masterfs - ${netbeans.version} - org.netbeans.api org-openide-util @@ -528,6 +485,11 @@ org-netbeans-core-output2 ${netbeans.version} + + org.netbeans.modules + org-netbeans-modules-masterfs + ${netbeans.version} + org.netbeans.api org-netbeans-modules-nbjunit @@ -539,24 +501,27 @@ - org.codehaus.mojo + org.apache.netbeans.utilities nbm-maven-plugin true - 3.14 + 4.6 plugins - + true - + org.apache.maven.plugins maven-jar-plugin - 2.5 + 3.2.0 - true + + + ${project.build.outputDirectory}/META-INF/MANIFEST.MF + @@ -569,7 +534,7 @@ - org.codehaus.mojo + org.apache.netbeans.utilities nbm-maven-plugin true @@ -578,6 +543,13 @@ gephi ${keystore.password} + + + + default-branding + none + + @@ -608,7 +580,7 @@ org.sonatype.plugins nexus-staging-maven-plugin - 1.6.6 + 1.6.8 true ossrh @@ -620,4 +592,12 @@ + + + + + ossrh + https://oss.sonatype.org/content/repositories/snapshots + + diff --git a/pom.xml b/pom.xml index 838d3f503f..8d21411873 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ org.gephi gephi-plugins - 0.9.2 + 0.9.3-SNAPSHOT pom gephi-plugins @@ -17,7 +17,7 @@ - 0.9.2 + 0.9.3-SNAPSHOT ${project.build.directory}/plugins_clusters github @@ -71,17 +71,18 @@ org.apache.maven.plugins maven-dependency-plugin - 2.10 + 3.2.0 - org.codehaus.mojo + org.apache.netbeans.utilities nbm-maven-plugin - 3.14 + 4.6 + true org.gephi gephi-maven-plugin - 1.2.3 + 1.2.5-SNAPSHOT ${project.build.directory}/gephi-${gephi.version} @@ -138,7 +139,7 @@ - org.codehaus.mojo + org.apache.netbeans.utilities nbm-maven-plugin ${clusters.path} From cb13dd56c13a8769b0bf23229b17433d03f64c51 Mon Sep 17 00:00:00 2001 From: Mathieu Bastian Date: Fri, 4 Feb 2022 20:32:26 +0100 Subject: [PATCH 04/37] Revert to NBM plugin version 4.5 as there is a blocker bug in the 4.6 --- modules/pom.xml | 2 +- pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/pom.xml b/modules/pom.xml index c44345ebc5..49b7d1a0d1 100644 --- a/modules/pom.xml +++ b/modules/pom.xml @@ -504,7 +504,7 @@ org.apache.netbeans.utilities nbm-maven-plugin true - 4.6 + 4.5 plugins diff --git a/pom.xml b/pom.xml index 8d21411873..21245f2d39 100644 --- a/pom.xml +++ b/pom.xml @@ -76,7 +76,7 @@ org.apache.netbeans.utilities nbm-maven-plugin - 4.6 + 4.5 true From 6b59366875d0b5bfe72b6407aa1dd8e312160a7b Mon Sep 17 00:00:00 2001 From: Mathieu Bastian Date: Fri, 4 Feb 2022 20:38:45 +0100 Subject: [PATCH 05/37] Fix metadata URL --- pom.xml | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/pom.xml b/pom.xml index 21245f2d39..08115d3a40 100644 --- a/pom.xml +++ b/pom.xml @@ -83,12 +83,6 @@ org.gephi gephi-maven-plugin 1.2.5-SNAPSHOT - - ${project.build.directory}/gephi-${gephi.version} - - ${clusters.path}/plugins - - com.github.github @@ -104,6 +98,12 @@ org.gephi gephi-maven-plugin + + ${project.build.directory}/gephi-${gephi.version} + + ${clusters.path}/plugins + + validate-plugin @@ -180,9 +180,6 @@ build-metadata package - - https://gephi.org/gephi-plugins/plugins/ - validate-plugin @@ -193,6 +190,7 @@ + https://gephi.org/plugins/ ${project.build.directory}/site/plugins/ From 445289205522cab6d9835289212a5f8f114c6e2e Mon Sep 17 00:00:00 2001 From: Mathieu Bastian Date: Fri, 4 Feb 2022 20:44:44 +0100 Subject: [PATCH 06/37] Had wrong URL, put previous back --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 08115d3a40..104e190c4a 100644 --- a/pom.xml +++ b/pom.xml @@ -190,7 +190,7 @@ - https://gephi.org/plugins/ + https://gephi.org/gephi-plugins/plugins/ ${project.build.directory}/site/plugins/ From 4b96cf84d725b547fcaf1aa871e610435eeeaa8d Mon Sep 17 00:00:00 2001 From: Mathieu Bastian Date: Fri, 4 Feb 2022 21:24:21 +0100 Subject: [PATCH 07/37] Add basic build workflow --- .github/workflows/build.yml | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 .github/workflows/build.yml diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml new file mode 100644 index 0000000000..f04c7fd17d --- /dev/null +++ b/.github/workflows/build.yml @@ -0,0 +1,20 @@ +name: build + +on: + push: + branches-ignore: + - master-forge + - master + +jobs: + build_and_test: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - name: Set up JDK 11 + uses: actions/setup-java@v2 + with: + java-version: '11' + distribution: 'temurin' + - name: Build and validate project + run: mvn -B package --file pom.xml \ No newline at end of file From 9db4ce948286f151a1fc2e3a37bef91bf143a9c3 Mon Sep 17 00:00:00 2001 From: Mathieu Bastian Date: Fri, 18 Mar 2022 21:24:47 +0100 Subject: [PATCH 08/37] Update gephi-maven-plugin version --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 104e190c4a..ede2cf216d 100644 --- a/pom.xml +++ b/pom.xml @@ -82,7 +82,7 @@ org.gephi gephi-maven-plugin - 1.2.5-SNAPSHOT + 1.2.5 com.github.github From 537a16127fa4fac8d4910be6db64dac17ecc4288 Mon Sep 17 00:00:00 2001 From: Mathieu Bastian Date: Fri, 18 Mar 2022 21:24:58 +0100 Subject: [PATCH 09/37] Update version of NB Platform --- modules/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/pom.xml b/modules/pom.xml index 49b7d1a0d1..6c74fefc55 100644 --- a/modules/pom.xml +++ b/modules/pom.xml @@ -47,7 +47,7 @@ UTF-8 0.9.3-SNAPSHOT - RELEASE126 + RELEASE130 From 57d9549a858ee219cee22a7d138eb972968f22a5 Mon Sep 17 00:00:00 2001 From: Mathieu Bastian Date: Fri, 18 Mar 2022 21:25:14 +0100 Subject: [PATCH 10/37] Add workflows to release parent POM --- .github/workflows/release-pom.yml | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 .github/workflows/release-pom.yml diff --git a/.github/workflows/release-pom.yml b/.github/workflows/release-pom.yml new file mode 100644 index 0000000000..156a590df3 --- /dev/null +++ b/.github/workflows/release-pom.yml @@ -0,0 +1,25 @@ +name: release-pom + +on: + push: + branches: [ master ] + +jobs: + build_and_test: + runs-on: ubuntu-latest + defaults: + run: + working-directory: modules + steps: + - uses: actions/checkout@v2 + - name: Set up JDK 11 + uses: actions/setup-java@v2 + with: + java-version: '11' + distribution: 'temurin' + - name: Build and validate project + run: mvn -B deploy -P release-pom --file pom.xml + env: + OSSRH_USER: ${{ secrets.OSSRH_USER }} + OSSRH_PASS: ${{ secrets.OSSRH_PASS }} + GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }} \ No newline at end of file From 37b800c7e1b86c002b0d6b672a427ee4b87494e2 Mon Sep 17 00:00:00 2001 From: Mathieu Bastian Date: Fri, 18 Mar 2022 21:32:23 +0100 Subject: [PATCH 11/37] Update workflow config --- .github/workflows/release-pom.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/release-pom.yml b/.github/workflows/release-pom.yml index 156a590df3..4e33fe33be 100644 --- a/.github/workflows/release-pom.yml +++ b/.github/workflows/release-pom.yml @@ -17,6 +17,11 @@ jobs: with: java-version: '11' distribution: 'temurin' + server-id: ossrh + server-username: OSSRH_USER + server-password: OSSRH_PASS + gpg-private-key: ${{ secrets.GPG_PRIVATE_KEY }} + gpg-passphrase: GPG_PASSPHRASE - name: Build and validate project run: mvn -B deploy -P release-pom --file pom.xml env: From e7f24e13bfb4dfeb118de6325b5b2b3eb25f74a4 Mon Sep 17 00:00:00 2001 From: Mathieu Bastian Date: Fri, 18 Mar 2022 21:36:49 +0100 Subject: [PATCH 12/37] Fix classic GPG error --- modules/pom.xml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/modules/pom.xml b/modules/pom.xml index 6c74fefc55..31bcc41691 100644 --- a/modules/pom.xml +++ b/modules/pom.xml @@ -574,6 +574,12 @@ + + + --pinentry-mode + loopback + + From 7c26c77c1f27677e773c5c2d10f55aa66e4968ec Mon Sep 17 00:00:00 2001 From: Mathieu Bastian Date: Fri, 18 Mar 2022 21:51:35 +0100 Subject: [PATCH 13/37] Add support for keystore --- keystore.ks | Bin 0 -> 1256 bytes modules/pom.xml | 3 +++ 2 files changed, 3 insertions(+) create mode 100755 keystore.ks diff --git a/keystore.ks b/keystore.ks new file mode 100755 index 0000000000000000000000000000000000000000..7db854fb6c06e31fcb7a9861e855ba1535bc4030 GIT binary patch literal 1256 zcmezO_TO6u1_mY|W&~r_^wffkOdwCS!6ZHoNcS5wF?Jj9v2kg$F|sgfF$ppBnBdIGyt2$D5Zv7HPfeqx`|2nP!FEG?o8QM84cgou7ax0y>?fArK=uXJMCPB!mTA~^Db=9O5ip>c6V;* zr)yQVN0V+}Eon*b*z%*=assyuFByE}XJ2~Vt*R&t~4{rT@P{gr4>+M=I`S%MB zoUGRIOj`4_KkHV;lkQ*d4+k|lIN!aI`nSR8nDmKx+~sy#@0c)qY0H&OkT@$9q{yDF zmSkr7exbOnUsK9&``&V+)oPZnrp#(ue%!_MHxk8>6*%&ZIs*@gnZ*kcZ5VH0K#&CAZqFVBOCaA1hA zBSiQNctEzF3S?ZC9F0}BjBAV;35v610#eQ={}sgP#SeXlusZ=O8=Cb&Jw=DiEU zVLAJTZGmc;uCWeEfxjbddn11BKl*i-!MD@1LvyY-S~tj=+HZ6MH!u=sa<}1i)-ybe$y*AtS-swH7W6XAh@2s4% ze)lh{S4}^|eYkDeo6-X#!~1q!iS&O~$S%;>u*FlXQ2B+AhM4g7^PEOKCzd_55v%GB zsp-{tuy~!E_U2`!6Z00=bN^B_P5Ssdsftm>`plA#`&I-_=v>i!|6$bA`D~NA)8ZPc zLse54eXReT_tau;Y++z(Y^ZbIT*i5EnWR#q^@^~JeQNU24DYX5D&lq2|tMdHI*;emr6N{LPxVA(pe_&Na?GJS$v& zb+l`>^vk%LEwbTRUYnzNS1{VnlwC0|XG#Lo)+sm57A?~*Tt2ydp{nl&-L}{(GAJpS zS)ai`he;$}a(^nPRm{z**ZaCB+&UM-&Ru5$6kT)v^|s$PFRL@mTE8dk?UL!1cT}!8 Y&g+}M-Db=4W6LdyZme@Q-WGWS01mnTI{*Lx literal 0 HcmV?d00001 diff --git a/modules/pom.xml b/modules/pom.xml index 31bcc41691..937e7f9392 100644 --- a/modules/pom.xml +++ b/modules/pom.xml @@ -48,6 +48,9 @@ UTF-8 0.9.3-SNAPSHOT RELEASE130 + + + From 8cf911ae3417d6c8c2338c5df1d8946bccfeb300 Mon Sep 17 00:00:00 2001 From: Mathieu Bastian Date: Thu, 24 Mar 2022 21:16:28 +0100 Subject: [PATCH 14/37] Cleanups POMs --- modules/pom.xml | 31 +------------------------------ pom.xml | 19 +++++++++++++++---- 2 files changed, 16 insertions(+), 34 deletions(-) diff --git a/modules/pom.xml b/modules/pom.xml index 937e7f9392..fe4473cac5 100644 --- a/modules/pom.xml +++ b/modules/pom.xml @@ -48,9 +48,6 @@ UTF-8 0.9.3-SNAPSHOT RELEASE130 - - - @@ -501,6 +498,7 @@ + @@ -531,33 +529,6 @@ - - - release - - - - org.apache.netbeans.utilities - nbm-maven-plugin - true - - - keystore.ks - gephi - ${keystore.password} - - - - - default-branding - none - - - - - - - release-pom diff --git a/pom.xml b/pom.xml index ede2cf216d..a161a39346 100644 --- a/pom.xml +++ b/pom.xml @@ -20,6 +20,9 @@ 0.9.3-SNAPSHOT ${project.build.directory}/plugins_clusters github + + + @@ -99,7 +102,9 @@ org.gephi gephi-maven-plugin + https://gephi.org/gephi-plugins/plugins/ ${project.build.directory}/gephi-${gephi.version} + ${project.build.directory}/site/plugins/ ${clusters.path}/plugins @@ -143,6 +148,11 @@ nbm-maven-plugin ${clusters.path} + + + keystore.ks + gephi + ${keystore.password} @@ -151,6 +161,11 @@ cluster + + + default-branding + none + @@ -189,10 +204,6 @@ none - - https://gephi.org/gephi-plugins/plugins/ - ${project.build.directory}/site/plugins/ - From 3caab7f4a92d745d54da8a44773873468a6c51fb Mon Sep 17 00:00:00 2001 From: Mathieu Bastian Date: Thu, 24 Mar 2022 21:23:20 +0100 Subject: [PATCH 15/37] Separate parent POM release to another branch as it's confusing --- .github/workflows/build.yml | 2 + .github/workflows/release-pom.yml | 2 +- modules/pom.xml | 583 ------------------------------ 3 files changed, 3 insertions(+), 584 deletions(-) delete mode 100644 modules/pom.xml diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index f04c7fd17d..d40f213350 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -5,6 +5,8 @@ on: branches-ignore: - master-forge - master + - parent-pom + - gh-pages jobs: build_and_test: diff --git a/.github/workflows/release-pom.yml b/.github/workflows/release-pom.yml index 4e33fe33be..27f1240498 100644 --- a/.github/workflows/release-pom.yml +++ b/.github/workflows/release-pom.yml @@ -2,7 +2,7 @@ name: release-pom on: push: - branches: [ master ] + branches: [ parent-pom ] jobs: build_and_test: diff --git a/modules/pom.xml b/modules/pom.xml deleted file mode 100644 index fe4473cac5..0000000000 --- a/modules/pom.xml +++ /dev/null @@ -1,583 +0,0 @@ - - - 4.0.0 - - org.gephi - gephi-plugin-parent - 0.9.3-SNAPSHOT - pom - - gephi-plugins-parent - Parent POM for all Gephi plugins - 2015 - - http://github.com/gephi/gephi-plugins - - - - scm:git:git://github.com/gephi/gephi-plugins.git - scm:git:git@github.com:gephi/gephi-plugins.git - https://github.com/gephi/gephi-plugins - - - - - - Apache 2.0 - http://www.opensource.org/licenses/Apache-2.0 - Apache License, Version 2.0 - - - - - - - mbastian - Mathieu Bastian - mathieu.bastian@gephi.org - - - eduramiba - Eduardo Ramos - eduardo.ramos@gephi.org - - - - - - UTF-8 - 0.9.3-SNAPSHOT - RELEASE130 - - - - - - oss-sonatype - oss-sonatype - https://oss.sonatype.org/content/repositories/snapshots/ - - true - - - - - - - - - org.gephi - utils-longtask - ${gephi.version} - - - org.gephi - project-api - ${gephi.version} - - - org.gephi - io-exporter-api - ${gephi.version} - - - org.gephi - graph-api - ${gephi.version} - - - org.gephi - preview-api - ${gephi.version} - - - org.gephi - io-exporter-preview - ${gephi.version} - - - org.gephi - preview-export-ui - ${gephi.version} - - - org.gephi - utils - ${gephi.version} - - - org.gephi - datalab-api - ${gephi.version} - - - org.gephi - visualization-api - ${gephi.version} - - - org.gephi - preview-plugin - ${gephi.version} - - - org.gephi - db-drivers - ${gephi.version} - - - org.gephi - io-importer-api - ${gephi.version} - - - org.gephi - project-ui - ${gephi.version} - - - org.gephi - ui-utils - ${gephi.version} - - - org.gephi - ui-components - ${gephi.version} - - - org.gephi - settings-upgrader - ${gephi.version} - - - org.gephi - statistics-api - ${gephi.version} - - - org.gephi - statistics-plugin - ${gephi.version} - - - org.gephi - statistics-plugin-ui - ${gephi.version} - - - org.gephi - tools-api - ${gephi.version} - - - org.gephi - algorithms-plugin - ${gephi.version} - - - org.gephi - mostrecentfiles-api - ${gephi.version} - - - org.gephi - desktop-project - ${gephi.version} - - - org.gephi - visualization - ${gephi.version} - - - org.gephi - tools-plugin - ${gephi.version} - - - org.gephi - welcome-screen - ${gephi.version} - - - org.gephi - desktop-context - ${gephi.version} - - - org.gephi - desktop-progress - ${gephi.version} - - - org.gephi - layout-api - ${gephi.version} - - - org.gephi - io-generator-api - ${gephi.version} - - - org.gephi - io-generator-plugin - ${gephi.version} - - - org.gephi - generator-plugin-ui - ${gephi.version} - - - org.gephi - io-exporter-plugin - ${gephi.version} - - - org.gephi - desktop-statistics - ${gephi.version} - - - org.gephi - filters-api - ${gephi.version} - - - org.gephi - layout-plugin - ${gephi.version} - - - org.gephi - desktop-generate - ${gephi.version} - - - org.gephi - desktop-window - ${gephi.version} - - - org.gephi - desktop-branding - ${gephi.version} - - - org.gephi - appearance-api - ${gephi.version} - - - org.gephi - desktop-appearance - ${gephi.version} - - - org.gephi - io-importer-plugin - ${gephi.version} - - - org.gephi - desktop-datalab - ${gephi.version} - - - org.gephi - filters-plugin - ${gephi.version} - - - org.gephi - filters-impl - ${gephi.version} - - - org.gephi - export-plugin-ui - ${gephi.version} - - - org.gephi - desktop-io-export - ${gephi.version} - - - org.gephi - perspective-api - ${gephi.version} - - - org.gephi - import-plugin-ui - ${gephi.version} - - - org.gephi - filters-plugin-ui - ${gephi.version} - - - org.gephi - datalab-plugin - ${gephi.version} - - - org.gephi - desktop-layout - ${gephi.version} - - - org.gephi - desktop-import - ${gephi.version} - - - org.gephi - desktop-preview - ${gephi.version} - - - org.gephi - appearance-plugin - ${gephi.version} - - - org.gephi - appearance-plugin-ui - ${gephi.version} - - - org.gephi - desktop-tools - ${gephi.version} - - - org.gephi - timeline-api - ${gephi.version} - - - org.gephi - desktop-timeline - ${gephi.version} - - - org.gephi - directory-chooser - ${gephi.version} - - - org.gephi - desktop-filters - ${gephi.version} - - - org.gephi - core-library-wrapper - ${gephi.version} - - - org.gephi - ui-library-wrapper - ${gephi.version} - - - org.netbeans.api - org-openide-dialogs - ${netbeans.version} - - - org.netbeans.api - org-openide-filesystems - ${netbeans.version} - - - org.netbeans.api - org-openide-util - ${netbeans.version} - - - org.netbeans.api - org-openide-util-ui - ${netbeans.version} - - - org.netbeans.api - org-openide-util-lookup - ${netbeans.version} - - - org.netbeans.api - org-openide-windows - ${netbeans.version} - - - org.netbeans.api - org-openide-modules - ${netbeans.version} - - - org.netbeans.api - org-netbeans-modules-sendopts - ${netbeans.version} - - - org.netbeans.api - org-netbeans-api-progress - ${netbeans.version} - - - org.netbeans.api - org-netbeans-api-progress-nb - ${netbeans.version} - - - org.netbeans.api - org-openide-nodes - ${netbeans.version} - - - org.netbeans.api - org-openide-awt - ${netbeans.version} - - - org.netbeans.api - org-netbeans-modules-settings - ${netbeans.version} - - - org.netbeans.api - org-netbeans-modules-options-api - ${netbeans.version} - - - org.netbeans.api - org-netbeans-swing-outline - ${netbeans.version} - - - org.netbeans.api - org-openide-explorer - ${netbeans.version} - - - org.netbeans.api - org-netbeans-api-annotations-common - ${netbeans.version} - - - org.netbeans.api - org-netbeans-swing-tabcontrol - ${netbeans.version} - - - org.netbeans.api - org-openide-io - ${netbeans.version} - - - org.netbeans.modules - org-netbeans-core-output2 - ${netbeans.version} - - - org.netbeans.modules - org-netbeans-modules-masterfs - ${netbeans.version} - - - org.netbeans.api - org-netbeans-modules-nbjunit - ${netbeans.version} - test - - - - - - - - org.apache.netbeans.utilities - nbm-maven-plugin - true - 4.5 - - plugins - - true - - - - - - org.apache.maven.plugins - maven-jar-plugin - 3.2.0 - - - - ${project.build.outputDirectory}/META-INF/MANIFEST.MF - - - - - - - - - - release-pom - - - - - org.apache.maven.plugins - maven-gpg-plugin - 1.6 - - - sign-artifacts - verify - - sign - - - - - - --pinentry-mode - loopback - - - - - - - org.sonatype.plugins - nexus-staging-maven-plugin - 1.6.8 - true - - ossrh - https://oss.sonatype.org/ - true - - - - - - - - - - - ossrh - https://oss.sonatype.org/content/repositories/snapshots - - - From 3bcd3727edada3684a5abc41646717b5ee82c380 Mon Sep 17 00:00:00 2001 From: Mathieu Bastian Date: Thu, 24 Mar 2022 22:01:03 +0100 Subject: [PATCH 16/37] Update to latest gephi-maven-plugin version --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index a161a39346..8e6aab52fc 100644 --- a/pom.xml +++ b/pom.xml @@ -85,7 +85,7 @@ org.gephi gephi-maven-plugin - 1.2.5 + 1.2.6 com.github.github From 921902c2f23501c1bf7bc568a179ac3971cda4ff Mon Sep 17 00:00:00 2001 From: Mathieu Bastian Date: Sat, 26 Mar 2022 08:26:15 +0100 Subject: [PATCH 17/37] Exclude JRE from gephi dependency during unpacking --- pom.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/pom.xml b/pom.xml index 8e6aab52fc..502112dcbe 100644 --- a/pom.xml +++ b/pom.xml @@ -137,6 +137,7 @@ ${project.build.directory} + **/jre/** From 735ca5f454d9cc4e05800eb9eac24dfd79142387 Mon Sep 17 00:00:00 2001 From: Mathieu Bastian Date: Sat, 26 Mar 2022 09:19:24 +0100 Subject: [PATCH 18/37] Remove NBM signing as it's only needed in the parent-pom --- pom.xml | 8 -------- 1 file changed, 8 deletions(-) diff --git a/pom.xml b/pom.xml index 502112dcbe..09d53cf318 100644 --- a/pom.xml +++ b/pom.xml @@ -20,9 +20,6 @@ 0.9.3-SNAPSHOT ${project.build.directory}/plugins_clusters github - - - @@ -149,11 +146,6 @@ nbm-maven-plugin ${clusters.path} - - - keystore.ks - gephi - ${keystore.password} From 691338d7ae24c4cd8ff47b802dc85194b17eb52f Mon Sep 17 00:00:00 2001 From: Mathieu Bastian Date: Sat, 26 Mar 2022 11:48:04 +0100 Subject: [PATCH 19/37] Use scm-publish plugin for site --- pom.xml | 56 ++++++++++++++++++++++++++++++++++++++++---------------- 1 file changed, 40 insertions(+), 16 deletions(-) diff --git a/pom.xml b/pom.xml index 09d53cf318..8e6159fc0c 100644 --- a/pom.xml +++ b/pom.xml @@ -20,6 +20,9 @@ 0.9.3-SNAPSHOT ${project.build.directory}/plugins_clusters github + + + ${parsedVersion.majorVersion}.${parsedVersion.minorVersion}${parsedVersion.qualifier?} @@ -53,6 +56,14 @@ + + + + github + scm:git:https://github.com/gephi/gephi-plugins.git + + + @@ -82,12 +93,17 @@ org.gephi gephi-maven-plugin - 1.2.6 + 1.2.7-SNAPSHOT + + + org.apache.maven.plugins + maven-scm-publish-plugin + 3.1.0 - com.github.github - site-maven-plugin - 0.12 + org.codehaus.mojo + build-helper-maven-plugin + 3.3.0 @@ -161,6 +177,20 @@ + + + + org.codehaus.mojo + build-helper-maven-plugin + + + parse-version + + parse-version + + + + @@ -201,20 +231,14 @@ - com.github.github - site-maven-plugin + org.apache.maven.plugins + maven-scm-publish-plugin - Creating site for gephi-plugins version=${project.version} and gephiVersion=${gephi.version} - true + ${project.build.directory}/site + gh-pages + Autoupdate update for ${project.version} and gephiVersion=${gephi.version} + github - - - - site - - package - - From 9f936a412b29aa75f830fe9760486d39099d0385 Mon Sep 17 00:00:00 2001 From: Mathieu Bastian Date: Sat, 26 Mar 2022 12:46:40 +0100 Subject: [PATCH 20/37] Update to latest gephi-maven-plugin --- pom.xml | 26 +++----------------------- 1 file changed, 3 insertions(+), 23 deletions(-) diff --git a/pom.xml b/pom.xml index 8e6159fc0c..ec85fc9e98 100644 --- a/pom.xml +++ b/pom.xml @@ -20,9 +20,6 @@ 0.9.3-SNAPSHOT ${project.build.directory}/plugins_clusters github - - - ${parsedVersion.majorVersion}.${parsedVersion.minorVersion}${parsedVersion.qualifier?} @@ -93,18 +90,13 @@ org.gephi gephi-maven-plugin - 1.2.7-SNAPSHOT + 1.3.0 org.apache.maven.plugins maven-scm-publish-plugin 3.1.0 - - org.codehaus.mojo - build-helper-maven-plugin - 3.3.0 - @@ -177,20 +169,6 @@ - - - - org.codehaus.mojo - build-helper-maven-plugin - - - parse-version - - parse-version - - - - @@ -238,6 +216,8 @@ gh-pages Autoupdate update for ${project.version} and gephiVersion=${gephi.version} github + true + true From 7f8902d22f4f5056fc368cbce56925fac586f086 Mon Sep 17 00:00:00 2001 From: Mathieu Bastian Date: Sat, 26 Mar 2022 21:00:59 +0100 Subject: [PATCH 21/37] Remove dryRun for site release --- pom.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/pom.xml b/pom.xml index ec85fc9e98..a060fc92c6 100644 --- a/pom.xml +++ b/pom.xml @@ -216,7 +216,6 @@ gh-pages Autoupdate update for ${project.version} and gephiVersion=${gephi.version} github - true true From 82ef43f952850d7a4794f386e081ba9115ba5516 Mon Sep 17 00:00:00 2001 From: Mathieu Bastian Date: Sun, 27 Mar 2022 09:53:07 +0200 Subject: [PATCH 22/37] Remove keystore --- keystore.ks | Bin 1256 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100755 keystore.ks diff --git a/keystore.ks b/keystore.ks deleted file mode 100755 index 7db854fb6c06e31fcb7a9861e855ba1535bc4030..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1256 zcmezO_TO6u1_mY|W&~r_^wffkOdwCS!6ZHoNcS5wF?Jj9v2kg$F|sgfF$ppBnBdIGyt2$D5Zv7HPfeqx`|2nP!FEG?o8QM84cgou7ax0y>?fArK=uXJMCPB!mTA~^Db=9O5ip>c6V;* zr)yQVN0V+}Eon*b*z%*=assyuFByE}XJ2~Vt*R&t~4{rT@P{gr4>+M=I`S%MB zoUGRIOj`4_KkHV;lkQ*d4+k|lIN!aI`nSR8nDmKx+~sy#@0c)qY0H&OkT@$9q{yDF zmSkr7exbOnUsK9&``&V+)oPZnrp#(ue%!_MHxk8>6*%&ZIs*@gnZ*kcZ5VH0K#&CAZqFVBOCaA1hA zBSiQNctEzF3S?ZC9F0}BjBAV;35v610#eQ={}sgP#SeXlusZ=O8=Cb&Jw=DiEU zVLAJTZGmc;uCWeEfxjbddn11BKl*i-!MD@1LvyY-S~tj=+HZ6MH!u=sa<}1i)-ybe$y*AtS-swH7W6XAh@2s4% ze)lh{S4}^|eYkDeo6-X#!~1q!iS&O~$S%;>u*FlXQ2B+AhM4g7^PEOKCzd_55v%GB zsp-{tuy~!E_U2`!6Z00=bN^B_P5Ssdsftm>`plA#`&I-_=v>i!|6$bA`D~NA)8ZPc zLse54eXReT_tau;Y++z(Y^ZbIT*i5EnWR#q^@^~JeQNU24DYX5D&lq2|tMdHI*;emr6N{LPxVA(pe_&Na?GJS$v& zb+l`>^vk%LEwbTRUYnzNS1{VnlwC0|XG#Lo)+sm57A?~*Tt2ydp{nl&-L}{(GAJpS zS)ai`he;$}a(^nPRm{z**ZaCB+&UM-&Ru5$6kT)v^|s$PFRL@mTE8dk?UL!1cT}!8 Y&g+}M-Db=4W6LdyZme@Q-WGWS01mnTI{*Lx From 5cc67bedd464422f492a3c7f5d8026eb25224f26 Mon Sep 17 00:00:00 2001 From: Mathieu Bastian Date: Wed, 6 Apr 2022 08:59:03 +0200 Subject: [PATCH 23/37] Update .gitignore --- .gitignore | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitignore b/.gitignore index 9dc341eaba..6eb5d997c2 100644 --- a/.gitignore +++ b/.gitignore @@ -177,3 +177,5 @@ nbdist/ .nb-gradle/ # End of https://www.gitignore.io/api/maven,eclipse,netbeans,intellij + +.java-version \ No newline at end of file From bfe7006374274204476ea73302c3c7ee05c56e99 Mon Sep 17 00:00:00 2001 From: Mathieu Bastian Date: Wed, 6 Apr 2022 09:04:32 +0200 Subject: [PATCH 24/37] Update version to 0.9.3 --- README.md | 6 ++++-- pom.xml | 5 +++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 21bdd55943..9c31eaa050 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ This repository is an out-of-the-box development environment for Gephi plugins. ### Requirements -Developing Gephi plugins requires JDK 8 or later and [Maven](http://maven.apache.org/). Although any IDE/Editor can be used, [Netbeans IDE](https://netbeans.org/) is recommended as Gephi itself is based on [Netbeans Platform](https://netbeans.org/features/platform/index.html). +Developing Gephi plugins requires JDK 11 or later and [Maven](http://maven.apache.org/). ### Create a plugin @@ -78,6 +78,8 @@ Updating a Gephi plugin has the same process as submitting it for the first time ## IDE Support +Although any IDE/Editor can be used, [Netbeans IDE](https://netbeans.org/) is recommended as Gephi itself is based on [Netbeans Platform](https://netbeans.org/features/platform/index.html). + ### Netbeans IDE - Start Netbeans and go to `File` and then `Open Project`. Navigate to your fork repository, Netbeans automatically recognizes it as Maven project. @@ -168,7 +170,7 @@ Public packages are configured in the module's `pom.xml` file. Edit the `org.gephi gephi-plugins - 0.9.3-SNAPSHOT + 0.9.3 pom gephi-plugins @@ -17,7 +17,7 @@ - 0.9.3-SNAPSHOT + 0.9.3 ${project.build.directory}/plugins_clusters github @@ -143,6 +143,7 @@ ${project.build.directory} **/jre/** + **/jre-x64/** From a70acdd70ff6187988f373c4baf3f19c11c94637 Mon Sep 17 00:00:00 2001 From: Mathieu Bastian Date: Wed, 6 Apr 2022 09:57:45 +0200 Subject: [PATCH 25/37] Update classifier to linux-x64 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index ecd4a075d3..680ec0ee28 100644 --- a/pom.xml +++ b/pom.xml @@ -67,7 +67,7 @@ ${project.groupId} gephi ${gephi.version} - linux + linux-x64 tar.gz From 3071718763b275ca05756c54537b88bb8abdaf34 Mon Sep 17 00:00:00 2001 From: Mathieu Bastian Date: Sat, 7 May 2022 21:57:19 +0200 Subject: [PATCH 26/37] Update to gephi-maven-plugin version 1.3.1 --- pom.xml | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/pom.xml b/pom.xml index 680ec0ee28..165d07de7e 100644 --- a/pom.xml +++ b/pom.xml @@ -90,7 +90,7 @@ org.gephi gephi-maven-plugin - 1.3.0 + 1.3.1 org.apache.maven.plugins @@ -198,13 +198,6 @@ package - - validate-plugin - - validate - - none - From c27590aa91c9a6ba6a7200b1dc8ab47587c4aa32 Mon Sep 17 00:00:00 2001 From: Mathieu Bastian Date: Sun, 8 May 2022 17:05:23 +0200 Subject: [PATCH 27/37] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 9c31eaa050..b786ad501c 100644 --- a/README.md +++ b/README.md @@ -70,7 +70,7 @@ Submitting a Gephi plugin for approval is a simple process based on GitHub's [pu - Navigate to your fork's URL and create a pull request. Select `master-forge` instead of `master` as base branch. -- Submit your pull request. +- Submit your pull request. If possible, before you submit make sure to [enable edits from maintainers](https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/working-with-forks/allowing-changes-to-a-pull-request-branch-created-from-a-fork) so that we can help you tweak the code and configuration when needed. ## Update a plugin From 5bad6d787a77024d0736ab371bd55ac8f1fcdab5 Mon Sep 17 00:00:00 2001 From: Mathieu Bastian Date: Fri, 24 Jun 2022 21:41:20 +0200 Subject: [PATCH 28/37] Update to maven plugin version 1.3.2 --- pom.xml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pom.xml b/pom.xml index 165d07de7e..db59445d6e 100644 --- a/pom.xml +++ b/pom.xml @@ -90,7 +90,7 @@ org.gephi gephi-maven-plugin - 1.3.1 + 1.3.2 org.apache.maven.plugins @@ -185,16 +185,16 @@ gephi-maven-plugin - create-autoupdate + build-metadata - create-autoupdate + build-metadata package - build-metadata + create-autoupdate - build-metadata + create-autoupdate package From e3d1e555711f533c6316abcd77587fb8735d6a5d Mon Sep 17 00:00:00 2001 From: Mathieu Bastian Date: Fri, 24 Jun 2022 22:52:19 +0200 Subject: [PATCH 29/37] Update to maven plugin version 1.3.3 --- pom.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index db59445d6e..2403d9e1f5 100644 --- a/pom.xml +++ b/pom.xml @@ -90,7 +90,7 @@ org.gephi gephi-maven-plugin - 1.3.2 + 1.3.3 org.apache.maven.plugins @@ -110,6 +110,7 @@ https://gephi.org/gephi-plugins/plugins/ ${project.build.directory}/gephi-${gephi.version} ${project.build.directory}/site/plugins/ + true ${clusters.path}/plugins From 23661af4bbe27d9dcc500d8bfaa61f2e1a87ed42 Mon Sep 17 00:00:00 2001 From: Mathieu Bastian Date: Tue, 28 Jun 2022 21:00:02 +0200 Subject: [PATCH 30/37] Create issue_template.md --- .github/issue_template.md | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 .github/issue_template.md diff --git a/.github/issue_template.md b/.github/issue_template.md new file mode 100644 index 0000000000..88b0206130 --- /dev/null +++ b/.github/issue_template.md @@ -0,0 +1,37 @@ +--- +name: Bug report +about: Create a report to help the plugin developers +title: '' +labels: To review +assignees: '' + +--- + +## Which Plugin? + +## Expected Behavior + +## Current Behavior + +## Possible Solution + + + +## Steps to Reproduce + +1. +2. +3. +4. + +## Context + + + +## Your Environment + +* Gephi Version used: Gephi 0.9.6 +* Plugin Version used: +* Operating System: + + From 8f170822d8426d07d63b5ca5346a54a698e782fe Mon Sep 17 00:00:00 2001 From: Mathieu Bastian Date: Sun, 3 Jul 2022 09:04:58 +0200 Subject: [PATCH 31/37] Create pull_request_template.md --- .github/pull_request_template.md | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 .github/pull_request_template.md diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md new file mode 100644 index 0000000000..2e7baf1a21 --- /dev/null +++ b/.github/pull_request_template.md @@ -0,0 +1,20 @@ +## New plugin or plugin update? + +* [ ] New Plugin +* [ ] Update + +## What is the purpose of this plugin? + + +## How to test your plugin in Gephi? + +1. +2. + +## Checklist before submission + +* [ ] Did you merged with the `master` branch to get the latest updates? +* [ ] Did you build and test the plugin successfully locally? +* [ ] Did you include metadata (e.g. plugin author, license) in the `pom.xml` file +* [ ] Did you make sure NOT to include any unecessary files in your PR? +* [ ] Did you write unit tests to test your plugin functionalities? From 2ab18b563f94fdfc29a6f77045e67db27c4361bb Mon Sep 17 00:00:00 2001 From: Mathieu Bastian Date: Thu, 1 Sep 2022 07:46:18 +0200 Subject: [PATCH 32/37] Update README [ci skip] --- README.md | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index b786ad501c..ef855d813b 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ This repository is an out-of-the-box development environment for Gephi plugins. ### Requirements -Developing Gephi plugins requires JDK 11 or later and [Maven](http://maven.apache.org/). +Developing Gephi plugins requires JDK 8 or later and [Maven](http://maven.apache.org/). Although any IDE/Editor can be used, [Netbeans IDE](https://netbeans.org/) is recommended as Gephi itself is based on [Netbeans Platform](https://netbeans.org/features/platform/index.html). ### Create a plugin @@ -70,7 +70,7 @@ Submitting a Gephi plugin for approval is a simple process based on GitHub's [pu - Navigate to your fork's URL and create a pull request. Select `master-forge` instead of `master` as base branch. -- Submit your pull request. If possible, before you submit make sure to [enable edits from maintainers](https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/working-with-forks/allowing-changes-to-a-pull-request-branch-created-from-a-fork) so that we can help you tweak the code and configuration when needed. +- Submit your pull request. ## Update a plugin @@ -78,8 +78,6 @@ Updating a Gephi plugin has the same process as submitting it for the first time ## IDE Support -Although any IDE/Editor can be used, [Netbeans IDE](https://netbeans.org/) is recommended as Gephi itself is based on [Netbeans Platform](https://netbeans.org/features/platform/index.html). - ### Netbeans IDE - Start Netbeans and go to `File` and then `Open Project`. Navigate to your fork repository, Netbeans automatically recognizes it as Maven project. @@ -115,9 +113,9 @@ Yes, native libraries can be used in modules. The `modules` folder is where plugin modules go. Each plugin is defined in a single folder in this directory. A plugin can be composed of multiple modules (it's called a suite then) but usually one is enough to do what you want. -The `pom.xml` file in `modules` is the parent pom for plugins. A Maven pom can inherit configurations from a parent and that is something we use to keep each plugin's pom very simple. Notice that each plugin's pom (i.e. the `pom.xml` file in the plugin folder) has a `` defined. +A Maven pom can inherit configurations from a parent and that is something we use to keep each plugin's pom very simple. Notice that each plugin's pom (i.e. the `pom.xml` file in the plugin folder) has a `` defined. -The `pom.xml` file at the root folder makes everything fit together and notably lists the modules. +The `pom.xml` file at the root folder makes everything fit together and notably lists the modules. No need to change anything there besises this list. #### How are the manifest settings defined? @@ -141,7 +139,7 @@ This applies for suite plugins with multiple modules. Besides creating the modul Dependencies are configured in the `` section in the plugin folder's `pom.xml`. Each dependency has a `groupId`, an `artifactId` and a `version`. There are three types of dependencies a plugin can have: an external library, a Gephi module or a Netbeans module. -The list of Gephi and Netbeans dependencies one can use can be found in the `modules/pom.xml` file. All possible dependencies are listed in the `` section. Because each plugin module inherits from this parent pom the version can be omitted when the dependency is set. For instance, this is how a plugin depends on `GraphAPI` and Netbeans's `Lookup`. +The list of Gephi and Netbeans dependencies one can use can be found in the parent POM, which you can browse [here](https://github.com/gephi/gephi-plugins/blob/6136ba8427349aa16c4f4b94265267fc3de0e767/modules/pom.xml#L76). All possible dependencies are listed in the `` section. Because each plugin module already inherits the version from this parent pom, it can be omitted. For instance, this is how a plugin depends on `GraphAPI` and Netbeans's `Lookup`. ``` @@ -170,7 +168,7 @@ Public packages are configured in the module's `pom.xml` file. Edit the ` Date: Thu, 1 Sep 2022 07:48:46 +0200 Subject: [PATCH 33/37] Update README [ci skip] --- README.md | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index ef855d813b..1450ed92f2 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ This repository is an out-of-the-box development environment for Gephi plugins. ### Requirements -Developing Gephi plugins requires JDK 8 or later and [Maven](http://maven.apache.org/). Although any IDE/Editor can be used, [Netbeans IDE](https://netbeans.org/) is recommended as Gephi itself is based on [Netbeans Platform](https://netbeans.org/features/platform/index.html). +Developing Gephi plugins requires JDK 11 or later and [Maven](http://maven.apache.org/). ### Create a plugin @@ -70,7 +70,7 @@ Submitting a Gephi plugin for approval is a simple process based on GitHub's [pu - Navigate to your fork's URL and create a pull request. Select `master-forge` instead of `master` as base branch. -- Submit your pull request. +- Submit your pull request. If possible, before you submit make sure to [enable edits from maintainers](https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/working-with-forks/allowing-changes-to-a-pull-request-branch-created-from-a-fork) so that we can help you tweak the code and configuration when needed. ## Update a plugin @@ -78,6 +78,8 @@ Updating a Gephi plugin has the same process as submitting it for the first time ## IDE Support +Although any IDE/Editor can be used, [Netbeans IDE](https://netbeans.org/) is recommended as Gephi itself is based on [Netbeans Platform](https://netbeans.org/features/platform/index.html). + ### Netbeans IDE - Start Netbeans and go to `File` and then `Open Project`. Navigate to your fork repository, Netbeans automatically recognizes it as Maven project. From 2f38454dece21aef7001cf3f37c90f08b3f6ed99 Mon Sep 17 00:00:00 2001 From: Mathieu Bastian Date: Sat, 7 Jan 2023 22:23:11 +0100 Subject: [PATCH 34/37] Upgrade to 0.10.0 version --- .github/issue_template.md | 2 +- pom.xml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/issue_template.md b/.github/issue_template.md index 88b0206130..20fa30baaf 100644 --- a/.github/issue_template.md +++ b/.github/issue_template.md @@ -30,7 +30,7 @@ assignees: '' ## Your Environment -* Gephi Version used: Gephi 0.9.6 +* Gephi Version used: Gephi 0.10.0 * Plugin Version used: * Operating System: diff --git a/pom.xml b/pom.xml index 2403d9e1f5..a7f34c6638 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ org.gephi gephi-plugins - 0.9.3 + 0.10.0 pom gephi-plugins @@ -17,7 +17,7 @@ - 0.9.3 + 0.10.0 ${project.build.directory}/plugins_clusters github From ecba2e009e0a016404aa4c96d4020763a12b40d0 Mon Sep 17 00:00:00 2001 From: LuisFelipeNuness Date: Wed, 29 Mar 2023 11:33:48 -0300 Subject: [PATCH 35/37] bugfix isolated nodes --- modules/BridgingPlugin/pom.xml | 19 ++++++++++++++++++- .../BridgingCentralityMetric.java | 15 +++++++++++++++ 2 files changed, 33 insertions(+), 1 deletion(-) diff --git a/modules/BridgingPlugin/pom.xml b/modules/BridgingPlugin/pom.xml index 6c55a1bb6f..34320e84d2 100644 --- a/modules/BridgingPlugin/pom.xml +++ b/modules/BridgingPlugin/pom.xml @@ -9,7 +9,7 @@ ia.ppgco.facom.ufu.br bridge-gephi-plugin - 1.0.1 + 1.0.2 nbm Bridging Centrality Plugin @@ -73,6 +73,7 @@ Apache 2.0 Getúlio de Morais Pereira Anderson Rodrigues dos Santos + Luis Felipe Nunes Reis santosardr@ufu.br https://github.com/santosardr/gephi-plugins @@ -80,6 +81,22 @@ + + org.apache.maven.plugins + maven-jar-plugin + 2.4 + + true + + + + org.apache.maven.plugins + maven-compiler-plugin + + 8 + 8 + + diff --git a/modules/BridgingPlugin/src/main/java/ia/ppgco/facom/ufu/br/gephi/plugin/bridgingcoefficient/BridgingCentralityMetric.java b/modules/BridgingPlugin/src/main/java/ia/ppgco/facom/ufu/br/gephi/plugin/bridgingcoefficient/BridgingCentralityMetric.java index c83d6adfee..8e054ef7f6 100644 --- a/modules/BridgingPlugin/src/main/java/ia/ppgco/facom/ufu/br/gephi/plugin/bridgingcoefficient/BridgingCentralityMetric.java +++ b/modules/BridgingPlugin/src/main/java/ia/ppgco/facom/ufu/br/gephi/plugin/bridgingcoefficient/BridgingCentralityMetric.java @@ -443,6 +443,7 @@ public String getReport() { + "
    " + "
  • Getúlio de Morais Pereira
    • " + "
  • Anderson Rodrigues dos Santos
    • " + + "
  • Luis Felipe Nunes Reis
    • " + "
      " + "
    • " + contact + " : santosardr@ufu.br
      • " + "
    " @@ -505,6 +506,9 @@ private String createImageFile(TempDir tempDir, double[] pVals, String pName, St * @return bridging coefficient value */ private static double bridging_coeficient(Graph graph, Node node) { + if(isIsolatedNode(graph,node)){ + return 0; + } //The inverse degree of a node divided by the inverse degree of all their imediate neighbors double n = 1.0 / graph.getDegree(node); @@ -551,4 +555,15 @@ public boolean isNormalized() { public void setNormalized(boolean normalized) { this.normalized = normalized; } + + public static boolean isIsolatedNode(Graph graph, Node node) { + for (Node s : graph.getNodes()) { + if (graph.isAdjacent(node, s)) { + return false; + } + } + // If loop ends without return false, it is an isolated node + return true; + } + } From 40d211eef0ef35c2985a75485dadd3a8ca984594 Mon Sep 17 00:00:00 2001 From: LuisFelipeNuness Date: Tue, 25 Apr 2023 11:32:09 -0300 Subject: [PATCH 36/37] resolving mbastian's suggestion --- .../bridgingcoefficient/BridgingCentralityMetric.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/modules/BridgingPlugin/src/main/java/ia/ppgco/facom/ufu/br/gephi/plugin/bridgingcoefficient/BridgingCentralityMetric.java b/modules/BridgingPlugin/src/main/java/ia/ppgco/facom/ufu/br/gephi/plugin/bridgingcoefficient/BridgingCentralityMetric.java index 8e054ef7f6..7a85015130 100644 --- a/modules/BridgingPlugin/src/main/java/ia/ppgco/facom/ufu/br/gephi/plugin/bridgingcoefficient/BridgingCentralityMetric.java +++ b/modules/BridgingPlugin/src/main/java/ia/ppgco/facom/ufu/br/gephi/plugin/bridgingcoefficient/BridgingCentralityMetric.java @@ -557,8 +557,12 @@ public void setNormalized(boolean normalized) { } public static boolean isIsolatedNode(Graph graph, Node node) { - for (Node s : graph.getNodes()) { + + NodeIterable iterable = graph.getNodes(); + + for (Node s : iterable) { if (graph.isAdjacent(node, s)) { + iterable.doBreak(); return false; } } From 6ce1526d7f03f20390af3380b80f742f493e74b2 Mon Sep 17 00:00:00 2001 From: Anderson Santos Date: Wed, 30 Aug 2023 17:18:12 -0300 Subject: [PATCH 37/37] I am accepting some Netbeans editor advice. --- modules/BridgingPlugin/pom.xml | 2 +- .../BridgingCentralityMetric.java | 3 +-- .../BridgingCentralityMetricPanel.java | 1 - .../BridgingCentralityMetricUI.java | 12 ++---------- pom.xml | 15 +++++++++++++++ 5 files changed, 19 insertions(+), 14 deletions(-) diff --git a/modules/BridgingPlugin/pom.xml b/modules/BridgingPlugin/pom.xml index 34320e84d2..8cb97a804f 100644 --- a/modules/BridgingPlugin/pom.xml +++ b/modules/BridgingPlugin/pom.xml @@ -4,7 +4,7 @@ gephi-plugin-parent org.gephi - 0.9.2 + 0.10.0 ia.ppgco.facom.ufu.br diff --git a/modules/BridgingPlugin/src/main/java/ia/ppgco/facom/ufu/br/gephi/plugin/bridgingcoefficient/BridgingCentralityMetric.java b/modules/BridgingPlugin/src/main/java/ia/ppgco/facom/ufu/br/gephi/plugin/bridgingcoefficient/BridgingCentralityMetric.java index 7a85015130..17873894df 100644 --- a/modules/BridgingPlugin/src/main/java/ia/ppgco/facom/ufu/br/gephi/plugin/bridgingcoefficient/BridgingCentralityMetric.java +++ b/modules/BridgingPlugin/src/main/java/ia/ppgco/facom/ufu/br/gephi/plugin/bridgingcoefficient/BridgingCentralityMetric.java @@ -18,7 +18,6 @@ import javax.swing.JOptionPane; import org.gephi.graph.api.*; import org.gephi.statistics.plugin.ChartUtils; -import org.gephi.statistics.spi.Statistics; import org.gephi.utils.TempDirUtils; import org.gephi.utils.TempDirUtils.TempDir; import org.gephi.utils.progress.Progress; @@ -38,7 +37,7 @@ * * @author getulio */ -public class BridgingCentralityMetric extends GraphDistance implements Statistics { +public class BridgingCentralityMetric extends GraphDistance { private static final Logger LOG = Logger.getLogger(BridgingCentralityMetric.class.getName()); diff --git a/modules/BridgingPlugin/src/main/java/ia/ppgco/facom/ufu/br/gephi/plugin/bridgingcoefficient/BridgingCentralityMetricPanel.java b/modules/BridgingPlugin/src/main/java/ia/ppgco/facom/ufu/br/gephi/plugin/bridgingcoefficient/BridgingCentralityMetricPanel.java index d648f340de..faac527fa9 100644 --- a/modules/BridgingPlugin/src/main/java/ia/ppgco/facom/ufu/br/gephi/plugin/bridgingcoefficient/BridgingCentralityMetricPanel.java +++ b/modules/BridgingPlugin/src/main/java/ia/ppgco/facom/ufu/br/gephi/plugin/bridgingcoefficient/BridgingCentralityMetricPanel.java @@ -38,7 +38,6 @@ public void setNormalized(boolean normalized) { * WARNING: Do NOT modify this code. The content of this method is always * regenerated by the Form Editor. */ - @SuppressWarnings("unchecked") // //GEN-BEGIN:initComponents private void initComponents() { diff --git a/modules/BridgingPlugin/src/main/java/ia/ppgco/facom/ufu/br/gephi/plugin/bridgingcoefficient/BridgingCentralityMetricUI.java b/modules/BridgingPlugin/src/main/java/ia/ppgco/facom/ufu/br/gephi/plugin/bridgingcoefficient/BridgingCentralityMetricUI.java index 26a3954ed6..1517732ed4 100644 --- a/modules/BridgingPlugin/src/main/java/ia/ppgco/facom/ufu/br/gephi/plugin/bridgingcoefficient/BridgingCentralityMetricUI.java +++ b/modules/BridgingPlugin/src/main/java/ia/ppgco/facom/ufu/br/gephi/plugin/bridgingcoefficient/BridgingCentralityMetricUI.java @@ -107,17 +107,9 @@ public int getPosition() { private static class StatSettings { - private boolean isDirectedGraph = false; - private boolean isNormalized = false; - private void save(BridgingCentralityMetric stat) { - this.isDirectedGraph = stat.isDirected(); - this.isNormalized = stat.isNormalized(); - } - - private void load(BridgingCentralityMetric stat) { - stat.setDirected(isDirectedGraph); - stat.setNormalized(isNormalized); + stat.isDirected(); + stat.isNormalized(); } } diff --git a/pom.xml b/pom.xml index 4c2a778e82..62e4fa4855 100644 --- a/pom.xml +++ b/pom.xml @@ -137,6 +137,14 @@ maven-scm-publish-plugin 3.1.0 + + org.netbeans.api + nbm-maven-plugin + 4.5 + + GPL-3.0 + + @@ -254,6 +262,13 @@ true + + org.netbeans.api + nbm-maven-plugin + + GPL-3.0 + +