Skip to content

Commit 875249c

Browse files
committed
Merge branch 'release/v2.0.0'
2 parents f7a3a81 + 4a821bf commit 875249c

File tree

2 files changed

+19
-6
lines changed

2 files changed

+19
-6
lines changed

CHANGELOG.md

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,14 @@ All notable changes to this project will be documented in this file.
44
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
55
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
66

7-
## [v1.2.0](https://github.com/cloudogu/zalenium-build-lib/releases/tag/v1.1.0) - 2020-02-21
7+
## [v2.0.0](https://github.com/cloudogu/zalenium-build-lib/releases/tag/v2.0.0) - 2020-02-21
8+
9+
Heads-up: Breaking change ahead!
10+
11+
This version changes a hardcoded repository name into a changeable repository name in the `withMavenSettings.mvnWithSettings()` part. It does default to `maven-central` though. But if the need arises to choose a different repository, the new signature looks like this:
12+
```
13+
withMavenSettings.mvnWithSettings nexusCredentials, cesFQDN, yourDifferentRepositoryName, mvnCallArgs
14+
```
815

916
### Added
1017
- new lib function for running E2E tests with pure `Selenium` without the help of `Zalenium`
@@ -18,6 +25,14 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
1825
- Please note that the method `generateZaleniumJobName()` may be removed in future releases
1926
- `generateJobName` now uses `-` instead of `_` because of possible problems when used as DNS name
2027

28+
### Bugfix
29+
30+
The release v1.2.0 introduced a defect in which the default Nexus mirror repository name was not properly set. This releases removes this defect (#9)
31+
32+
## [v1.2.0](https://github.com/cloudogu/zalenium-build-lib/releases/tag/v1.1.0) - 2020-02-21
33+
34+
This release contains breaking changes and should not be used. Instead use the release v2.0.0
35+
2136
## [v1.1.0](https://github.com/cloudogu/zalenium-build-lib/releases/tag/v1.1.0) - 2019-09-18
2237

2338
### Added

vars/withMavenSettings.groovy

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
final String defaultMavenCentralRepoName = "maven-central"
2-
31
/**
42
* Provides a simple custom maven settings.xml file to current working directory with Maven Central mirror in the
53
* current CES instance.
@@ -22,7 +20,7 @@ final String defaultMavenCentralRepoName = "maven-central"
2220
* @param mirrorNexusPath relative path to a maven central mirror hosted inside a nexus instance. The prefix <code>/nexus/repository</code> will be added automatically. Defaults to "maven-central"
2321
* @param closure This closure will be executed when the Maven <code>settings.xml</code> file was successfully created.
2422
*/
25-
def settings(def nexusCredentials, String cesFQDN, String pathToLocalMavenRepository, String mirrorNexusPath=defaultMavenCentralRepoName, Closure closure) {
23+
def settings(def nexusCredentials, String cesFQDN, String pathToLocalMavenRepository, String mirrorNexusPath="maven-central", Closure closure) {
2624
echo "write settings.xml to ${pathToLocalMavenRepository}"
2725
echo "local Maven repository should be located at ${pathToLocalMavenRepository}/.m2/repository"
2826

@@ -64,7 +62,7 @@ def settings(def nexusCredentials, String cesFQDN, String pathToLocalMavenReposi
6462
* @param mirrorNexusPath relative path to a maven central mirror hosted inside a nexus instance. The prefix <code>/nexus/repository</code> will be added automatically. Defaults to "maven-central"
6563
* @param closure This closure will be executed when the Maven <code>settings.xml</code> file was successfully created.
6664
*/
67-
def settingsWithEnvHome(def nexusCredentials, String cesFQDN, String mirrorNexusPath=defaultMavenCentralRepoName, Closure closure) {
65+
def settingsWithEnvHome(def nexusCredentials, String cesFQDN, String mirrorNexusPath="maven-central", Closure closure) {
6866
def currentHome = env.HOME
6967
settings(nexusCredentials, cesFQDN, currentHome, mirrorNexusPath, closure)
7068
}
@@ -76,7 +74,7 @@ def settingsWithEnvHome(def nexusCredentials, String cesFQDN, String mirrorNexus
7674
* @param mirrorNexusPath relative path to a maven central mirror hosted inside a nexus instance. The prefix <code>/nexus/repository</code> will be added automatically. Defaults to "maven-central"
7775
* @param mvnCallArgs these arguments contain the Maven arguments
7876
*/
79-
def mvnWithSettings(def nexusCredentials, String cesFQDN, String mirrorNexusPath, String mvnCallArgs) {
77+
def mvnWithSettings(def nexusCredentials, String cesFQDN, String mirrorNexusPath="maven-central", String mvnCallArgs) {
8078
def currentHome = env.HOME
8179
settings(nexusCredentials, cesFQDN, currentHome, mirrorNexusPath) { settingsXml ->
8280
mvn settingsXml, mvnCallArgs

0 commit comments

Comments
 (0)