summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhilippe Lafoucrière <plafoucriere@gitlab.com>2019-04-02 20:08:46 -0400
committerPhilippe Lafoucrière <plafoucriere@gitlab.com>2019-04-02 20:18:57 -0400
commit7eaab683aec5f52ce2bdd71f4d0629af9a0fbdba (patch)
tree5d1278ca07b9d9e063943f5f95a5793d51dbe70f
parentfcb86eb43980c3cf7dc66cdd78b67b83e8666c82 (diff)
Fix java-maven expectations
- The commit used doesn't exist anymore. - The expectations file was outdated. - The test script was silently failing when the `git checkout` command failed.
-rw-r--r--.gitlab-ci.yml2
-rw-r--r--test/results/java-maven.json264
-rwxr-xr-xtest/test.sh2
3 files changed, 264 insertions, 4 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 0b9a51e..aa4a9a0 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -78,7 +78,7 @@ QA:java-maven:
extends: .QA
variables:
QA_PROJECT: java-maven
- QA_REF: bab3d5b0
+ QA_REF: 831c7a04
QA:python-pip:
extends: .QA
diff --git a/test/results/java-maven.json b/test/results/java-maven.json
index fa7bf74..8a528c6 100644
--- a/test/results/java-maven.json
+++ b/test/results/java-maven.json
@@ -1,10 +1,22 @@
{
"licenses": [
{
- "count": 13,
+ "count": 25,
"name": "Apache 2.0"
},
{
+ "count": 3,
+ "name": "MIT"
+ },
+ {
+ "count": 2,
+ "name": "CDDL + GPLv2 with classpath exception"
+ },
+ {
+ "count": 1,
+ "name": "BSD"
+ },
+ {
"count": 1,
"name": "BSD style"
},
@@ -14,16 +26,72 @@
},
{
"count": 1,
- "name": "MIT"
+ "name": "LGPL, version 2.1, ASL, version 2"
},
{
"count": 1,
"name": "MPL 1.1, LGPL 2.1, Apache 2.0"
+ },
+ {
+ "count": 1,
+ "name": "Mozilla Public License 2.0"
}
],
"dependencies": [
{
"license": {
+ "name": "BSD",
+ "url": "http://en.wikipedia.org/wiki/BSD_licenses#4-clause_license_.28original_.22BSD_License.22.29"
+ },
+ "dependency": {
+ "name": "antlr",
+ "description": "",
+ "pathes": [
+ "."
+ ]
+ }
+ },
+ {
+ "license": {
+ "name": "Apache 2.0",
+ "url": "http://www.apache.org/licenses/LICENSE-2.0.txt"
+ },
+ "dependency": {
+ "name": "commons-beanutils",
+ "description": "",
+ "pathes": [
+ "."
+ ]
+ }
+ },
+ {
+ "license": {
+ "name": "Apache 2.0",
+ "url": "http://www.apache.org/licenses/LICENSE-2.0.txt"
+ },
+ "dependency": {
+ "name": "commons-io",
+ "description": "",
+ "pathes": [
+ "."
+ ]
+ }
+ },
+ {
+ "license": {
+ "name": "Apache 2.0",
+ "url": "http://www.apache.org/licenses/LICENSE-2.0.txt"
+ },
+ "dependency": {
+ "name": "commons-lang",
+ "description": "",
+ "pathes": [
+ "."
+ ]
+ }
+ },
+ {
+ "license": {
"name": "Apache 2.0",
"url": "http://www.apache.org/licenses/LICENSE-2.0.txt"
},
@@ -37,6 +105,71 @@
},
{
"license": {
+ "name": "Apache 2.0",
+ "url": "http://www.apache.org/licenses/LICENSE-2.0.txt"
+ },
+ "dependency": {
+ "name": "fastutil",
+ "description": "",
+ "pathes": [
+ "."
+ ]
+ }
+ },
+ {
+ "license": {
+ "name": "Apache 2.0",
+ "url": "http://www.apache.org/licenses/LICENSE-2.0.txt"
+ },
+ "dependency": {
+ "name": "findbugs-annotations",
+ "description": "",
+ "pathes": [
+ "."
+ ]
+ }
+ },
+ {
+ "license": {
+ "name": "Apache 2.0",
+ "url": "http://www.apache.org/licenses/LICENSE-2.0.txt"
+ },
+ "dependency": {
+ "name": "geode-common",
+ "description": "",
+ "pathes": [
+ "."
+ ]
+ }
+ },
+ {
+ "license": {
+ "name": "Apache 2.0",
+ "url": "http://www.apache.org/licenses/LICENSE-2.0.txt"
+ },
+ "dependency": {
+ "name": "geode-core",
+ "description": "",
+ "pathes": [
+ "."
+ ]
+ }
+ },
+ {
+ "license": {
+ "name": "Apache 2.0",
+ "url": "http://www.apache.org/licenses/LICENSE-2.0.txt"
+ },
+ "dependency": {
+ "name": "geode-json",
+ "description": "",
+ "pathes": [
+ "."
+ ]
+ }
+ },
+ {
+ "license": {
"name": "BSD style"
},
"dependency": {
@@ -101,6 +234,68 @@
},
{
"license": {
+ "name": "CDDL + GPLv2 with classpath exception"
+ },
+ "dependency": {
+ "name": "javax.resource-api",
+ "description": "",
+ "pathes": [
+ "."
+ ]
+ }
+ },
+ {
+ "license": {
+ "name": "CDDL + GPLv2 with classpath exception"
+ },
+ "dependency": {
+ "name": "javax.transaction-api",
+ "description": "",
+ "pathes": [
+ "."
+ ]
+ }
+ },
+ {
+ "license": {
+ "name": "Apache 2.0",
+ "url": "http://www.apache.org/licenses/LICENSE-2.0.txt"
+ },
+ "dependency": {
+ "name": "jgroups",
+ "description": "",
+ "pathes": [
+ "."
+ ]
+ }
+ },
+ {
+ "license": {
+ "name": "LGPL, version 2.1, ASL, version 2"
+ },
+ "dependency": {
+ "name": "jna",
+ "description": "",
+ "pathes": [
+ "."
+ ]
+ }
+ },
+ {
+ "license": {
+ "name": "MIT",
+ "url": "http://opensource.org/licenses/mit-license"
+ },
+ "dependency": {
+ "name": "jopt-simple",
+ "description": "",
+ "pathes": [
+ "."
+ ]
+ }
+ },
+ {
+ "license": {
"name": "Common Public License Version 1.0"
},
"dependency": {
@@ -117,6 +312,32 @@
"url": "http://www.apache.org/licenses/LICENSE-2.0.txt"
},
"dependency": {
+ "name": "log4j-api",
+ "description": "",
+ "pathes": [
+ "."
+ ]
+ }
+ },
+ {
+ "license": {
+ "name": "Apache 2.0",
+ "url": "http://www.apache.org/licenses/LICENSE-2.0.txt"
+ },
+ "dependency": {
+ "name": "log4j-core",
+ "description": "",
+ "pathes": [
+ "."
+ ]
+ }
+ },
+ {
+ "license": {
+ "name": "Apache 2.0",
+ "url": "http://www.apache.org/licenses/LICENSE-2.0.txt"
+ },
+ "dependency": {
"name": "maven-artifact",
"description": "",
"pathes": [
@@ -240,6 +461,45 @@
"."
]
}
+ },
+ {
+ "license": {
+ "name": "Mozilla Public License 2.0",
+ "url": "https://www.mozilla.org/media/MPL/2.0/index.815ca599c9df.txt"
+ },
+ "dependency": {
+ "name": "rhino",
+ "description": "",
+ "pathes": [
+ "."
+ ]
+ }
+ },
+ {
+ "license": {
+ "name": "Apache 2.0",
+ "url": "http://www.apache.org/licenses/LICENSE-2.0.txt"
+ },
+ "dependency": {
+ "name": "shiro-core",
+ "description": "",
+ "pathes": [
+ "."
+ ]
+ }
+ },
+ {
+ "license": {
+ "name": "MIT",
+ "url": "http://opensource.org/licenses/mit-license"
+ },
+ "dependency": {
+ "name": "slf4j-api",
+ "description": "",
+ "pathes": [
+ "."
+ ]
+ }
}
]
}
diff --git a/test/test.sh b/test/test.sh
index 40c29f0..ed4d8e9 100755
--- a/test/test.sh
+++ b/test/test.sh
@@ -13,7 +13,7 @@ git clone "$url" "/code/$project"
# Run license management on it.
echo "Running license management on the $project with ref $ref"
cd "/code/$project"
-git checkout "$ref" 2> /dev/null
+git checkout "$ref" 1> /dev/null
/run.sh analyze .
# In order to upload the artifact to check it manually