Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[BRMO-354] Verwijder de brmo-soap module #2055

Merged
merged 3 commits into from
Mar 1, 2024
Merged

[BRMO-354] Verwijder de brmo-soap module #2055

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e37aa46
Update versienummer naar 4.0.0-SNAPSHOT
mprins Feb 29, 2024
399cd37
[BRMO-354] Verwijder de brmo-soap module
mprins Mar 1, 2024
8f11cba
[ci] Fix last version workaround
mprins Mar 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .build/ci/getlastRelease.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ MINOR="${NEXTRELEASE##*.}"
PREVMINOR=$(($MINOR-1))
PREVRELEASE=$MAJOR.$PREVMINOR

if [ $CURSNAPSHOT = "3.0.0-SNAPSHOT" ]
if [ $CURSNAPSHOT = "4.0.0-SNAPSHOT" ]
then
PREVRELEASE="2.3.3"
PREVRELEASE="3.0.2"
fi
echo "Huidige snapshot:" $CURSNAPSHOT", vorige, te downloaden, release: "$PREVRELEASE", komende release: "$NEXTRELEASE

Expand Down
4 changes: 2 additions & 2 deletions .build/ci/oracle-execute-upgrades.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ MINOR="${NEXTRELEASE##*.}"
PREVMINOR=$(($MINOR-1))
PREVRELEASE=$MAJOR.$PREVMINOR

if [ $CURSNAPSHOT = "3.0.0-SNAPSHOT" ]
if [ $CURSNAPSHOT = "4.0.0-SNAPSHOT" ]
then
PREVRELEASE="2.3.3"
PREVRELEASE="3.0.2"
fi

echo "Huidige snapshot:" $CURSNAPSHOT", vorige release: "$PREVRELEASE", komende release: "$NEXTRELEASE
Expand Down
4 changes: 2 additions & 2 deletions .build/ci/pgsql-execute-upgrades.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ MINOR="${NEXTRELEASE##*.}"
PREVMINOR=$(($MINOR-1))
PREVRELEASE=$MAJOR.$PREVMINOR

if [ $CURSNAPSHOT = "3.0.0-SNAPSHOT" ]
if [ $CURSNAPSHOT = "4.0.0-SNAPSHOT" ]
then
PREVRELEASE="2.3.3"
PREVRELEASE="3.0.2"
fi

echo "Huidige snapshot:" $CURSNAPSHOT", vorige release: "$PREVRELEASE", komende release: "$NEXTRELEASE
Expand Down
3 changes: 0 additions & 3 deletions .github/workflows/linux-oracle.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,9 +86,6 @@ jobs:
- name: 'Verify brmo-service'
run: mvn -e verify -B -Poracle -Dtest.onlyITs=true -pl 'brmo-service' -DskipQA=true

- name: 'Verify brmo-soap'
run: mvn -e verify -B -Poracle -Dtest.onlyITs=true -pl 'brmo-soap' -DskipQA=true

- name: 'Verify brmo-stufbg204'
run: mvn -e verify -B -Poracle -Dtest.onlyITs=true -pl 'brmo-stufbg204' -DskipQA=true

Expand Down
15 changes: 2 additions & 13 deletions .github/workflows/linux.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,9 +110,6 @@ jobs:
- name: 'Verify brmo-service'
run: mvn -e verify -B -Ppostgresql -Dtest.onlyITs=true -pl 'brmo-service' -DskipQA=true

- name: 'Verify brmo-soap'
run: mvn -e verify -B -Ppostgresql -Dtest.onlyITs=true -pl 'brmo-soap' -DskipQA=true

- name: 'Verify brmo-stufbg204'
run: mvn -e verify -B -Ppostgresql -Dtest.onlyITs=true -pl 'brmo-stufbg204' -DskipQA=true

Expand Down Expand Up @@ -243,23 +240,15 @@ jobs:
with:
serverhostname: ${{ secrets.DEPENDENCY_TRACK_HOSTNAME }}
apikey: ${{ secrets.DEPENDENCY_TRACK_APIKEY }}
project: '03a64fe1-cc60-49ea-95d0-d2f58e20ef54'
project: 'ae922e6c-e182-46c4-b3fe-272eaeee6d9c'
bomfilename: 'brmo-service/target/bom.xml'

- name: 'Deploy brmo-soap SBOM'
uses: DependencyTrack/gh-upload-sbom@v3
with:
serverhostname: ${{ secrets.DEPENDENCY_TRACK_HOSTNAME }}
apikey: ${{ secrets.DEPENDENCY_TRACK_APIKEY }}
project: '2110673c-88c9-410d-ad2b-fac34ea33975'
bomfilename: 'brmo-soap/target/bom.xml'

