diff options
| author | Can Eldem <celdem@gitlab.com> | 2020-05-21 13:44:04 +0000 |
|---|---|---|
| committer | Can Eldem <celdem@gitlab.com> | 2020-05-21 13:44:04 +0000 |
| commit | 537fbadd38b8f67b4a8f1ea0089a9e5ad2aa82eb (patch) | |
| tree | c0e1075bb9be0abe5d5c9702b58fb745220f5ccf /spec/fixtures | |
| parent | ffe3851eaf675da0bc82f144c48b7b16cc43d989 (diff) | |
| parent | d018033cf5542bf35ff7e60d28806655f5ea83ed (diff) | |
Merge branch '212923-bower-small' into 'master'v3.9.2
Provide Bower with a `bower_ca` variable when a custom CA is specified.
See merge request gitlab-org/security-products/license-management!151
Diffstat (limited to 'spec/fixtures')
| -rw-r--r-- | spec/fixtures/java/custom-maven-settings.xml | 2 | ||||
| -rw-r--r-- | spec/fixtures/java/example/pom.xml | 39 | ||||
| -rw-r--r-- | spec/fixtures/java/example/settings.xml | 15 | ||||
| -rw-r--r-- | spec/fixtures/java/pom-public-gitlab-repository.xml | 6 |
4 files changed, 58 insertions, 4 deletions
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 @@ <repositories> <repository> <id>gitlab-maven</id> - <url>https://gitlab.com/api/v4/projects/17523603/packages/maven</url> + <url>https://gitlab.com/api/v4/projects/6130122/packages/maven</url> </repository> </repositories> </profile> diff --git a/spec/fixtures/java/example/pom.xml b/spec/fixtures/java/example/pom.xml new file mode 100644 index 0000000..b59f809 --- /dev/null +++ b/spec/fixtures/java/example/pom.xml @@ -0,0 +1,39 @@ +<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/maven-v4_0_0.xsd"> + <modelVersion>4.0.0</modelVersion> + <groupId>com.gitlab.secure</groupId> + <artifactId>example</artifactId> + <packaging>jar</packaging> + <version>1.0</version> + <name>example</name> + <url>http://maven.apache.org</url> + <licenses> + <license> + <name>MIT</name> + <url>https://opensource.org/licenses/MIT</url> + </license> + </licenses> + <dependencies> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>3.8.1</version> + <scope>test</scope> + </dependency> + </dependencies> + <repositories> + <repository> + <id>gitlab-maven</id> + <url>https://gitlab.com/api/v4/projects/6130122/packages/maven</url> + </repository> + </repositories> + <distributionManagement> + <repository> + <id>gitlab-maven</id> + <url>https://gitlab.com/api/v4/projects/6130122/packages/maven</url> + </repository> + <snapshotRepository> + <id>gitlab-maven</id> + <url>https://gitlab.com/api/v4/projects/6130122/packages/maven</url> + </snapshotRepository> + </distributionManagement> +</project> 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 @@ +<settings> + <servers> + <server> + <id>gitlab-maven</id> + <configuration> + <httpHeaders> + <property> + <name>Job-Token</name> + <value>${env.CI_JOB_TOKEN}</value> + </property> + </httpHeaders> + </configuration> + </server> + </servers> +</settings> 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 @@ <url>http://maven.apache.org</url> <dependencies> <dependency> - <groupId>com.gitlab.xlgmokha</groupId> - <artifactId>mvn-spike</artifactId> - <version>1.2-SNAPSHOT</version> + <groupId>com.gitlab.secure</groupId> + <artifactId>example</artifactId> + <version>1.0</version> </dependency> </dependencies> </project> |
