Skip to content

Fix trace server version and display #122

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

Merged
bhufmann merged 3 commits into from
Nov 20, 2024
Merged

Fix trace server version and display #122

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
ef0d02a
Update script to match the rest.core version to the release version
bhufmann Nov 19, 2024
c2e4523
Match rest.core plug-in version with release version
bhufmann Nov 19, 2024
7032d69
Fix version display provided by IdentifierService
bhufmann Nov 19, 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
5 changes: 4 additions & 1 deletion skeleton/scripts/update_version.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
###############################################################################
# Copyright (c) 2016, 2022 Ericsson
# Copyright (c) 2016, 2024 Ericsson
#
# All rights reserved. This program and the accompanying materials
# are made available under the terms of the Eclipse Public License 2.0
Expand Down Expand Up @@ -56,3 +56,6 @@ find ../../rcp/org.eclipse.tracecompass.incubator.rcp.product/ -name "*.product"
#Update .product trace-server/org.eclipse.tracecompass.incubator.trace.server.product/(*/)traceserver.product
find ../../trace-server/org.eclipse.tracecompass.incubator.trace.server.product/ -name "*.product" -type f -exec sed -i -e s/$oldVersion/$newVersion/g {} \;

#Update rest.core plugin trace-server/org.eclipse.tracecompass.incubator.trace.server.jersey.rest.core/META-INF/MANIFEST.MF.
#This version is retrieved to show the server version and hence has to match the trace server product version
sed -i -e s/$oldVersion.qualifier/$newVersion.qualifier/g ../../trace-server/org.eclipse.tracecompass.incubator.trace.server.jersey.rest.core/META-INF/MANIFEST.MF
2 changes: 1 addition & 1 deletion ...ver/org.eclipse.tracecompass.incubator.trace.server.jersey.rest.core/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name
Bundle-Vendor: %Bundle-Vendor
Bundle-SymbolicName: org.eclipse.tracecompass.incubator.trace.server.jersey.rest.core;singleton:=true
Bundle-Version: 0.1.11.qualifier
Bundle-Version: 0.12.0.qualifier
Bundle-Localization: plugin
Bundle-Activator: org.eclipse.tracecompass.incubator.internal.trace.server.jersey.rest.core.Activator
Bundle-ActivationPolicy: lazy
Expand Down
2 changes: 1 addition & 1 deletion ...ecompass/incubator/internal/trace/server/jersey/rest/core/services/IdentifierService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ public Response getSystemInfo() {

if (product != null) {
Version version = product.getDefiningBundle().getVersion();
response.setVersion(version.getMajor() + SEPARATOR + version.getMicro() + SEPARATOR + version.getMinor());
response.setVersion(version.getMajor() + SEPARATOR + version.getMinor() + SEPARATOR + version.getMicro());
String qualifier = version.getQualifier();
if (!QUALIFIER.equalsIgnoreCase(qualifier) && qualifier != null) {
response.setBuildTime(qualifier);
Expand Down