- name: 'Deploy brmo-stufbg204 SBOM'
uses: DependencyTrack/gh-upload-sbom@v3
with:
serverhostname: ${{ secrets.DEPENDENCY_TRACK_HOSTNAME }}
apikey: ${{ secrets.DEPENDENCY_TRACK_APIKEY }}
project: 'b0866280-4910-4838-a7bb-9ab56cf42217'
project: '72254d7c-c584-4821-b1e7-c806ebcd967e'
bomfilename: 'brmo-stufbg204/target/bom.xml'

- name: 'Set up JDK (repo.b3p.nl)'
Expand Down
2 changes: 1 addition & 1 deletion bag2-loader/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ SPDX-License-Identifier: MIT
<parent>
<groupId>nl.b3p</groupId>
<artifactId>brmo</artifactId>
<version>3.0.3-SNAPSHOT</version>
<version>4.0.0-SNAPSHOT</version>
</parent>
<artifactId>bag2-loader</artifactId>
<packaging>jar</packaging>
Expand Down
2 changes: 1 addition & 1 deletion bgt-loader/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ SPDX-License-Identifier: MIT
<parent>
<groupId>nl.b3p</groupId>
<artifactId>brmo</artifactId>
<version>3.0.3-SNAPSHOT</version>
<version>4.0.0-SNAPSHOT</version>
</parent>
<artifactId>bgt-loader</artifactId>
<packaging>jar</packaging>
Expand Down
4 changes: 2 additions & 2 deletions brmo-commandline/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,8 +60,8 @@ Onderstaand een aantal voorbeelden.
output:

```
staging versie: 3.0.3
rsgb versie: 3.0.3
staging versie: 3.0.2
rsgb versie: 3.0.2
```

- `java -jar ./bin/brmo-commandline.jar -db conf/commandline-example.properties --load ./MUT01.xml brk`
Expand Down
2 changes: 1 addition & 1 deletion brmo-commandline/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>nl.b3p</groupId>
<artifactId>brmo</artifactId>
<version>3.0.3-SNAPSHOT</version>
<version>4.0.0-SNAPSHOT</version>
</parent>
<artifactId>brmo-commandline</artifactId>
<packaging>jar</packaging>
Expand Down
8 changes: 1 addition & 7 deletions brmo-dist/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>nl.b3p</groupId>
<artifactId>brmo</artifactId>
<version>3.0.3-SNAPSHOT</version>
<version>4.0.0-SNAPSHOT</version>
</parent>
<artifactId>brmo-dist</artifactId>
<packaging>pom</packaging>
Expand All @@ -29,12 +29,6 @@
<version>${project.version}</version>
<type>war</type>
</dependency>
<dependency>
<groupId>nl.b3p</groupId>
<artifactId>brmo-soap</artifactId>
<version>${project.version}</version>
<type>war</type>
</dependency>
<dependency>
<groupId>nl.b3p</groupId>
<artifactId>brmo-stufbg204</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion brmo-init-util/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>nl.b3p</groupId>
<artifactId>brmo</artifactId>
<version>3.0.3-SNAPSHOT</version>
<version>4.0.0-SNAPSHOT</version>
</parent>
<artifactId>brmo-init-util</artifactId>
<packaging>jar</packaging>
Expand Down
2 changes: 1 addition & 1 deletion brmo-loader/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>nl.b3p</groupId>
<artifactId>brmo</artifactId>
<version>3.0.3-SNAPSHOT</version>
<version>4.0.0-SNAPSHOT</version>
</parent>
<artifactId>brmo-loader</artifactId>
<packaging>jar</packaging>
Expand Down
2 changes: 1 addition & 1 deletion brmo-persistence/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>nl.b3p</groupId>
<artifactId>brmo</artifactId>
<version>3.0.3-SNAPSHOT</version>
<version>4.0.0-SNAPSHOT</version>
</parent>
<artifactId>brmo-persistence</artifactId>
<packaging>jar</packaging>
Expand Down
2 changes: 1 addition & 1 deletion brmo-proxyservice/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>nl.b3p</groupId>
<artifactId>brmo</artifactId>
<version>3.0.3-SNAPSHOT</version>
<version>4.0.0-SNAPSHOT</version>
</parent>
<artifactId>brmo-proxyservice</artifactId>
<packaging>war</packaging>
Expand Down
2 changes: 1 addition & 1 deletion brmo-service/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>nl.b3p</groupId>
<artifactId>brmo</artifactId>
<version>3.0.3-SNAPSHOT</version>
<version>4.0.0-SNAPSHOT</version>
</parent>
<artifactId>brmo-service</artifactId>
<packaging>war</packaging>
Expand Down
2 changes: 1 addition & 1 deletion brmo-soap-util/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>nl.b3p</groupId>
<artifactId>brmo</artifactId>
<version>3.0.3-SNAPSHOT</version>
<version>4.0.0-SNAPSHOT</version>
</parent>
<artifactId>brmo-soap-util</artifactId>
<packaging>jar</packaging>
Expand Down
15 changes: 0 additions & 15 deletions brmo-soap/assembly.xml
View file
Open in desktop

This file was deleted.

Loading