diff --git a/apache_xmlrpc_common/build.gradle b/apache_xmlrpc_common/build.gradle
index 04f5d9872..595d9a094 100644
--- a/apache_xmlrpc_common/build.gradle
+++ b/apache_xmlrpc_common/build.gradle
@@ -17,6 +17,9 @@
dependencies {
compile 'org.apache.commons:com.springsource.org.apache.commons.httpclient:3.1.0'
compile 'org.apache.ws.commons:ws-commons-util:1.0.1'
- compile 'javax.xml.bind:jaxb-api:2.3.1'
-}
+ implementation('com.sun.xml.bind:jaxb-ri:3.0.2') {
+ exclude group: 'com.sun.xml.bind', module: 'jaxb-release-documentation'
+ exclude group: 'com.sun.xml.bind', module: 'jaxb-samples'
+ }
+}
diff --git a/apache_xmlrpc_common/src/main/java/org/apache/xmlrpc/jaxb/JaxbParser.java b/apache_xmlrpc_common/src/main/java/org/apache/xmlrpc/jaxb/JaxbParser.java
index 70c53a114..4d8ac9561 100644
--- a/apache_xmlrpc_common/src/main/java/org/apache/xmlrpc/jaxb/JaxbParser.java
+++ b/apache_xmlrpc_common/src/main/java/org/apache/xmlrpc/jaxb/JaxbParser.java
@@ -14,13 +14,13 @@
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
- * under the License.
+ * under the License.
*/
package org.apache.xmlrpc.jaxb;
-import javax.xml.bind.JAXBContext;
-import javax.xml.bind.JAXBException;
-import javax.xml.bind.UnmarshallerHandler;
+import jakarta.xml.bind.JAXBException;
+import jakarta.xml.bind.JAXBContext;
+import jakarta.xml.bind.UnmarshallerHandler;
import org.apache.xmlrpc.XmlRpcException;
import org.apache.xmlrpc.parser.ExtParser;
diff --git a/apache_xmlrpc_common/src/main/java/org/apache/xmlrpc/jaxb/JaxbSerializer.java b/apache_xmlrpc_common/src/main/java/org/apache/xmlrpc/jaxb/JaxbSerializer.java
index b07066327..39ce44fc2 100644
--- a/apache_xmlrpc_common/src/main/java/org/apache/xmlrpc/jaxb/JaxbSerializer.java
+++ b/apache_xmlrpc_common/src/main/java/org/apache/xmlrpc/jaxb/JaxbSerializer.java
@@ -14,12 +14,12 @@
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
- * under the License.
+ * under the License.
*/
package org.apache.xmlrpc.jaxb;
-import javax.xml.bind.JAXBContext;
-import javax.xml.bind.JAXBException;
+import jakarta.xml.bind.JAXBException;
+import jakarta.xml.bind.JAXBContext;
import org.apache.xmlrpc.serializer.ExtSerializer;
import org.xml.sax.Attributes;
diff --git a/apache_xmlrpc_common/src/main/java/org/apache/xmlrpc/jaxb/JaxbTypeFactory.java b/apache_xmlrpc_common/src/main/java/org/apache/xmlrpc/jaxb/JaxbTypeFactory.java
index adef7726c..27739b4e2 100644
--- a/apache_xmlrpc_common/src/main/java/org/apache/xmlrpc/jaxb/JaxbTypeFactory.java
+++ b/apache_xmlrpc_common/src/main/java/org/apache/xmlrpc/jaxb/JaxbTypeFactory.java
@@ -14,12 +14,12 @@
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
- * under the License.
+ * under the License.
*/
package org.apache.xmlrpc.jaxb;
-import javax.xml.bind.Element;
-import javax.xml.bind.JAXBContext;
+import jakarta.xml.bind.Element;
+import jakarta.xml.bind.JAXBContext;
import org.apache.ws.commons.util.NamespaceContextImpl;
import org.apache.xmlrpc.common.TypeFactoryImpl;
@@ -35,7 +35,7 @@
*/
public class JaxbTypeFactory extends TypeFactoryImpl {
private final JAXBContext context;
- private final JaxbSerializer serializer;
+ private final JaxbSerializer serializer;
/** Creates a new instance with the given controller and
* JAXB context.
diff --git a/apache_xmlrpc_server/build.gradle b/apache_xmlrpc_server/build.gradle
index 87ee83d38..8692c20a1 100644
--- a/apache_xmlrpc_server/build.gradle
+++ b/apache_xmlrpc_server/build.gradle
@@ -17,5 +17,8 @@
dependencies {
compile project(':apache_xmlrpc_common')
compile 'org.apache.commons:com.springsource.org.apache.commons.logging:1.1.1'
+ implementation('com.sun.xml.bind:jaxb-ri:3.0.2') {
+ exclude group: 'com.sun.xml.bind', module: 'jaxb-release-documentation'
+ exclude group: 'com.sun.xml.bind', module: 'jaxb-samples'
+ }
}
-
diff --git a/apache_xmlrpc_server/src/main/java/org/apache/xmlrpc/metadata/Util.java b/apache_xmlrpc_server/src/main/java/org/apache/xmlrpc/metadata/Util.java
index ef29d4026..1bbbc1814 100644
--- a/apache_xmlrpc_server/src/main/java/org/apache/xmlrpc/metadata/Util.java
+++ b/apache_xmlrpc_server/src/main/java/org/apache/xmlrpc/metadata/Util.java
@@ -14,7 +14,7 @@
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
- * under the License.
+ * under the License.
*/
package org.apache.xmlrpc.metadata;
@@ -42,13 +42,13 @@ public class Util {
static {
Class c;
try {
- c = Class.forName("javax.xml.bind.Element");
+ c = Class.forName("jakarta.xml.bind.Element");
} catch (ClassNotFoundException e) {
c = null;
}
jaxbElementClass = c;
}
-
+
/** Returns a signature for the given return type or
* parameter class.
* @param pType The class for which a signature is being
@@ -122,7 +122,7 @@ public static String[][] getSignature(Method[] pMethods) {
* @return Signature string, or null, if no signature
* is available.
*/
- public static String[] getSignature(Method pMethod) {
+ public static String[] getSignature(Method pMethod) {
Class[] paramClasses = pMethod.getParameterTypes();
String[] sig = new String[paramClasses.length + 1];
String s = getSignatureType(pMethod.getReturnType());
diff --git a/docs/src/main/sphinx/installing.rst b/docs/src/main/sphinx/installing.rst
index 336473930..da62d322e 100644
--- a/docs/src/main/sphinx/installing.rst
+++ b/docs/src/main/sphinx/installing.rst
@@ -37,7 +37,7 @@ ROS Installation
If you would like a full ros environment backending your installation (you might
be generating code for your own custom messages, sequencing builds of multiple rosjava
-repositories or using mixed packages, e.g. java + python) then refer to the `RosWiki`_
+repositories or using mixed packages, e.g. java + python3) then refer to the `RosWiki`_
for more details.
.. _RosWiki: http://wiki.ros.org/rosjava
diff --git a/docs/src/main/sphinx/javadoc.py b/docs/src/main/sphinx/javadoc.py
index 9935b4ee2..027322f9b 100644
--- a/docs/src/main/sphinx/javadoc.py
+++ b/docs/src/main/sphinx/javadoc.py
@@ -34,4 +34,3 @@ def make_javadoc_link(name, rawtext, text, lineno, inliner, options={}, content=
def setup(app):
app.add_config_value('javadoc_root', None, 'env')
app.add_role('javadoc', make_javadoc_link)
-
diff --git a/package.xml b/package.xml
index b6ca61d38..80e75b983 100644
--- a/package.xml
+++ b/package.xml
@@ -19,10 +19,9 @@
sensor_msgs
tf2_msgs
-
rosjava_messages
-
diff --git a/rosjava/test/composite_publisher.py b/rosjava/test/composite_publisher.py
index 54626ca13..daa384fb4 100755
--- a/rosjava/test/composite_publisher.py
+++ b/rosjava/test/composite_publisher.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
from ros import rospy
from ros import rosjava_test_msgs
import rosjava_test_msgs.msg
diff --git a/rosjava/test/int64_publisher.py b/rosjava/test/int64_publisher.py
index 0de89d81a..f69e65bd0 100755
--- a/rosjava/test/int64_publisher.py
+++ b/rosjava/test/int64_publisher.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
from ros import rospy
from ros import std_msgs
import std_msgs.msg
diff --git a/rosjava/test/string_publisher.py b/rosjava/test/string_publisher.py
index 61203fe26..cb6985e85 100755
--- a/rosjava/test/string_publisher.py
+++ b/rosjava/test/string_publisher.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
from ros import rospy
from ros import std_msgs
import std_msgs.msg
diff --git a/rosjava/test/test_composite_passthrough.py b/rosjava/test/test_composite_passthrough.py
index b8a1da1ef..ceb2f11e4 100755
--- a/rosjava/test/test_composite_passthrough.py
+++ b/rosjava/test/test_composite_passthrough.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
# Software License Agreement (BSD License)
#
# Copyright (c) 2011, Willow Garage, Inc.
diff --git a/rosjava/test/test_int64_passthrough.py b/rosjava/test/test_int64_passthrough.py
index 164a91295..00361395a 100755
--- a/rosjava/test/test_int64_passthrough.py
+++ b/rosjava/test/test_int64_passthrough.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
# Software License Agreement (BSD License)
#
# Copyright (c) 2011, Willow Garage, Inc.
diff --git a/rosjava/test/test_parameter_client.py b/rosjava/test/test_parameter_client.py
index fddd97834..e952ff340 100755
--- a/rosjava/test/test_parameter_client.py
+++ b/rosjava/test/test_parameter_client.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
# Software License Agreement (BSD License)
#
# Copyright (c) 2011, Willow Garage, Inc.
diff --git a/rosjava/test/test_string_passthrough.py b/rosjava/test/test_string_passthrough.py
index 31dee4042..82e32e7b8 100755
--- a/rosjava/test/test_string_passthrough.py
+++ b/rosjava/test/test_string_passthrough.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
# Software License Agreement (BSD License)
#
# Copyright (c) 2011, Willow Garage, Inc.
diff --git a/rosjava/test/test_testheader_passthrough.py b/rosjava/test/test_testheader_passthrough.py
index 8c6165ab7..3a235cfef 100755
--- a/rosjava/test/test_testheader_passthrough.py
+++ b/rosjava/test/test_testheader_passthrough.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
# Software License Agreement (BSD License)
#
# Copyright (c) 2011, Willow Garage, Inc.
diff --git a/rosjava/test/testheader_publisher.py b/rosjava/test/testheader_publisher.py
index 276334af8..25d59b0e1 100755
--- a/rosjava/test/testheader_publisher.py
+++ b/rosjava/test/testheader_publisher.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
from ros import rospy
from ros import rosjava_test_msgs
import rosjava_test_msgs.msg
diff --git a/rosjava_benchmarks/scripts/pubsub_benchmark.py b/rosjava_benchmarks/scripts/pubsub_benchmark.py
index 5417500c9..ca7521037 100755
--- a/rosjava_benchmarks/scripts/pubsub_benchmark.py
+++ b/rosjava_benchmarks/scripts/pubsub_benchmark.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/python3
#
# Copyright (C) 2012 Google Inc.
#
diff --git a/rosjava_test/scripts/serialized_message.py b/rosjava_test/scripts/serialized_message.py
index 9e874cc37..2892775fa 100644
--- a/rosjava_test/scripts/serialized_message.py
+++ b/rosjava_test/scripts/serialized_message.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/python3
#
# Copyright (C) 2012 Google Inc.
#
@@ -34,4 +34,3 @@
buf = io.StringIO()
message.serialize(buf)
print(''.join('0x%02x,' % ord(c) for c in buf.getvalue())[:-1])
-