Skip to content

Commit 318f5f1

Browse files
Merge pull request #3 from vectorgrp/release-v1.7.x
OCS Domain Plugin Release v1.7.0
2 parents a277e39 + a13b55a commit 318f5f1

12 files changed

Lines changed: 212 additions & 112 deletions

File tree

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
/.idea
22
/.gradle
3+
/build
34
/buildSrc/.gradle
45
/buildSrc/build
56
/plugins/*/build

README.md

Lines changed: 37 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -51,14 +51,14 @@ Within the `ocs-domain-plugins` folder you can find the `gradle.properties` file
5151
//localSip=path/to/used/sip/external
5252
ocsRepo=../repository
5353
54-
vOcsCore=1.5.0
55-
vPluginsCommon=1.3.0
56-
vOcsCom=1.6.0
57-
vOcsDiag=1.6.0
58-
vOcsNvM=1.6.0
59-
vOcsEcuState=1.6.0
60-
vOcsRuntime=1.6.0
61-
vOcsSecurity=1.4.0
54+
vOcsCore=1.6.0
55+
vPluginsCommon=1.4.0
56+
vOcsCom=1.7.0
57+
vOcsDiag=1.7.0
58+
vOcsNvM=1.7.0
59+
vOcsEcuState=1.7.0
60+
vOcsRuntime=1.7.0
61+
vOcsSecurity=1.5.0
6262
```
6363
Based on the folder structure example above the explanation of the properties becomes easier.
6464
Adapt the properties as following:
@@ -67,14 +67,14 @@ localSipStore=D:/dev/ocs/BswPackages
6767
localSip=MICROSAR_Classic_R31
6868
ocsRepo=../repository
6969
70-
vOcsCore=1.5.0
71-
vPluginsCommon=my-company-1.3.0
72-
vOcsCom=my-company-1.6.0
73-
vOcsDiag=my-company-1.6.0
74-
vOcsNvM=my-company-1.6.0
75-
vOcsEcuState=my-company-1.6.0
76-
vOcsRuntime=my-company-1.6.0
77-
vOcsSecurity=my-company-1.4.0
70+
vOcsCore=1.6.0
71+
vPluginsCommon=my-company-1.4.0
72+
vOcsCom=my-company-1.7.0
73+
vOcsDiag=my-company-1.7.0
74+
vOcsNvM=my-company-1.7.0
75+
vOcsEcuState=my-company-1.7.0
76+
vOcsRuntime=my-company-1.7.0
77+
vOcsSecurity=my-company-1.5.0
7878
```
7979
The `localSipStore` should point to the root directory of the BSW Packages while the `localSip` itself mentions a
8080
dedicated BSW Package against which the source code will be compiled. The gradle project of the `ocs-custom-app` and
@@ -86,8 +86,8 @@ We kindly ask you to adapt the version information mentioned in the `gradle.prop
8686
that the plugins you build by yourself can be distinguished from those delivered as pre-build artifacts in the MICROSAR
8787
Automation SDK. Here an example for the resulting files:
8888
```groovy
89-
ocs-communication-plugin-1.6.0.jar // without adaptions
90-
ocs-communication-plugin-my-company-1.6.0.jar // with adaptions
89+
ocs-communication-plugin-1.7.0.jar // without adaptions
90+
ocs-communication-plugin-my-company-1.7.0.jar // with adaptions
9191
```
9292

9393
### Build the OCS Domain Plugins
@@ -112,7 +112,7 @@ above. Reason for this is a simple conceptional decision that this `repository`
112112
delivered by Vector. In most cases, local maven repository which is used for the publication can be found under you
113113
Windows user account, for example:
114114
```batch
115-
C:\Users\<your user account>\.m2\repository\com\vector\ocs\plugins\ocs-communication-plugin\my-company-1.6.0\ocs-communication-plugin-my-company-1.6.0.jar
115+
C:\Users\<your user account>\.m2\repository\com\vector\ocs\plugins\ocs-communication-plugin\my-company-1.7.0\ocs-communication-plugin-my-company-1.7.0.jar
116116
```
117117

118118
## Building an OCS Custom App
@@ -124,14 +124,14 @@ file:
124124
//localSip=path/to/used/sip/
125125
ocsRepo=../repository
126126
127-
vOcsCore=2.0.0
128-
vPluginsCommon=1.3.0
129-
vOcsCom=1.6.0
130-
vOcsDiag=1.6.0
131-
vOcsNvM=1.6.0
132-
vOcsEcuState=1.6.0
133-
vOcsRuntime=1.6.0
134-
vOcsSecurity=1.4.0
127+
vOcsCore=2.1.0
128+
vPluginsCommon=1.4.0
129+
vOcsCom=1.7.0
130+
vOcsDiag=1.7.0
131+
vOcsNvM=1.7.0
132+
vOcsEcuState=1.7.0
133+
vOcsRuntime=1.7.0
134+
vOcsSecurity=1.5.0
135135
```
136136
The `localSipStore`, `localSip` and `ocsRepo` should be configured in the same way as for the `ocs-domain-plugins`.
137137
If you keep the other version numbers as stated in the file you would build the OCS Custom App based on the Vector
@@ -142,14 +142,14 @@ localSipStore=D:/dev/ocs/BswPackages
142142
localSip=MICROSAR_Classic_R31
143143
ocsRepo=../repository
144144
145-
vOcsCore=1.5.0
146-
vPluginsCommon=my-company-1.3.0
147-
vOcsCom=my-company-1.6.0
148-
vOcsDiag=my-company-1.6.0
149-
vOcsNvM=my-company-1.6.0
150-
vOcsEcuState=my-company-1.6.0
151-
vOcsRuntime=my-company-1.6.0
152-
vOcsSecurity=my-company-1.4.0
145+
vOcsCore=1.6.0
146+
vPluginsCommon=my-company-1.4.0
147+
vOcsCom=my-company-1.7.0
148+
vOcsDiag=my-company-1.7.0
149+
vOcsNvM=my-company-1.7.0
150+
vOcsEcuState=my-company-1.7.0
151+
vOcsRuntime=my-company-1.7.0
152+
vOcsSecurity=my-company-1.5.0
153153
```
154154
Please note that the gradle project of the OCS Custom App is prepared in a way that it handles the ocsRepo as well as
155155
the local maven repository.
@@ -172,12 +172,13 @@ Beside the mentioned dependencies the shared gradle project may point to additio
172172
| External Tool | Description |
173173
|---------------|-------------|
174174
| JAVA JDK | 1.8 |
175-
| Gradle | 7.4.2 |
175+
| Gradle | 8.13 |
176176

177177
## Release Information
178178
| Release | Belongs to | Supports MICROSAR Classic Releases |
179179
|---------|--------------------------------|------------------------------------|
180180
| v1.6.0 | MICROSAR Automation SDK v1.5.0 | R31 - R34 |
181+
| v1.7.0 | MICROSAR Automation SDK v1.6.0 | R31 - R34 |
181182

182183
## Abbreviations
183184
| Abbreviation | Description |

0 commit comments

Comments
 (0)