From a399a38ca5abb8dbab7776b90bea5333e14582ed Mon Sep 17 00:00:00 2001 From: mo khan Date: Wed, 20 May 2020 15:56:37 -0600 Subject: Upload maven package to GL repo for testing --- spec/fixtures/java/custom-maven-settings.xml | 2 +- spec/fixtures/java/example/pom.xml | 38 ++++++++++++++++++++++++++++ spec/fixtures/java/example/settings.xml | 15 +++++++++++ 3 files changed, 54 insertions(+), 1 deletion(-) create mode 100644 spec/fixtures/java/example/pom.xml create mode 100644 spec/fixtures/java/example/settings.xml (limited to 'spec/fixtures/java') diff --git a/spec/fixtures/java/custom-maven-settings.xml b/spec/fixtures/java/custom-maven-settings.xml index 4fa5d16..b7dbb1c 100644 --- a/spec/fixtures/java/custom-maven-settings.xml +++ b/spec/fixtures/java/custom-maven-settings.xml @@ -8,7 +8,7 @@ gitlab-maven - https://gitlab.com/api/v4/projects/17523603/packages/maven + https://gitlab.com/api/v4/projects/6130122/packages/maven diff --git a/spec/fixtures/java/example/pom.xml b/spec/fixtures/java/example/pom.xml new file mode 100644 index 0000000..30d9b03 --- /dev/null +++ b/spec/fixtures/java/example/pom.xml @@ -0,0 +1,38 @@ + + 4.0.0 + com.gitlab.secure + example + jar + 1.0 + example + http://maven.apache.org + + + MIT + + + + + junit + junit + 3.8.1 + test + + + + + gitlab-maven + https://gitlab.com/api/v4/projects/6130122/packages/maven + + + + + gitlab-maven + https://gitlab.com/api/v4/projects/6130122/packages/maven + + + gitlab-maven + https://gitlab.com/api/v4/projects/6130122/packages/maven + + + diff --git a/spec/fixtures/java/example/settings.xml b/spec/fixtures/java/example/settings.xml new file mode 100644 index 0000000..e84b931 --- /dev/null +++ b/spec/fixtures/java/example/settings.xml @@ -0,0 +1,15 @@ + + + + gitlab-maven + + + + Job-Token + ${env.CI_JOB_TOKEN} + + + + + + -- cgit v1.2.3 From 0f29eb08625f21e241ee46196577c76c21fbe43f Mon Sep 17 00:00:00 2001 From: mo khan Date: Wed, 20 May 2020 16:08:58 -0600 Subject: Detect maven package from the same GL project --- spec/fixtures/java/pom-public-gitlab-repository.xml | 6 +++--- spec/integration/java/maven_spec.rb | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'spec/fixtures/java') diff --git a/spec/fixtures/java/pom-public-gitlab-repository.xml b/spec/fixtures/java/pom-public-gitlab-repository.xml index 4e57c79..c39e703 100644 --- a/spec/fixtures/java/pom-public-gitlab-repository.xml +++ b/spec/fixtures/java/pom-public-gitlab-repository.xml @@ -8,9 +8,9 @@ http://maven.apache.org - com.gitlab.xlgmokha - mvn-spike - 1.2-SNAPSHOT + com.gitlab.secure + example + 1.0 diff --git a/spec/integration/java/maven_spec.rb b/spec/integration/java/maven_spec.rb index 51f5f28..d45c99d 100644 --- a/spec/integration/java/maven_spec.rb +++ b/spec/integration/java/maven_spec.rb @@ -13,8 +13,8 @@ RSpec.describe "maven" do }) expect(report).to match_schema(version: '2.0') - expect(report.dependency_names).to match_array(['mvn-spike']) - expect(report.licenses_for('mvn-spike')).to match_array(['MIT']) + expect(report.dependency_names).to match_array(['example']) + expect(report.licenses_for('example')).to match_array(['MIT']) end it 'downloads packages from by using a custom `settings.xml`' do @@ -27,7 +27,7 @@ RSpec.describe "maven" do }) expect(report).to match_schema(version: '2.0') - expect(report[:dependencies]).to match_array([{ name: 'mvn-spike', url: '', description: '', paths: ['.'], licenses: ['MIT'] }]) + expect(report[:dependencies]).to match_array([{ name: 'example', url: '', description: '', paths: ['.'], licenses: ['MIT'] }]) end end -- cgit v1.2.3 From 03799b1b47575fbaa8d8026ae5a0f661536453d9 Mon Sep 17 00:00:00 2001 From: mo khan Date: Wed, 20 May 2020 16:13:50 -0600 Subject: Specify license of maven package --- spec/fixtures/java/example/pom.xml | 1 + 1 file changed, 1 insertion(+) (limited to 'spec/fixtures/java') diff --git a/spec/fixtures/java/example/pom.xml b/spec/fixtures/java/example/pom.xml index 30d9b03..b59f809 100644 --- a/spec/fixtures/java/example/pom.xml +++ b/spec/fixtures/java/example/pom.xml @@ -9,6 +9,7 @@ MIT + https://opensource.org/licenses/MIT -- cgit v1.2.3