Skip to content

Commit

Permalink
Merge branch 'devonfw#1198-ability-to-download-custom-software-from-m…
Browse files Browse the repository at this point in the history
…ounted-filesystem' of https://github.com/Leosssss/ide into devonfw#1198-ability-to-download-custom-software-from-mounted-filesystem
  • Loading branch information
Leosssss committed Aug 14, 2023
2 parents 6473196 + 6d9beb5 commit 36f7b8c
Show file tree
Hide file tree
Showing 115 changed files with 4,252 additions and 3,678 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build-pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,6 @@ jobs:
- name: Set up JDK
uses: actions/setup-java@v1
with:
java-version: '11'
java-version: '17'
- name: Build project with Maven
run: mvn -B -ntp -Dstyle.color=always install
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
- name: Set up JDK
uses: actions/setup-java@v1
with:
java-version: '11'
java-version: '17'
- name: Build project with Maven
run: mvn -B -ntp -Dstyle.color=always install
- name: Deploy to OSSRH nexus
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
- name: Set up Apache Maven Central
uses: actions/setup-java@v3
with:
java-version: 11
java-version: 17
distribution: 'temurin'
cache: 'maven'
gpg-private-key: ${{ secrets.GPG_PRIVATE_KEY }} # Value of the GPG private key to import
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test-macos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:
- name: Set up JDK
uses: actions/setup-java@v1
with:
java-version: '11'
java-version: '17'
- name: Set up shellcheck
run: brew install shellcheck
- name: Build project with Maven
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test-ubuntu.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:
- name: Set up JDK
uses: actions/setup-java@v1
with:
java-version: '11'
java-version: '17'
- name: Set up shellcheck
run: |
scversion="latest"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test-windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ jobs:
- name: Set up JDK
uses: actions/setup-java@v1
with:
java-version: '11'
java-version: '17'
- name: Set up shellcheck
run: choco install shellcheck
- name: Build project with Maven
Expand Down
7 changes: 6 additions & 1 deletion .github/workflows/update-urls.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,12 @@ jobs:
with:
repository: devonfw/ide-urls
path: ide-urls
token: ${{ secrets.ACTION_PUSH_TOKEN }}
- name: Set up Java
uses: actions/setup-java@v3
with:
java-version: 17
distribution: 'temurin'
cache: 'maven'
- name: Build and run url updater
run: |
cd ide
Expand Down
2 changes: 1 addition & 1 deletion CHANGELOG.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ This file documents all notable changes to https://github.com/devonfw/ide[devonf

Release with new features and bugfixes:

* TODO
* https://github.com/devonfw/ide/issues/1320[#1320]: Fix Bug in intellij documenation

The full list of changes for this release can be found in https://github.com/devonfw/ide/milestone/48?closed=1[milestone 2023.08.002].

Expand Down
1 change: 1 addition & 0 deletions README.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ A tool designed to help developers setting up an development environment with th
image:https://img.shields.io/github/license/devonfw/ide.svg?label=License["Apache License, Version 2.0",link=https://github.com/devonfw/ide/blob/master/LICENSE]
image:https://img.shields.io/maven-central/v/com.devonfw.tools.ide/devonfw-ide-scripts.svg?label=Maven%20Central["Maven Central",link=https://search.maven.org/search?q=g:com.devonfw.tools.ide]
image:https://github.com/devonfw/ide/actions/workflows/build.yml/badge.svg["Build Status",link="https://github.com/devonfw/ide/actions/workflows/build.yml"]
image:https://github.com/devonfw/ide/actions/workflows/update-urls.yml/badge.svg["Update URLS Status",link="https://github.com/devonfw/ide/actions/workflows/update-urls.yml"]

image:https://github.com/devonfw/ide/actions/workflows/test-windows.yml/badge.svg["Windows",link="https://github.com/devonfw/ide/actions/workflows/test-windows.yml"]
image:https://github.com/devonfw/ide/actions/workflows/test-ubuntu.yml/badge.svg["Ubuntu",link="https://github.com/devonfw/ide/actions/workflows/test-ubuntu.yml"]
Expand Down
1 change: 1 addition & 0 deletions documentation/intellij.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ These are explained by the following table:
|*`INTELLIJ_VERSION`*|The version of the tool IntelliJ to install and use.
|*`INTELLIJ_EDITION`*|The edition of the tool IntelliJ to install and use. By default the Community edition will be installed. If you want to use the Ultimate Edition, the value has to be set to `ultimate`. The Ultimate edition requires a license. The user has to buy the license separately and it is not part of devonfw-ide. The devonfw-ide only supports download and installation.
|*`EXTRA_JAVA_VERSION`*|You can set this to a different (newer) version of Java used to launch your IDE (other than `JAVA_VERSION` that is used to build your project)
|=======================

== plugins

Expand Down
2 changes: 1 addition & 1 deletion documentation/jasypt.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ toc::[]

= jasypt

The `jasypt` commandlet allows to install http://www.jasypt.org/[jasypt] and encrypt or decrypt secrets using strong encryption given a secure masterpassword. See also link:https://github.com/devonfw/devon4j/blob/master/documentation/guide-configuration.asciidoc#password-encryption[devon4j password encryption guide] for further details.
The `jasypt` commandlet allows to install http://www.jasypt.org/[jasypt] and encrypt or decrypt secrets using strong encryption given a secure masterpassword. See also https://github.com/devonfw/devon4j/blob/master/documentation/guide-configuration.asciidoc#password-encryption[devon4j password encryption guide] for further details.

The arguments (`devon jasypt «args»`) are explained by the following table:

Expand Down
Loading

0 comments on commit 36f7b8c

Please sign in to comment.