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

@@ -23,11 +23,6 @@
       <artifactId>guice</artifactId>
       <version>5.1.0</version>
     </dependency>
-    <dependency>
-      <groupId>javax.annotation</groupId>
-      <artifactId>jsr250-api</artifactId>
-      <version>1.0</version>
-    </dependency>
 
     <!-- optional dependencies -->
     <dependency>

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;

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;

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;
 
 /**

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;

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;

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;

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;
 

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;

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;

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;

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;

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;

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;

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;

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;
 

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;
 

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;
 

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;

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;

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;

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;

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;
 

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;
 
 /**

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;
 

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;

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;

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;

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;

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;

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;

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()) {

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;

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}};