From 5e9f4d5a15ec794ad5e84e23a53f91766d92f2fa Mon Sep 17 00:00:00 2001 From: "Ray J. Greenwell" Date: Mon, 27 Apr 2026 14:58:54 -0700 Subject: [PATCH] Stop using the old JSR250 annotation. This will likely break a bunch of things because things further down the line were depending on narya bringing in this jar. --- core/pom.xml | 5 ----- .../main/java/com/threerings/admin/data/AdminMarshaller.java | 2 +- .../main/java/com/threerings/admin/server/AdminProvider.java | 2 +- .../main/java/com/threerings/bureau/data/AgentObject.java | 2 +- .../java/com/threerings/bureau/data/BureauMarshaller.java | 2 +- .../java/com/threerings/bureau/server/BureauProvider.java | 2 +- .../threerings/crowd/chat/data/ChannelSpeakMarshaller.java | 2 +- .../java/com/threerings/crowd/chat/data/ChatMarshaller.java | 2 +- .../java/com/threerings/crowd/chat/data/SpeakMarshaller.java | 2 +- .../threerings/crowd/chat/server/ChannelSpeakProvider.java | 2 +- .../java/com/threerings/crowd/chat/server/SpeakProvider.java | 2 +- .../main/java/com/threerings/crowd/data/BodyMarshaller.java | 2 +- core/src/main/java/com/threerings/crowd/data/BodyObject.java | 2 +- .../java/com/threerings/crowd/data/LocationMarshaller.java | 2 +- .../src/main/java/com/threerings/crowd/data/PlaceObject.java | 2 +- .../java/com/threerings/crowd/peer/data/CrowdNodeObject.java | 2 +- .../com/threerings/crowd/peer/data/CrowdPeerMarshaller.java | 2 +- .../com/threerings/crowd/peer/server/CrowdPeerProvider.java | 2 +- .../main/java/com/threerings/crowd/server/BodyProvider.java | 2 +- .../java/com/threerings/crowd/server/LocationProvider.java | 2 +- .../main/java/com/threerings/presents/data/ClientObject.java | 2 +- .../com/threerings/presents/data/RegistrationMarshaller.java | 2 +- .../com/threerings/presents/data/TimeBaseMarshaller.java | 2 +- .../java/com/threerings/presents/data/TimeBaseObject.java | 2 +- .../java/com/threerings/presents/peer/data/NodeObject.java | 2 +- .../com/threerings/presents/peer/data/PeerMarshaller.java | 2 +- .../com/threerings/presents/peer/server/PeerProvider.java | 2 +- .../com/threerings/presents/server/RegistrationProvider.java | 2 +- .../java/com/threerings/presents/data/TestMarshaller.java | 2 +- .../test/java/com/threerings/presents/data/TestObject.java | 2 +- .../java/com/threerings/presents/server/TestProvider.java | 2 +- .../java/com/threerings/presents/tools/GenServiceTask.java | 4 ++-- .../main/java/com/threerings/presents/tools/SourceFile.java | 2 +- .../resources/com/threerings/presents/tools/dispatcher.tmpl | 2 +- 34 files changed, 34 insertions(+), 39 deletions(-) diff --git a/core/pom.xml b/core/pom.xml index 92f32f306..d16a961a6 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -23,11 +23,6 @@ guice 5.1.0 - - javax.annotation - jsr250-api - 1.0 - diff --git a/core/src/main/java/com/threerings/admin/data/AdminMarshaller.java b/core/src/main/java/com/threerings/admin/data/AdminMarshaller.java index 4782221bf..54e6766e4 100644 --- a/core/src/main/java/com/threerings/admin/data/AdminMarshaller.java +++ b/core/src/main/java/com/threerings/admin/data/AdminMarshaller.java @@ -5,7 +5,7 @@ package com.threerings.admin.data; -import javax.annotation.Generated; +import javax.annotation.processing.Generated; import com.threerings.presents.data.ClientObject; import com.threerings.presents.data.InvocationMarshaller; diff --git a/core/src/main/java/com/threerings/admin/server/AdminProvider.java b/core/src/main/java/com/threerings/admin/server/AdminProvider.java index 6aad76d02..07b7ec16b 100644 --- a/core/src/main/java/com/threerings/admin/server/AdminProvider.java +++ b/core/src/main/java/com/threerings/admin/server/AdminProvider.java @@ -5,7 +5,7 @@ package com.threerings.admin.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/bureau/data/AgentObject.java b/core/src/main/java/com/threerings/bureau/data/AgentObject.java index 17919fd65..3e7c9a2c7 100644 --- a/core/src/main/java/com/threerings/bureau/data/AgentObject.java +++ b/core/src/main/java/com/threerings/bureau/data/AgentObject.java @@ -5,7 +5,7 @@ package com.threerings.bureau.data; -import javax.annotation.Generated; +import javax.annotation.processing.Generated; import com.threerings.presents.dobj.DObject; /** diff --git a/core/src/main/java/com/threerings/bureau/data/BureauMarshaller.java b/core/src/main/java/com/threerings/bureau/data/BureauMarshaller.java index 0fc953ec5..b62f76b21 100644 --- a/core/src/main/java/com/threerings/bureau/data/BureauMarshaller.java +++ b/core/src/main/java/com/threerings/bureau/data/BureauMarshaller.java @@ -5,7 +5,7 @@ package com.threerings.bureau.data; -import javax.annotation.Generated; +import javax.annotation.processing.Generated; import com.threerings.presents.data.ClientObject; import com.threerings.presents.data.InvocationMarshaller; diff --git a/core/src/main/java/com/threerings/bureau/server/BureauProvider.java b/core/src/main/java/com/threerings/bureau/server/BureauProvider.java index 5729b4a6e..f1ecd4412 100644 --- a/core/src/main/java/com/threerings/bureau/server/BureauProvider.java +++ b/core/src/main/java/com/threerings/bureau/server/BureauProvider.java @@ -5,7 +5,7 @@ package com.threerings.bureau.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/crowd/chat/data/ChannelSpeakMarshaller.java b/core/src/main/java/com/threerings/crowd/chat/data/ChannelSpeakMarshaller.java index d6da35a2b..d49a09e38 100644 --- a/core/src/main/java/com/threerings/crowd/chat/data/ChannelSpeakMarshaller.java +++ b/core/src/main/java/com/threerings/crowd/chat/data/ChannelSpeakMarshaller.java @@ -5,7 +5,7 @@ package com.threerings.crowd.chat.data; -import javax.annotation.Generated; +import javax.annotation.processing.Generated; import com.threerings.presents.data.ClientObject; import com.threerings.presents.data.InvocationMarshaller; diff --git a/core/src/main/java/com/threerings/crowd/chat/data/ChatMarshaller.java b/core/src/main/java/com/threerings/crowd/chat/data/ChatMarshaller.java index 0e4bfdbdf..98755b251 100644 --- a/core/src/main/java/com/threerings/crowd/chat/data/ChatMarshaller.java +++ b/core/src/main/java/com/threerings/crowd/chat/data/ChatMarshaller.java @@ -5,7 +5,7 @@ package com.threerings.crowd.chat.data; -import javax.annotation.Generated; +import javax.annotation.processing.Generated; import com.threerings.util.Name; diff --git a/core/src/main/java/com/threerings/crowd/chat/data/SpeakMarshaller.java b/core/src/main/java/com/threerings/crowd/chat/data/SpeakMarshaller.java index 6e7dbba9b..7b7e70dd2 100644 --- a/core/src/main/java/com/threerings/crowd/chat/data/SpeakMarshaller.java +++ b/core/src/main/java/com/threerings/crowd/chat/data/SpeakMarshaller.java @@ -5,7 +5,7 @@ package com.threerings.crowd.chat.data; -import javax.annotation.Generated; +import javax.annotation.processing.Generated; import com.threerings.presents.data.ClientObject; import com.threerings.presents.data.InvocationMarshaller; diff --git a/core/src/main/java/com/threerings/crowd/chat/server/ChannelSpeakProvider.java b/core/src/main/java/com/threerings/crowd/chat/server/ChannelSpeakProvider.java index 4c634330e..952c8ee19 100644 --- a/core/src/main/java/com/threerings/crowd/chat/server/ChannelSpeakProvider.java +++ b/core/src/main/java/com/threerings/crowd/chat/server/ChannelSpeakProvider.java @@ -5,7 +5,7 @@ package com.threerings.crowd.chat.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/crowd/chat/server/SpeakProvider.java b/core/src/main/java/com/threerings/crowd/chat/server/SpeakProvider.java index 046c3ce43..7c633b998 100644 --- a/core/src/main/java/com/threerings/crowd/chat/server/SpeakProvider.java +++ b/core/src/main/java/com/threerings/crowd/chat/server/SpeakProvider.java @@ -5,7 +5,7 @@ package com.threerings.crowd.chat.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/crowd/data/BodyMarshaller.java b/core/src/main/java/com/threerings/crowd/data/BodyMarshaller.java index 3e1d91023..d31e5b05d 100644 --- a/core/src/main/java/com/threerings/crowd/data/BodyMarshaller.java +++ b/core/src/main/java/com/threerings/crowd/data/BodyMarshaller.java @@ -5,7 +5,7 @@ package com.threerings.crowd.data; -import javax.annotation.Generated; +import javax.annotation.processing.Generated; import com.threerings.presents.data.ClientObject; import com.threerings.presents.data.InvocationMarshaller; diff --git a/core/src/main/java/com/threerings/crowd/data/BodyObject.java b/core/src/main/java/com/threerings/crowd/data/BodyObject.java index c6939f03c..fdfb876fb 100644 --- a/core/src/main/java/com/threerings/crowd/data/BodyObject.java +++ b/core/src/main/java/com/threerings/crowd/data/BodyObject.java @@ -5,7 +5,7 @@ package com.threerings.crowd.data; -import javax.annotation.Generated; +import javax.annotation.processing.Generated; import com.threerings.util.Name; import com.threerings.presents.data.ClientObject; diff --git a/core/src/main/java/com/threerings/crowd/data/LocationMarshaller.java b/core/src/main/java/com/threerings/crowd/data/LocationMarshaller.java index 552f6bc32..e5de865e4 100644 --- a/core/src/main/java/com/threerings/crowd/data/LocationMarshaller.java +++ b/core/src/main/java/com/threerings/crowd/data/LocationMarshaller.java @@ -5,7 +5,7 @@ package com.threerings.crowd.data; -import javax.annotation.Generated; +import javax.annotation.processing.Generated; import com.threerings.presents.data.ClientObject; import com.threerings.presents.data.InvocationMarshaller; diff --git a/core/src/main/java/com/threerings/crowd/data/PlaceObject.java b/core/src/main/java/com/threerings/crowd/data/PlaceObject.java index b651184b3..2592db746 100644 --- a/core/src/main/java/com/threerings/crowd/data/PlaceObject.java +++ b/core/src/main/java/com/threerings/crowd/data/PlaceObject.java @@ -5,7 +5,7 @@ package com.threerings.crowd.data; -import javax.annotation.Generated; +import javax.annotation.processing.Generated; import com.threerings.util.Name; import com.threerings.presents.dobj.DObject; diff --git a/core/src/main/java/com/threerings/crowd/peer/data/CrowdNodeObject.java b/core/src/main/java/com/threerings/crowd/peer/data/CrowdNodeObject.java index e98d6b050..13d3fda1e 100644 --- a/core/src/main/java/com/threerings/crowd/peer/data/CrowdNodeObject.java +++ b/core/src/main/java/com/threerings/crowd/peer/data/CrowdNodeObject.java @@ -5,7 +5,7 @@ package com.threerings.crowd.peer.data; -import javax.annotation.Generated; +import javax.annotation.processing.Generated; import com.threerings.presents.dobj.DSet; import com.threerings.presents.peer.data.NodeObject; diff --git a/core/src/main/java/com/threerings/crowd/peer/data/CrowdPeerMarshaller.java b/core/src/main/java/com/threerings/crowd/peer/data/CrowdPeerMarshaller.java index 5e9454761..a78776c35 100644 --- a/core/src/main/java/com/threerings/crowd/peer/data/CrowdPeerMarshaller.java +++ b/core/src/main/java/com/threerings/crowd/peer/data/CrowdPeerMarshaller.java @@ -5,7 +5,7 @@ package com.threerings.crowd.peer.data; -import javax.annotation.Generated; +import javax.annotation.processing.Generated; import com.threerings.util.Name; diff --git a/core/src/main/java/com/threerings/crowd/peer/server/CrowdPeerProvider.java b/core/src/main/java/com/threerings/crowd/peer/server/CrowdPeerProvider.java index 630be6723..0f716ed40 100644 --- a/core/src/main/java/com/threerings/crowd/peer/server/CrowdPeerProvider.java +++ b/core/src/main/java/com/threerings/crowd/peer/server/CrowdPeerProvider.java @@ -5,7 +5,7 @@ package com.threerings.crowd.peer.server; -import javax.annotation.Generated; +import javax.annotation.processing.Generated; import com.threerings.util.Name; diff --git a/core/src/main/java/com/threerings/crowd/server/BodyProvider.java b/core/src/main/java/com/threerings/crowd/server/BodyProvider.java index a686b0583..2829eb1ac 100644 --- a/core/src/main/java/com/threerings/crowd/server/BodyProvider.java +++ b/core/src/main/java/com/threerings/crowd/server/BodyProvider.java @@ -5,7 +5,7 @@ package com.threerings.crowd.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/crowd/server/LocationProvider.java b/core/src/main/java/com/threerings/crowd/server/LocationProvider.java index 4b47b34ce..5f85c0415 100644 --- a/core/src/main/java/com/threerings/crowd/server/LocationProvider.java +++ b/core/src/main/java/com/threerings/crowd/server/LocationProvider.java @@ -5,7 +5,7 @@ package com.threerings.crowd.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/presents/data/ClientObject.java b/core/src/main/java/com/threerings/presents/data/ClientObject.java index c018580b5..14aead568 100644 --- a/core/src/main/java/com/threerings/presents/data/ClientObject.java +++ b/core/src/main/java/com/threerings/presents/data/ClientObject.java @@ -5,7 +5,7 @@ package com.threerings.presents.data; -import javax.annotation.Generated; +import javax.annotation.processing.Generated; import com.threerings.util.Name; import com.threerings.presents.client.InvocationReceiver; diff --git a/core/src/main/java/com/threerings/presents/data/RegistrationMarshaller.java b/core/src/main/java/com/threerings/presents/data/RegistrationMarshaller.java index e1f0e39bd..6e25b1e2e 100644 --- a/core/src/main/java/com/threerings/presents/data/RegistrationMarshaller.java +++ b/core/src/main/java/com/threerings/presents/data/RegistrationMarshaller.java @@ -5,7 +5,7 @@ package com.threerings.presents.data; -import javax.annotation.Generated; +import javax.annotation.processing.Generated; import com.threerings.presents.client.InvocationReceiver; import com.threerings.presents.client.RegistrationService; diff --git a/core/src/main/java/com/threerings/presents/data/TimeBaseMarshaller.java b/core/src/main/java/com/threerings/presents/data/TimeBaseMarshaller.java index dadaf935a..7e9f5d5d0 100644 --- a/core/src/main/java/com/threerings/presents/data/TimeBaseMarshaller.java +++ b/core/src/main/java/com/threerings/presents/data/TimeBaseMarshaller.java @@ -5,7 +5,7 @@ package com.threerings.presents.data; -import javax.annotation.Generated; +import javax.annotation.processing.Generated; import com.threerings.presents.client.TimeBaseService; diff --git a/core/src/main/java/com/threerings/presents/data/TimeBaseObject.java b/core/src/main/java/com/threerings/presents/data/TimeBaseObject.java index 11df687dd..018202b91 100644 --- a/core/src/main/java/com/threerings/presents/data/TimeBaseObject.java +++ b/core/src/main/java/com/threerings/presents/data/TimeBaseObject.java @@ -5,7 +5,7 @@ package com.threerings.presents.data; -import javax.annotation.Generated; +import javax.annotation.processing.Generated; import com.threerings.presents.dobj.DObject; /** diff --git a/core/src/main/java/com/threerings/presents/peer/data/NodeObject.java b/core/src/main/java/com/threerings/presents/peer/data/NodeObject.java index 3cc1b0628..d2fce6220 100644 --- a/core/src/main/java/com/threerings/presents/peer/data/NodeObject.java +++ b/core/src/main/java/com/threerings/presents/peer/data/NodeObject.java @@ -5,7 +5,7 @@ package com.threerings.presents.peer.data; -import javax.annotation.Generated; +import javax.annotation.processing.Generated; import com.google.common.base.Objects; diff --git a/core/src/main/java/com/threerings/presents/peer/data/PeerMarshaller.java b/core/src/main/java/com/threerings/presents/peer/data/PeerMarshaller.java index f15267af5..f39a244dd 100644 --- a/core/src/main/java/com/threerings/presents/peer/data/PeerMarshaller.java +++ b/core/src/main/java/com/threerings/presents/peer/data/PeerMarshaller.java @@ -5,7 +5,7 @@ package com.threerings.presents.peer.data; -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/presents/peer/server/PeerProvider.java b/core/src/main/java/com/threerings/presents/peer/server/PeerProvider.java index 60b7074ab..5bd682332 100644 --- a/core/src/main/java/com/threerings/presents/peer/server/PeerProvider.java +++ b/core/src/main/java/com/threerings/presents/peer/server/PeerProvider.java @@ -5,7 +5,7 @@ package com.threerings.presents.peer.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/presents/server/RegistrationProvider.java b/core/src/main/java/com/threerings/presents/server/RegistrationProvider.java index f89ebb34a..e5d65d45d 100644 --- a/core/src/main/java/com/threerings/presents/server/RegistrationProvider.java +++ b/core/src/main/java/com/threerings/presents/server/RegistrationProvider.java @@ -5,7 +5,7 @@ package com.threerings.presents.server; -import javax.annotation.Generated; +import javax.annotation.processing.Generated; import com.threerings.presents.client.InvocationReceiver; import com.threerings.presents.client.RegistrationService; diff --git a/core/src/test/java/com/threerings/presents/data/TestMarshaller.java b/core/src/test/java/com/threerings/presents/data/TestMarshaller.java index 85018d7f0..1d250e4da 100644 --- a/core/src/test/java/com/threerings/presents/data/TestMarshaller.java +++ b/core/src/test/java/com/threerings/presents/data/TestMarshaller.java @@ -7,7 +7,7 @@ package com.threerings.presents.data; import java.util.List; -import javax.annotation.Generated; +import javax.annotation.processing.Generated; import com.threerings.presents.client.InvocationService; import com.threerings.presents.client.TestService; diff --git a/core/src/test/java/com/threerings/presents/data/TestObject.java b/core/src/test/java/com/threerings/presents/data/TestObject.java index a312d74cf..cebded2c0 100644 --- a/core/src/test/java/com/threerings/presents/data/TestObject.java +++ b/core/src/test/java/com/threerings/presents/data/TestObject.java @@ -6,7 +6,7 @@ package com.threerings.presents.data; import java.util.ArrayList; -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/test/java/com/threerings/presents/server/TestProvider.java b/core/src/test/java/com/threerings/presents/server/TestProvider.java index e1079b8db..62be15d7d 100644 --- a/core/src/test/java/com/threerings/presents/server/TestProvider.java +++ b/core/src/test/java/com/threerings/presents/server/TestProvider.java @@ -7,7 +7,7 @@ package com.threerings.presents.server; import java.util.List; -import javax.annotation.Generated; +import javax.annotation.processing.Generated; import com.threerings.presents.client.InvocationService; import com.threerings.presents.client.TestService; diff --git a/tools/src/main/java/com/threerings/presents/tools/GenServiceTask.java b/tools/src/main/java/com/threerings/presents/tools/GenServiceTask.java index 664e557ef..7943ce611 100644 --- a/tools/src/main/java/com/threerings/presents/tools/GenServiceTask.java +++ b/tools/src/main/java/com/threerings/presents/tools/GenServiceTask.java @@ -231,7 +231,7 @@ public class GenServiceTask extends InvocationTask // import things marshaller will always need imports.add(sdesc.service); imports.add(InvocationMarshaller.class); - imports.add("javax.annotation.Generated"); + imports.add("javax.annotation.processing.Generated"); // We only add a type parameter for the caller ClientObject type if the service has one if (sdesc.callerTypeSpecified) { @@ -512,7 +512,7 @@ public class GenServiceTask extends InvocationTask // import superclass and service imports.add(InvocationProvider.class); imports.add(sdesc.service); - imports.add("javax.annotation.Generated"); + imports.add("javax.annotation.processing.Generated"); // any method that takes a listener may throw this if (sdesc.hasAnyListenerArgs()) { diff --git a/tools/src/main/java/com/threerings/presents/tools/SourceFile.java b/tools/src/main/java/com/threerings/presents/tools/SourceFile.java index 4a4ccdd61..94debf018 100644 --- a/tools/src/main/java/com/threerings/presents/tools/SourceFile.java +++ b/tools/src/main/java/com/threerings/presents/tools/SourceFile.java @@ -203,7 +203,7 @@ public class SourceFile */ protected void addOrRemoveGeneratedImport (boolean add) { - final String IMPORT = "import javax.annotation.Generated;"; + final String IMPORT = "import javax.annotation.processing.Generated;"; int packageLine = -1; int importLine = -1; diff --git a/tools/src/main/resources/com/threerings/presents/tools/dispatcher.tmpl b/tools/src/main/resources/com/threerings/presents/tools/dispatcher.tmpl index b96d3c419..e06bd984b 100644 --- a/tools/src/main/resources/com/threerings/presents/tools/dispatcher.tmpl +++ b/tools/src/main/resources/com/threerings/presents/tools/dispatcher.tmpl @@ -1,6 +1,6 @@ package {{package}}; -import javax.annotation.Generated; +import javax.annotation.processing.Generated; {{#imports}} import {{this}};