Skip to content

Commit 52c6bfa

Browse files
hohwillehohwille
authored
#236: improved legal stuff (#244)
#244: workaround for maven download mirror disaster and update to 3.6.2
1 parent 85d599c commit 52c6bfa

15 files changed

+111
-63
lines changed

Diff for: ‎CODE_OF_CONDUCT.adoc renamed to ‎CODE_OF_CONDUCT.asciidoc

File renamed without changes.

Diff for: ‎CONTRIBUTING_GUIDE.adoc renamed to ‎CONTRIBUTING_GUIDE.asciidoc

File renamed without changes.

Diff for: ‎ISSUE_TEMPLATE.adoc renamed to ‎ISSUE_TEMPLATE.asciidoc

File renamed without changes.

Diff for: ‎LICENSE

+1-14
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,9 @@
1-
21
Apache License
32
Version 2.0, January 2004
43
http://www.apache.org/licenses/
54

65
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
76

8-
0. Source Code vs. Software Release
9-
10-
This Apache License applies to the source-code of this software.
11-
However, a release of this software also contains other third-party
12-
components, for which the respective open source license terms apply.
13-
The open-source components of third parties are not from us and must be
14-
licensed directly from the respective third party.
15-
Therefore, in addition to Apache License you also need to agree to our terms
16-
of use:
17-
18-
https://github.com/devonfw/devon-ide/blob/master/documentation/license.asciidoc
19-
207
1. Definitions.
218

229
"License" shall mean the terms and conditions for use, reproduction,
@@ -199,7 +186,7 @@
199186
same "printed page" as the copyright notice for easier
200187
identification within third-party archives.
201188

202-
Copyright 2015-2019 Capgemini SE.
189+
Copyright [yyyy] [name of copyright owner]
203190

204191
Licensed under the Apache License, Version 2.0 (the "License");
205192
you may not use this file except in compliance with the License.

Diff for: ‎PR_TEMPLATE.adoc renamed to ‎PR_TEMPLATE.asciidoc

File renamed without changes.

Diff for: ‎README.adoc renamed to ‎README.asciidoc

File renamed without changes.

Diff for: ‎TERMS_OF_USE.asciidoc

+38
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
= Terms of Use
2+
3+
We provide the computer program of `devon-ide`, (hereinafter "Software") free of charge to download. The documentation of this software is licensed under the terms of the Creative Commons License (Attribution-NoDerivatives 4.0 International). The source code of this software itself is licensensed under the terms of the Apache License 2.0. The user shall be responsible to provide the required system environment for using the software. In accordance with the license terms, the user is entitled to use the Software in own / other projects (also commercial projects), provided that the copyright notice will be taken.
4+
5+
The software also requires open-source components of third-parties (providers), for which the respective open source license terms apply. The open-source components of third parties are not from us and must be licensed directly from the respective third party. The rights to use will be granted directly by the respective right owner to the extent of each relevant open source license terms. The user himself can download the desired third party components from the servers of the respective provider and install them in his own environment. As the software (devon-ide) is also capable to download third party components automatically for you, you have to apply to this terms and the licenses of the third party components before using it.
6+
7+
This software integrates the following third party components:
8+
9+
.Third party components
10+
[options="header"]
11+
|=======================
12+
|*Component*|*License*
13+
|https://openjdk.java.net/[OpenJDK] / https://adoptopenjdk.net/[AdoptOpenJDK] (Java)|https://openjdk.java.net/legal/gplv2+ce.html[GPLv2]
14+
|https://maven.apache.org/[Maven] |https://www.apache.org/licenses/LICENSE-2.0[ASL 2.0]
15+
|https://gradle.org/[Gradle] |https://github.com/gradle/gradle/blob/master/LICENSE[ASL 2.0]
16+
|https://github.com/eclipse-ee4j/jsonp[JSON-P] (API and RI) - included in release download package |https://github.com/eclipse-ee4j/jsonp/blob/master/LICENSE.md[EPL 2.0]
17+
|https://code.visualstudio.com/[VS Code] |https://github.com/Microsoft/vscode/blob/master/LICENSE.txt[MIT] (https://code.visualstudio.com/#home-terms[Terms])
18+
|https://github.com/devonfw/extension-pack-vscode[extension-pack-vscode] |https://github.com/devonfw/extension-pack-vscode/blob/master/LICENSE[ASL 2.0]
19+
|https://www.eclipse.org/[Eclipse]|https://www.eclipse.org/legal/epl-2.0/[EPL 2.0]
20+
|https://github.com/devonfw/tools-cobigen[CobiGen] |https://github.com/devonfw/tools-cobigen/blob/master/LICENSE.txt[ASL 2.0]
21+
|https://marketplace.eclipse.org/content/tm-terminal[TM Terminal] |https://www.eclipse.org/legal/epl-2.0/[EPL]
22+
|http://andrei.gmxhome.de/anyedit/[AnyEdit] |https://github.com/iloveeclipse/anyedittools/blob/master/LICENSE.md[EPL 1.0]
23+
|https://checkstyle.org/eclipse-cs/[EclipseCS] |https://github.com/checkstyle/eclipse-cs/blob/master/LICENSE[LGPL 2.1]
24+
|https://marketplace.eclipse.org/content/spotbugs-eclipse-plugin[SpotBugs Eclipse plugin] |http://www.gnu.org/licenses/lgpl.html[LGPL]
25+
|https://www.eclemma.org/[EclEmma] |https://www.eclemma.org/license.html[EPL 1.0]
26+
|https://basti1302.github.io/startexplorer/[StartExplorer] |http://www.wtfpl.net/txt/copying/[WTFPL 2]
27+
|http://myregexp.com/eclipsePlugin.html[regex tester] |https://en.wikipedia.org/wiki/GNU_General_Public_License[GPL]
28+
|https://github.com/m-m-m/eclipse-templatevariables/[eclipse-templatevariables] |https://github.com/m-m-m/eclipse-templatevariables/blob/master/LICENSE.txt[ASL 2.0]
29+
|https://www.genuitec.com/products/devstyle/[DevStyle] |https://www.genuitec.com/products/devstyle/eula/[EULA]
30+
|https://www.sonarlint.org/eclipse/[SonarLint] |https://github.com/SonarSource/sonarlint-eclipse/blob/master/LICENSE.txt[LGPL 3+]
31+
|https://nodejs.org/[Node.js] |https://raw.githubusercontent.com/nodejs/node/master/LICENSE[License]
32+
|https://www.npmjs.com/[NPM] |https://github.com/npm/cli/blob/latest/LICENSE[Artistic License 2.0] (https://www.npmjs.com/policies/terms[Terms])
33+
|https://cli.angular.io/[Angular CLI] (ng) |https://cli.angular.io/license.html[MIT]
34+
35+
|https://github.com/devonfw/devon4j[devon4j] |https://github.com/devonfw/devon4j/blob/develop/LICENSE.txt[ASL 2.0]
36+
|https://github.com/devonfw/devon4ng[devon4ng] |https://github.com/devonfw/devon4ng/blob/master/LICENSE.txt[ASL 2.0]
37+
|=======================
38+

