Skip to content

Commit 99e3ba6

Browse files
authored
Pim 3.0 compatibility (#66)
1 parent d7bbb40 commit 99e3ba6

File tree

10 files changed

+595
-530
lines changed

10 files changed

+595
-530
lines changed

.ci/Jenkinsfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ stage("Tests") {
1111
podTemplate(label: 'excel-init-ee', containers: [
1212
containerTemplate(
1313
name: "elasticsearch",
14-
image: "elasticsearch:5.5",
14+
image: "elasticsearch-oss:6.5.4",
1515
resourceRequestCpu: '100m',
1616
resourceRequestMemory: '200Mi',
1717
envVars: [
@@ -38,7 +38,7 @@ stage("Tests") {
3838
name: "php",
3939
ttyEnabled: true,
4040
command: 'cat',
41-
image: "akeneo/php:7.1",
41+
image: "akeneo/php:7.2",
4242
resourceRequestCpu: '100m',
4343
resourceRequestMemory: '1000Mi',
4444
envVars: [
@@ -49,7 +49,7 @@ stage("Tests") {
4949
node('excel-init-ee') {
5050
container("php") {
5151
checkout([$class: 'GitSCM',
52-
branches: [[name: "2.3"]],
52+
branches: [[name: "3.0"]],
5353
userRemoteConfigs: [[credentialsId: 'github-credentials', url: 'https://github.com/akeneo/pim-enterprise-standard.git']]
5454
])
5555

README.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,8 @@ Be carefull to use the new `init.xlsx` file of this bundle as there are some str
1515

1616
| ExcelInitBundle | Akeneo PIM Community Edition |
1717
|:---------------:|:----------------------------:|
18-
| v2.1.* | >= v2.2 |
18+
| v3.0.* | >= v3.0 |
19+
| v2.1.* | >= v2.2 - < 3.0 |
1920
| v2.0.* | v2.0 - v2.1 |
2021
| v1.2.* | v1.7.* |
2122
| v1.1.* | v1.6.* |
@@ -26,7 +27,7 @@ Be carefull to use the new `init.xlsx` file of this bundle as there are some str
2627
From your application root:
2728

2829
```bash
29-
php composer.phar require --prefer-dist akeneo/excel-init-bundle:2.1
30+
php composer.phar require --prefer-dist akeneo/excel-init-bundle:3.0
3031
```
3132

3233
Enable the bundle in the `app/AppKernel.php` file in the `registerProjectBundles()` method:

composer.json

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,8 @@
1111
"homepage": "http://www.akeneo.com"
1212
}
1313
],
14-
"repositories": [
15-
{
16-
"type": "vcs",
17-
"url": "https://github.com/akeneo/pim-community-dev.git"
18-
}
19-
],
2014
"require": {
21-
"akeneo/pim-community-dev": "^2.2"
15+
"akeneo/pim-community-dev": "^3.0.0"
2216
},
2317
"require-dev": {
2418
"phpspec/phpspec": "@stable",

0 commit comments

Comments
 (0)