Skip to content

Commit

Permalink
Changed javax to jakarta
Browse files Browse the repository at this point in the history
  • Loading branch information
Ediforce44 committed Feb 10, 2025
1 parent 4e568aa commit 24a0932
Show file tree
Hide file tree
Showing 14 changed files with 22 additions and 22 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
import java.util.Map;
import java.util.Objects;

import javax.measure.quantity.Duration;
import jakarta.measure.quantity.Duration;

import org.palladiosimulator.edp2.models.measuringpoint.MeasuringPointRepository;
import org.palladiosimulator.edp2.models.measuringpoint.MeasuringpointFactory;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package org.palladiosimulator.indirections.monitoring.simulizar;

import javax.measure.quantity.Dimensionless;
import jakarta.measure.quantity.Dimensionless;

import org.eclipse.emf.ecore.util.EcoreUtil;
import org.palladiosimulator.edp2.models.measuringpoint.MeasuringPointRepository;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
import java.util.Map;
import java.util.function.Consumer;

import javax.measure.Measure;
import javax.measure.quantity.Quantity;
import jakarta.measure.Measure;
import jakarta.measure.quantity.Quantity;

import org.eclipse.emf.ecore.util.EcoreUtil;
import org.palladiosimulator.edp2.util.MetricDescriptionUtility;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import java.util.LinkedList;
import java.util.List;

import javax.measure.quantity.Quantity;
import jakarta.measure.quantity.Quantity;

import org.palladiosimulator.measurementframework.MeasuringValue;
import org.palladiosimulator.measurementframework.measureprovider.IMeasureProvider;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package org.palladiosimulator.indirections.monitoring.simulizar;

import javax.measure.Measure;
import javax.measure.quantity.Quantity;
import jakarta.measure.Measure;
import jakarta.measure.quantity.Quantity;

import org.palladiosimulator.metricspec.BaseMetricDescription;
import org.palladiosimulator.probeframework.measurement.RequestContext;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ Require-Bundle: de.uka.ipd.sdq.scheduler,
org.palladiosimulator.reliability,
com.google.auto.factory-annotations,
org.palladiosimulator.indirections.scheduler,
javax.inject.javax.inject
jakarta.inject.jakarta.inject
Export-Package: org.palladiosimulator.indirections.scheduler,
org.palladiosimulator.indirections.scheduler.data,
org.palladiosimulator.indirections.scheduler.scheduling,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

import java.util.List;

import javax.measure.Measure;
import javax.measure.quantity.Quantity;
import jakarta.measure.Measure;
import jakarta.measure.quantity.Quantity;

import org.palladiosimulator.edp2.models.measuringpoint.StringMeasuringPoint;
import org.palladiosimulator.indirections.monitoring.simulizar.IndirectionMeasuringPointRegistry;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package org.palladiosimulator.indirections.calculators.scheduler;

import javax.measure.Measure;
import javax.measure.quantity.Dimensionless;
import jakarta.measure.Measure;
import jakarta.measure.quantity.Dimensionless;

import org.palladiosimulator.metricspec.BaseMetricDescription;
import org.palladiosimulator.metricspec.MetricSetDescription;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package org.palladiosimulator.indirections.calculators.scheduler;

import javax.measure.Measure;
import javax.measure.quantity.Duration;
import javax.measure.unit.SI;
import jakarta.measure.Measure;
import jakarta.measure.quantity.Duration;
import jakarta.measure.unit.SI;

import org.palladiosimulator.metricspec.BaseMetricDescription;
import org.palladiosimulator.metricspec.MetricSetDescription;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
import java.util.List;
import java.util.Map;

import javax.inject.Inject;
import jakarta.inject.Inject;

import org.palladiosimulator.commons.eclipseutils.ExtensionHelper;
import org.palladiosimulator.indirections.repository.DataChannel;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,4 +27,4 @@ Import-Package: com.google.auto.factory;version="1.0.0",
dagger;version="2.31.0",
dagger.internal;version="2.31.0",
dagger.multibindings;version="2.31.0",
javax.inject;version="1.0.0"
jakarta.inject;version="1.0.0"
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@
import java.util.Map;
import java.util.stream.Collectors;

import javax.measure.Measure;
import javax.measure.quantity.Duration;
import javax.measure.unit.SI;
import jakarta.measure.Measure;
import jakarta.measure.quantity.Duration;
import jakarta.measure.unit.SI;

import org.apache.log4j.Logger;
import org.eclipse.emf.common.util.EList;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,6 @@ Require-Bundle: org.palladiosimulator.pcm,
de.uka.ipd.sdq.stoex.analyser,
org.apache.log4j,
com.google.auto.factory-annotations;bundle-version="1.0.0",
javax.inject.javax.inject
jakarta.inject.jakarta.inject
Export-Package: org.palladiosimulator.indirections.util
Import-Package: org.palladiosimulator.commons.eclipseutils
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import static org.hamcrest.Matchers.equalTo;
import static org.junit.jupiter.api.Assertions.assertTrue;

import javax.measure.unit.SI;
import jakarta.measure.unit.SI;

import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
Expand Down

0 comments on commit 24a0932

Please sign in to comment.