Diff for: ‎documentation/devon-ide-doc.asciidoc

+2
Original file line numberDiff line numberDiff line change
@@ -104,3 +104,5 @@ include::migration-from-devonfw-3.0.0-or-lower.asciidoc[leveloffset=2]
104104
<<<<
105105

106106
include::license.asciidoc[leveloffset=1]
107+
108+
include::TERMS_OF_USE.asciidoc[leveloffset=2]

Diff for: ‎documentation/license.asciidoc

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
= License
22

3-
This documentation is licensed under http://creativecommons.org/licenses/by-nd/4.0/[Creative Commons License (Attribution-NoDerivatives 4.0 International)].
4-
The source-code of the `devon-ide` software itself is licensed under https://github.com/devonfw/devon-ide/blob/master/LICENSE[Apache Software License 2.0]. However, this software involves several third party components under different open-source licenses.
5-
You therefore have to apply to our https://github.com/devonfw/devon-ide/blob/master/scripts/src/main/resources/TERMS_OF_USE.adoc[terms of use] before using it.
3+
This software is licensed as Open-Source product for free usage including commercial use.
4+
You need to apply to our https://github.com/devonfw/devon-ide/blob/master/TERMS_OF_USE.adoc[terms of use] before using it.
65

Diff for: ‎documentation/pom.xml

+30
Original file line numberDiff line numberDiff line change
@@ -22,4 +22,34 @@
2222

