From 0dc0982942e3df3762bd9b1e2d2f4adcea6aea25 Mon Sep 17 00:00:00 2001 From: "Ray J. Greenwell" Date: Mon, 27 Apr 2026 15:03:20 -0700 Subject: [PATCH] Stop depending on narya's dependency on jsr205. Use modern @Generated. --- .../main/java/com/threerings/micasa/lobby/LobbyMarshaller.java | 2 +- .../main/java/com/threerings/micasa/lobby/LobbyProvider.java | 2 +- .../com/threerings/micasa/lobby/table/TableLobbyObject.java | 2 +- .../threerings/micasa/simulator/data/SimulatorMarshaller.java | 2 +- .../parlor/card/trick/data/TrickCardGameMarshaller.java | 2 +- .../parlor/card/trick/server/TrickCardGameProvider.java | 2 +- .../main/java/com/threerings/parlor/data/ParlorMarshaller.java | 2 +- .../main/java/com/threerings/parlor/data/TableMarshaller.java | 2 +- .../main/java/com/threerings/parlor/game/data/GameObject.java | 2 +- .../main/java/com/threerings/parlor/server/ParlorProvider.java | 2 +- .../main/java/com/threerings/parlor/server/TableProvider.java | 2 +- .../com/threerings/parlor/tourney/data/TourneyMarshaller.java | 2 +- .../java/com/threerings/parlor/tourney/data/TourneyObject.java | 2 +- .../com/threerings/parlor/tourney/data/TourniesMarshaller.java | 2 +- .../com/threerings/parlor/tourney/server/TourneyProvider.java | 2 +- .../com/threerings/parlor/tourney/server/TourniesProvider.java | 2 +- .../java/com/threerings/puzzle/data/PuzzleGameMarshaller.java | 2 +- core/src/main/java/com/threerings/puzzle/data/PuzzleObject.java | 2 +- .../java/com/threerings/puzzle/server/PuzzleGameProvider.java | 2 +- .../java/com/threerings/stage/data/StageSceneMarshaller.java | 2 +- .../main/java/com/threerings/stage/data/StageSceneObject.java | 2 +- .../java/com/threerings/stage/server/StageSceneProvider.java | 2 +- .../main/java/com/threerings/whirled/data/SceneMarshaller.java | 2 +- .../main/java/com/threerings/whirled/server/SceneProvider.java | 2 +- .../java/com/threerings/whirled/spot/data/ClusterObject.java | 2 +- .../java/com/threerings/whirled/spot/data/SpotMarshaller.java | 2 +- .../java/com/threerings/whirled/spot/data/SpotSceneObject.java | 2 +- .../java/com/threerings/whirled/spot/server/SpotProvider.java | 2 +- .../java/com/threerings/whirled/zone/data/ZoneMarshaller.java | 2 +- .../com/threerings/whirled/zone/peer/server/ZoneNodeObject.java | 2 +- .../java/com/threerings/whirled/zone/server/ZoneProvider.java | 2 +- 31 files changed, 31 insertions(+), 31 deletions(-) diff --git a/core/src/main/java/com/threerings/micasa/lobby/LobbyMarshaller.java b/core/src/main/java/com/threerings/micasa/lobby/LobbyMarshaller.java index d0df5ee4..489136d1 100644 --- a/core/src/main/java/com/threerings/micasa/lobby/LobbyMarshaller.java +++ b/core/src/main/java/com/threerings/micasa/lobby/LobbyMarshaller.java @@ -21,7 +21,7 @@ package com.threerings.micasa.lobby; -import javax.annotation.Generated; +import javax.annotation.processing.Generated; import com.threerings.presents.data.InvocationMarshaller; import java.util.List; diff --git a/core/src/main/java/com/threerings/micasa/lobby/LobbyProvider.java b/core/src/main/java/com/threerings/micasa/lobby/LobbyProvider.java index 91521cc7..32704d93 100644 --- a/core/src/main/java/com/threerings/micasa/lobby/LobbyProvider.java +++ b/core/src/main/java/com/threerings/micasa/lobby/LobbyProvider.java @@ -21,7 +21,7 @@ package com.threerings.micasa.lobby; -import javax.annotation.Generated; +import javax.annotation.processing.Generated; import com.threerings.presents.data.ClientObject; import com.threerings.presents.server.InvocationException; diff --git a/core/src/main/java/com/threerings/micasa/lobby/table/TableLobbyObject.java b/core/src/main/java/com/threerings/micasa/lobby/table/TableLobbyObject.java index 7df54d99..3e61ac4b 100644 --- a/core/src/main/java/com/threerings/micasa/lobby/table/TableLobbyObject.java +++ b/core/src/main/java/com/threerings/micasa/lobby/table/TableLobbyObject.java @@ -21,7 +21,7 @@ package com.threerings.micasa.lobby.table; -import javax.annotation.Generated; +import javax.annotation.processing.Generated; import com.threerings.presents.dobj.DSet; import com.threerings.parlor.data.Table; diff --git a/core/src/main/java/com/threerings/micasa/simulator/data/SimulatorMarshaller.java b/core/src/main/java/com/threerings/micasa/simulator/data/SimulatorMarshaller.java index 75ff43ca..5c202d7d 100644 --- a/core/src/main/java/com/threerings/micasa/simulator/data/SimulatorMarshaller.java +++ b/core/src/main/java/com/threerings/micasa/simulator/data/SimulatorMarshaller.java @@ -21,7 +21,7 @@ package com.threerings.micasa.simulator.data; -import javax.annotation.Generated; +import javax.annotation.processing.Generated; import com.threerings.micasa.simulator.client.SimulatorService; import com.threerings.parlor.game.data.GameConfig; diff --git a/core/src/main/java/com/threerings/parlor/card/trick/data/TrickCardGameMarshaller.java b/core/src/main/java/com/threerings/parlor/card/trick/data/TrickCardGameMarshaller.java index a0071837..e72a80c3 100644 --- a/core/src/main/java/com/threerings/parlor/card/trick/data/TrickCardGameMarshaller.java +++ b/core/src/main/java/com/threerings/parlor/card/trick/data/TrickCardGameMarshaller.java @@ -21,7 +21,7 @@ package com.threerings.parlor.card.trick.data; -import javax.annotation.Generated; +import javax.annotation.processing.Generated; import com.threerings.parlor.card.data.Card; import com.threerings.parlor.card.trick.client.TrickCardGameService; diff --git a/core/src/main/java/com/threerings/parlor/card/trick/server/TrickCardGameProvider.java b/core/src/main/java/com/threerings/parlor/card/trick/server/TrickCardGameProvider.java index 4b2ed40b..9c2afdbc 100644 --- a/core/src/main/java/com/threerings/parlor/card/trick/server/TrickCardGameProvider.java +++ b/core/src/main/java/com/threerings/parlor/card/trick/server/TrickCardGameProvider.java @@ -21,7 +21,7 @@ package com.threerings.parlor.card.trick.server; -import javax.annotation.Generated; +import javax.annotation.processing.Generated; import com.threerings.parlor.card.data.Card; import com.threerings.parlor.card.trick.client.TrickCardGameService; diff --git a/core/src/main/java/com/threerings/parlor/data/ParlorMarshaller.java b/core/src/main/java/com/threerings/parlor/data/ParlorMarshaller.java index ad845fa7..4aa49cc3 100644 --- a/core/src/main/java/com/threerings/parlor/data/ParlorMarshaller.java +++ b/core/src/main/java/com/threerings/parlor/data/ParlorMarshaller.java @@ -21,7 +21,7 @@ package com.threerings.parlor.data; -import javax.annotation.Generated; +import javax.annotation.processing.Generated; import com.threerings.parlor.client.ParlorService; import com.threerings.parlor.game.data.GameConfig; diff --git a/core/src/main/java/com/threerings/parlor/data/TableMarshaller.java b/core/src/main/java/com/threerings/parlor/data/TableMarshaller.java index 71f71296..4a55680d 100644 --- a/core/src/main/java/com/threerings/parlor/data/TableMarshaller.java +++ b/core/src/main/java/com/threerings/parlor/data/TableMarshaller.java @@ -21,7 +21,7 @@ package com.threerings.parlor.data; -import javax.annotation.Generated; +import javax.annotation.processing.Generated; import com.threerings.parlor.client.TableService; import com.threerings.parlor.game.data.GameConfig; diff --git a/core/src/main/java/com/threerings/parlor/game/data/GameObject.java b/core/src/main/java/com/threerings/parlor/game/data/GameObject.java index f4661075..4c016d17 100644 --- a/core/src/main/java/com/threerings/parlor/game/data/GameObject.java +++ b/core/src/main/java/com/threerings/parlor/game/data/GameObject.java @@ -21,7 +21,7 @@ package com.threerings.parlor.game.data; -import javax.annotation.Generated; +import javax.annotation.processing.Generated; import com.samskivert.util.StringUtil; import com.threerings.util.Name; diff --git a/core/src/main/java/com/threerings/parlor/server/ParlorProvider.java b/core/src/main/java/com/threerings/parlor/server/ParlorProvider.java index ef8c2ed6..1a95d06b 100644 --- a/core/src/main/java/com/threerings/parlor/server/ParlorProvider.java +++ b/core/src/main/java/com/threerings/parlor/server/ParlorProvider.java @@ -21,7 +21,7 @@ package com.threerings.parlor.server; -import javax.annotation.Generated; +import javax.annotation.processing.Generated; import com.threerings.parlor.client.ParlorService; import com.threerings.parlor.game.data.GameConfig; diff --git a/core/src/main/java/com/threerings/parlor/server/TableProvider.java b/core/src/main/java/com/threerings/parlor/server/TableProvider.java index 96c2555d..b414c470 100644 --- a/core/src/main/java/com/threerings/parlor/server/TableProvider.java +++ b/core/src/main/java/com/threerings/parlor/server/TableProvider.java @@ -21,7 +21,7 @@ package com.threerings.parlor.server; -import javax.annotation.Generated; +import javax.annotation.processing.Generated; import com.threerings.parlor.client.TableService; import com.threerings.parlor.data.TableConfig; diff --git a/core/src/main/java/com/threerings/parlor/tourney/data/TourneyMarshaller.java b/core/src/main/java/com/threerings/parlor/tourney/data/TourneyMarshaller.java index 68eba105..1d8b32ec 100644 --- a/core/src/main/java/com/threerings/parlor/tourney/data/TourneyMarshaller.java +++ b/core/src/main/java/com/threerings/parlor/tourney/data/TourneyMarshaller.java @@ -21,7 +21,7 @@ package com.threerings.parlor.tourney.data; -import javax.annotation.Generated; +import javax.annotation.processing.Generated; import com.threerings.parlor.tourney.client.TourneyService; import com.threerings.presents.client.InvocationService; diff --git a/core/src/main/java/com/threerings/parlor/tourney/data/TourneyObject.java b/core/src/main/java/com/threerings/parlor/tourney/data/TourneyObject.java index 01d6b1e6..ef5d613e 100644 --- a/core/src/main/java/com/threerings/parlor/tourney/data/TourneyObject.java +++ b/core/src/main/java/com/threerings/parlor/tourney/data/TourneyObject.java @@ -21,7 +21,7 @@ package com.threerings.parlor.tourney.data; -import javax.annotation.Generated; +import javax.annotation.processing.Generated; import com.threerings.presents.dobj.DObject; import com.threerings.presents.dobj.DSet; diff --git a/core/src/main/java/com/threerings/parlor/tourney/data/TourniesMarshaller.java b/core/src/main/java/com/threerings/parlor/tourney/data/TourniesMarshaller.java index 3ef3dd2e..de547012 100644 --- a/core/src/main/java/com/threerings/parlor/tourney/data/TourniesMarshaller.java +++ b/core/src/main/java/com/threerings/parlor/tourney/data/TourniesMarshaller.java @@ -21,7 +21,7 @@ package com.threerings.parlor.tourney.data; -import javax.annotation.Generated; +import javax.annotation.processing.Generated; import com.threerings.parlor.tourney.client.TourniesService; import com.threerings.presents.client.InvocationService; diff --git a/core/src/main/java/com/threerings/parlor/tourney/server/TourneyProvider.java b/core/src/main/java/com/threerings/parlor/tourney/server/TourneyProvider.java index 8af3fc87..e43eb4a2 100644 --- a/core/src/main/java/com/threerings/parlor/tourney/server/TourneyProvider.java +++ b/core/src/main/java/com/threerings/parlor/tourney/server/TourneyProvider.java @@ -21,7 +21,7 @@ package com.threerings.parlor.tourney.server; -import javax.annotation.Generated; +import javax.annotation.processing.Generated; import com.threerings.parlor.tourney.client.TourneyService; import com.threerings.presents.client.InvocationService; diff --git a/core/src/main/java/com/threerings/parlor/tourney/server/TourniesProvider.java b/core/src/main/java/com/threerings/parlor/tourney/server/TourniesProvider.java index 34173f88..ae614d1d 100644 --- a/core/src/main/java/com/threerings/parlor/tourney/server/TourniesProvider.java +++ b/core/src/main/java/com/threerings/parlor/tourney/server/TourniesProvider.java @@ -21,7 +21,7 @@ package com.threerings.parlor.tourney.server; -import javax.annotation.Generated; +import javax.annotation.processing.Generated; import com.threerings.parlor.tourney.client.TourniesService; import com.threerings.parlor.tourney.data.TourneyConfig; diff --git a/core/src/main/java/com/threerings/puzzle/data/PuzzleGameMarshaller.java b/core/src/main/java/com/threerings/puzzle/data/PuzzleGameMarshaller.java index 390994b0..42d371f1 100644 --- a/core/src/main/java/com/threerings/puzzle/data/PuzzleGameMarshaller.java +++ b/core/src/main/java/com/threerings/puzzle/data/PuzzleGameMarshaller.java @@ -21,7 +21,7 @@ package com.threerings.puzzle.data; -import javax.annotation.Generated; +import javax.annotation.processing.Generated; import com.threerings.presents.data.InvocationMarshaller; import com.threerings.puzzle.client.PuzzleGameService; diff --git a/core/src/main/java/com/threerings/puzzle/data/PuzzleObject.java b/core/src/main/java/com/threerings/puzzle/data/PuzzleObject.java index 31d16a67..af6ad17c 100644 --- a/core/src/main/java/com/threerings/puzzle/data/PuzzleObject.java +++ b/core/src/main/java/com/threerings/puzzle/data/PuzzleObject.java @@ -21,7 +21,7 @@ package com.threerings.puzzle.data; -import javax.annotation.Generated; +import javax.annotation.processing.Generated; import com.threerings.parlor.game.data.GameObject; /** diff --git a/core/src/main/java/com/threerings/puzzle/server/PuzzleGameProvider.java b/core/src/main/java/com/threerings/puzzle/server/PuzzleGameProvider.java index 94a431c5..bf446518 100644 --- a/core/src/main/java/com/threerings/puzzle/server/PuzzleGameProvider.java +++ b/core/src/main/java/com/threerings/puzzle/server/PuzzleGameProvider.java @@ -21,7 +21,7 @@ package com.threerings.puzzle.server; -import javax.annotation.Generated; +import javax.annotation.processing.Generated; import com.threerings.presents.data.ClientObject; import com.threerings.presents.server.InvocationProvider; diff --git a/core/src/main/java/com/threerings/stage/data/StageSceneMarshaller.java b/core/src/main/java/com/threerings/stage/data/StageSceneMarshaller.java index 668e8d9d..acebc683 100644 --- a/core/src/main/java/com/threerings/stage/data/StageSceneMarshaller.java +++ b/core/src/main/java/com/threerings/stage/data/StageSceneMarshaller.java @@ -21,7 +21,7 @@ package com.threerings.stage.data; -import javax.annotation.Generated; +import javax.annotation.processing.Generated; import com.threerings.miso.data.ObjectInfo; import com.threerings.presents.client.InvocationService; diff --git a/core/src/main/java/com/threerings/stage/data/StageSceneObject.java b/core/src/main/java/com/threerings/stage/data/StageSceneObject.java index 2647d390..285426b2 100644 --- a/core/src/main/java/com/threerings/stage/data/StageSceneObject.java +++ b/core/src/main/java/com/threerings/stage/data/StageSceneObject.java @@ -21,7 +21,7 @@ package com.threerings.stage.data; -import javax.annotation.Generated; +import javax.annotation.processing.Generated; import com.threerings.whirled.spot.data.SpotSceneObject; /** diff --git a/core/src/main/java/com/threerings/stage/server/StageSceneProvider.java b/core/src/main/java/com/threerings/stage/server/StageSceneProvider.java index ab4c1c2c..75a2bd7f 100644 --- a/core/src/main/java/com/threerings/stage/server/StageSceneProvider.java +++ b/core/src/main/java/com/threerings/stage/server/StageSceneProvider.java @@ -21,7 +21,7 @@ package com.threerings.stage.server; -import javax.annotation.Generated; +import javax.annotation.processing.Generated; import com.threerings.miso.data.ObjectInfo; import com.threerings.presents.client.InvocationService; diff --git a/core/src/main/java/com/threerings/whirled/data/SceneMarshaller.java b/core/src/main/java/com/threerings/whirled/data/SceneMarshaller.java index 017c089b..9ca6ed3c 100644 --- a/core/src/main/java/com/threerings/whirled/data/SceneMarshaller.java +++ b/core/src/main/java/com/threerings/whirled/data/SceneMarshaller.java @@ -21,7 +21,7 @@ package com.threerings.whirled.data; -import javax.annotation.Generated; +import javax.annotation.processing.Generated; import com.threerings.crowd.data.PlaceConfig; import com.threerings.presents.data.InvocationMarshaller; diff --git a/core/src/main/java/com/threerings/whirled/server/SceneProvider.java b/core/src/main/java/com/threerings/whirled/server/SceneProvider.java index 92f7270e..1d7702a3 100644 --- a/core/src/main/java/com/threerings/whirled/server/SceneProvider.java +++ b/core/src/main/java/com/threerings/whirled/server/SceneProvider.java @@ -21,7 +21,7 @@ package com.threerings.whirled.server; -import javax.annotation.Generated; +import javax.annotation.processing.Generated; import com.threerings.presents.data.ClientObject; import com.threerings.presents.server.InvocationException; diff --git a/core/src/main/java/com/threerings/whirled/spot/data/ClusterObject.java b/core/src/main/java/com/threerings/whirled/spot/data/ClusterObject.java index 8f451fc3..e152fcd2 100644 --- a/core/src/main/java/com/threerings/whirled/spot/data/ClusterObject.java +++ b/core/src/main/java/com/threerings/whirled/spot/data/ClusterObject.java @@ -21,7 +21,7 @@ package com.threerings.whirled.spot.data; -import javax.annotation.Generated; +import javax.annotation.processing.Generated; import com.threerings.presents.dobj.DObject; import com.threerings.presents.dobj.OidList; diff --git a/core/src/main/java/com/threerings/whirled/spot/data/SpotMarshaller.java b/core/src/main/java/com/threerings/whirled/spot/data/SpotMarshaller.java index b66d8e4b..a1452bad 100644 --- a/core/src/main/java/com/threerings/whirled/spot/data/SpotMarshaller.java +++ b/core/src/main/java/com/threerings/whirled/spot/data/SpotMarshaller.java @@ -21,7 +21,7 @@ package com.threerings.whirled.spot.data; -import javax.annotation.Generated; +import javax.annotation.processing.Generated; import com.threerings.crowd.data.PlaceConfig; import com.threerings.presents.client.InvocationService; diff --git a/core/src/main/java/com/threerings/whirled/spot/data/SpotSceneObject.java b/core/src/main/java/com/threerings/whirled/spot/data/SpotSceneObject.java index 5d5732e0..8863a39c 100644 --- a/core/src/main/java/com/threerings/whirled/spot/data/SpotSceneObject.java +++ b/core/src/main/java/com/threerings/whirled/spot/data/SpotSceneObject.java @@ -21,7 +21,7 @@ package com.threerings.whirled.spot.data; -import javax.annotation.Generated; +import javax.annotation.processing.Generated; import com.threerings.presents.dobj.DSet; import com.threerings.whirled.data.SceneObject; diff --git a/core/src/main/java/com/threerings/whirled/spot/server/SpotProvider.java b/core/src/main/java/com/threerings/whirled/spot/server/SpotProvider.java index 0ca0a1e0..d5693f70 100644 --- a/core/src/main/java/com/threerings/whirled/spot/server/SpotProvider.java +++ b/core/src/main/java/com/threerings/whirled/spot/server/SpotProvider.java @@ -21,7 +21,7 @@ package com.threerings.whirled.spot.server; -import javax.annotation.Generated; +import javax.annotation.processing.Generated; import com.threerings.presents.client.InvocationService; import com.threerings.presents.data.ClientObject; diff --git a/core/src/main/java/com/threerings/whirled/zone/data/ZoneMarshaller.java b/core/src/main/java/com/threerings/whirled/zone/data/ZoneMarshaller.java index 12e57ea8..429d53c9 100644 --- a/core/src/main/java/com/threerings/whirled/zone/data/ZoneMarshaller.java +++ b/core/src/main/java/com/threerings/whirled/zone/data/ZoneMarshaller.java @@ -21,7 +21,7 @@ package com.threerings.whirled.zone.data; -import javax.annotation.Generated; +import javax.annotation.processing.Generated; import com.threerings.crowd.data.PlaceConfig; import com.threerings.presents.data.InvocationMarshaller; diff --git a/core/src/main/java/com/threerings/whirled/zone/peer/server/ZoneNodeObject.java b/core/src/main/java/com/threerings/whirled/zone/peer/server/ZoneNodeObject.java index 8880964d..758df8cb 100644 --- a/core/src/main/java/com/threerings/whirled/zone/peer/server/ZoneNodeObject.java +++ b/core/src/main/java/com/threerings/whirled/zone/peer/server/ZoneNodeObject.java @@ -21,7 +21,7 @@ package com.threerings.whirled.zone.peer.server; -import javax.annotation.Generated; +import javax.annotation.processing.Generated; import com.threerings.presents.dobj.DSet; import com.threerings.crowd.peer.data.CrowdNodeObject; diff --git a/core/src/main/java/com/threerings/whirled/zone/server/ZoneProvider.java b/core/src/main/java/com/threerings/whirled/zone/server/ZoneProvider.java index 0884904c..256834d0 100644 --- a/core/src/main/java/com/threerings/whirled/zone/server/ZoneProvider.java +++ b/core/src/main/java/com/threerings/whirled/zone/server/ZoneProvider.java @@ -21,7 +21,7 @@ package com.threerings.whirled.zone.server; -import javax.annotation.Generated; +import javax.annotation.processing.Generated; import com.threerings.presents.data.ClientObject; import com.threerings.presents.server.InvocationException;