Skip to content
This repository was archived by the owner on Sep 15, 2023. It is now read-only.
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: aditosoftware/adito-nb-git
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v.1.3.8
Choose a base ref
...
head repository: aditosoftware/adito-nb-git
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
Loading
Showing 644 changed files with 24,966 additions and 7,599 deletions.
106 changes: 106 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,106 @@
version: 2
updates:
- package-ecosystem: maven
directory: "/"
schedule:
interval: daily
time: "04:00"
open-pull-requests-limit: 10
ignore:
- dependency-name: io.reactivex.rxjava3:rxjava
versions:
- 3.0.11
- dependency-name: com.google.inject:guice
versions:
- 5.0.0
- dependency-name: com.google.inject.extensions:guice-assistedinject
versions:
- 5.0.0
- dependency-name: org.mockito:mockito-core
versions:
- 3.8.0
- dependency-name: io.reactivex.rxjava2:rxjava
versions:
- 2.2.20
- 2.2.21
- dependency-name: org.eclipse.jgit:org.eclipse.jgit
versions:
- 5.10.0.202012080955-r
- dependency-name: org.netbeans.api:org-netbeans-modules-projectuiapi
versions:
- RELEASE122
- dependency-name: org.netbeans.modules:org-netbeans-modules-versioning-core
versions:
- RELEASE122
- dependency-name: org.netbeans.api:org-netbeans-modules-editor-settings
versions:
- RELEASE122
- dependency-name: org.netbeans.api:org-openide-io
versions:
- RELEASE122
- dependency-name: org.netbeans.api:org-netbeans-modules-keyring
versions:
- RELEASE122
- dependency-name: org.netbeans.api:org-netbeans-modules-queries
versions:
- RELEASE122
- dependency-name: org.netbeans.api:org-netbeans-api-progress
versions:
- RELEASE122
- dependency-name: org.netbeans.api:org-netbeans-modules-editor-document
versions:
- RELEASE122
- dependency-name: org.netbeans.api:org-openide-text
versions:
- RELEASE122
- dependency-name: org.netbeans.api:org-netbeans-modules-editor-lib2
versions:
- RELEASE122
- dependency-name: org.netbeans.api:org-netbeans-modules-editor-lib
versions:
- RELEASE122
- dependency-name: org.netbeans.api:org-openide-awt
versions:
- RELEASE122
- dependency-name: org.netbeans.api:org-netbeans-modules-versioning
versions:
- RELEASE122
- dependency-name: org.netbeans.api:org-openide-modules
versions:
- RELEASE122
- dependency-name: org.netbeans.api:org-netbeans-modules-projectuiapi-base
versions:
- RELEASE122
- dependency-name: org.netbeans.api:org-openide-loaders
versions:
- RELEASE122
- dependency-name: org.netbeans.api:org-openide-util-lookup
versions:
- RELEASE122
- dependency-name: org.netbeans.api:org-netbeans-modules-projectapi
versions:
- RELEASE122
- dependency-name: org.netbeans.api:org-openide-nodes
versions:
- RELEASE122
- dependency-name: org.netbeans.api:org-openide-util-ui
versions:
- RELEASE122
- dependency-name: org.netbeans.api:org-openide-filesystems
versions:
- RELEASE122
- dependency-name: org.netbeans.api:org-openide-dialogs
versions:
- RELEASE122
- dependency-name: org.netbeans.api:org-openide-util
versions:
- RELEASE122
- dependency-name: org.netbeans.api:org-openide-windows
versions:
- RELEASE122
- dependency-name: org.netbeans.api:org-openide-filesystems-nb
versions:
- RELEASE122
- dependency-name: de.adito.util:reactive
versions:
- 1.1.0
82 changes: 82 additions & 0 deletions .github/workflows/maven.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,82 @@
# This workflow will build a Java project with Maven
# For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-maven

name: Java CI with Maven

on:
push:
pull_request:
workflow_dispatch:
jobs:
build:
runs-on: ${{ matrix.os }}
strategy:
matrix:
include:
- os: macos-latest
- os: ubuntu-latest
- os: windows-latest
steps:
- name: Setup / Checkout
uses: actions/checkout@v2

- name: Setup / Maven
uses: stCarolas/setup-maven@v4
with:
maven-version: 3.6.3

- name: Setup / JDK
uses: actions/setup-java@v1
with:
java-version: 13

- name: settings.xml
uses: whelk-io/maven-settings-xml-action@v9
with:
servers: >
[{
"id": "default",
"username": "${{ secrets.nexus_user }}",
"password": "${{ secrets.nexus_password }}"
},
{
"id": "snapshots",
"username": "${{ secrets.nexus_user }}",
"password": "${{ secrets.nexus_password }}"
}]
repositories: >
[{
"id": "default",
"name": "default",
"url": "https://nexus.adito.cloud/repository/public/",
"releases": { "enabled": "true" }
},
{
"id": "snapshots",
"name": "snapshots",
"url": "https://nexus.adito.cloud/repository/snapshots/",
"snapshots": { "enabled": "true", "updatePolicy": "always" }
}]
plugin_repositories: >
[{
"id": "default",
"url": "https://nexus.adito.cloud/repository/public/",
"releases": { "enabled": "true" },
"snapshots": { "enabled": "true", "updatePolicy": "always" }
}]
- name: Restore Maven cache
uses: skjolber/maven-cache-github-action@v1
with:
step: restore

- name: Native / Compile
run: mvn clean package -Pnative "-Dmaven.javadoc.skip=true"

- name: Native / Integration Test
run: mvn -Pnative test-compile failsafe:integration-test failsafe:verify

- name: Save Maven cache
uses: skjolber/maven-cache-github-action@v1
with:
step: save
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -3,4 +3,7 @@
/.idea/vcs.xml
!/.idea/codeStyleSettings.xml
!/.idea/projectCodeStyle.xml
!/.idea/misc.xml
target/
*/keystore
*.flattened-pom.xml
61 changes: 61 additions & 0 deletions .idea/misc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

54 changes: 54 additions & 0 deletions IntegrationTests/pom.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>

<parent>
<artifactId>adito-nb-git</artifactId>
<groupId>de.adito.git</groupId>
<version>${revision}</version>
</parent>

<packaging>jar</packaging>
<artifactId>IntegrationTests</artifactId>

<dependencies>
<dependency>
<groupId>de.adito.git</groupId>
<artifactId>adito-nbm-git</artifactId>
<version>${project.version}</version>
</dependency>

<!-- Dependencies necessary for the the ImportResolveOptionsTest -->
<dependency>
<groupId>de.adito.designer.netbeans</groupId>
<artifactId>NbAditoInterfaceImpl</artifactId>
<version>6.2.0</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
<version>1.9</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.reactivestreams</groupId>
<artifactId>reactive-streams</artifactId>
<version>1.0.3</version>
</dependency>
<dependency>
<groupId>com.google.code.findbugs</groupId>
<artifactId>jsr305</artifactId>
<version>3.0.2</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>1.7.30</version>
<scope>test</scope>
</dependency>
</dependencies>

</project>
Loading