2323
<!-- run "mvn package" and get the PDF result in target/generated-docs/*.pdf -->
2424

25+
<build>
26+
<plugins>
27+
<plugin>
28+
<groupId>org.apache.maven.plugins</groupId>
29+
<artifactId>maven-resources-plugin</artifactId>
30+
<executions>
31+
<execution>
32+
<id>copy-terms</id>
33+
<phase>process-resources</phase>
34+
<goals>
35+
<goal>copy-resources</goal>
36+
</goals>
37+
<configuration>
38+
<outputDirectory>${project.build.directory}/asciidoc</outputDirectory>
39+
<resources>
40+
<resource>
41+
<directory>..</directory>
42+
<includes>
43+
<include>TERMS_OF_USE.asciidoc</include>
44+
</includes>
45+
<filtering>true</filtering>
46+
</resource>
47+
</resources>
48+
</configuration>
49+
</execution>
50+
</executions>
51+
</plugin>
52+
</plugins>
53+
</build>
54+
2555
</project>

Diff for: ‎pom.xml

-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<!-- $Id: pom.xml 6 2013-09-13 10:20:34Z hohwille $ -->
32
<project xmlns="http://maven.apache.org/POM/4.0.0">
43
<modelVersion>4.0.0</modelVersion>
54
<groupId>com.devonfw.tools.ide.dev</groupId>

Diff for: ‎scripts/pom.xml

+28
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,15 @@
1515
<name>${project.artifactId}</name>
1616
<description>Scripts to setup and update the development environment.</description>
1717

18+
<licenses>
19+
<license>
20+
<name>Terms of use for devon-ide</name>
21+
<url>https://github.com/devonfw/devon-ide/blob/master/TERMS_OF_USE.asciidoc</url>
22+
<distribution>repo</distribution>
23+
<comments>This software is licensed as Open-Source product for free usage including commercial use. As it makes use of components of third-parties a combination of multiple licenses applies.</comments>
24+
</license>
25+
</licenses>
26+
1827
<dependencies>
1928
<dependency>
2029
<groupId>${project.groupId}</groupId>
@@ -56,6 +65,25 @@
5665
<useDefaultDelimiters>false</useDefaultDelimiters>
5766
</configuration>
5867
</execution>
68+
<execution>
69+
<id>copy-terms</id>
70+
<phase>process-resources</phase>
71+
<goals>
72+
<goal>copy-resources</goal>
73+
</goals>
74+
<configuration>
75+
<outputDirectory>${project.build.outputDirectory}</outputDirectory>
76+
<resources>
77+
<resource>
78+
<directory>..</directory>
79+
<includes>
80+
<include>TERMS_OF_USE.asciidoc</include>
81+
</includes>
82+
<filtering>true</filtering>
83+
</resource>
84+
</resources>
85+
</configuration>
86+
</execution>
5987
</executions>
6088
</plugin>
6189
<plugin>

Diff for: ‎scripts/src/main/resources/TERMS_OF_USE.adoc

-38
This file was deleted.

Diff for: ‎scripts/src/main/resources/scripts/command/mvn

+3-2
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,9 @@ function doSetup() {
1010
fi
1111
if [ -n "${1}" ] || [ ! -d "${MAVEN_HOME}" ]
1212
then
13-
local software_version=${MAVEN_VERSION:-3.6.1}
14-
local download_url="http://ftp.fau.de/apache/maven/maven-3/${software_version}/binaries/apache-maven-${software_version}-bin.tar.gz"
13+
local software_version=${MAVEN_VERSION:-3.6.2}
14+
local mirror="https://archive.apache.org/dist/maven/maven-3/"
15+
local download_url="${mirror}/${software_version}/binaries/apache-maven-${software_version}-bin.tar.gz"
1516
doInstall "${MAVEN_HOME}" "${download_url}" "maven" "${software_version}" "" "-"
1617
fi
1718
if [ -n "${1}" ]

Diff for: ‎scripts/src/main/resources/scripts/functions

+7-5
Original file line numberDiff line numberDiff line change
@@ -215,11 +215,13 @@ function doLicenseAgreement() {
215215
doLogo
216216
echo
217217
echo "Welcome to devon-ide!"
218-
echo "This product and its 3rd party components is open-source software."
219-
echo "However, before using it you need to read and accept the license agreement and terms of use."
218+
echo "This product and its 3rd party components is open-source software and can be used free (also commercially)."
219+
echo "However, before using it you need to read and accept the terms of use with all involved licenses agreements."
220+
echo "With confirming you take notice and agree that there is no warranty for using this product and its 3rd party components."
221+
echo "You are solely responsible for all risk implied by using this software."
220222
echo "You will be able to find it in one of the following locations:"
221-
echo "${DEVON_IDE_HOME}/TERMS_OF_USE.adoc"
222-
echo "https://github.com/devonfw/devon-ide/wiki/license"
223+
echo "${DEVON_IDE_HOME}/TERMS_OF_USE.asciidoc"
224+
echo "https://github.com/devonfw/devon-ide/blob/master/TERMS_OF_USE.asciidoc"
223225
echo
224226
if doIsBatch
225227
then
@@ -230,7 +232,7 @@ function doLicenseAgreement() {
230232
read -r -p "Do you accept these terms of use and all license agreements? (yes/no) " answer
231233
case "${answer}" in
232234
yes)
233-
echo -e "On $(date +"%Y-%m-%d") at $(date +"%H:%M:%S") you accepted the devon-ide terms of use.\nhttps://github.com/devonfw/devon-ide/wiki/license" > "${DEVON_HOME_DIR}/.devon/.license.agreement"
235+
echo -e "On $(date +"%Y-%m-%d") at $(date +"%H:%M:%S") you accepted the devon-ide terms of use.\nhttps://github.com/devonfw/devon-ide/blob/master/TERMS_OF_USE.asciidoc" > "${DEVON_HOME_DIR}/.devon/.license.agreement"
234236
break;;
235237
no)
236238
exit 255;;

0 commit comments

Comments
 (0)