cleaning up

Makefile.am

@@ -403,15 +403,6 @@ java_EXTRA_DIST=
   java/core/src/main/java/com/google/protobuf/Utf8.java                            \
   java/core/src/main/java/com/google/protobuf/WireFormat.java                      \
   java/core/src/main/java/com/google/protobuf/Writer.java                          \
-  java/core/src/main/kotlin/com/google/protobuf/DslList.kt                         \
-  java/core/src/main/kotlin/com/google/protobuf/DslMap.kt                          \
-  java/core/src/main/kotlin/com/google/protobuf/DslProxy.kt                        \
-  java/core/src/main/kotlin/com/google/protobuf/ExtendableMessageExtensions.kt     \
-  java/core/src/main/kotlin/com/google/protobuf/ExtendableMessageLiteExtensions.kt \
-  java/core/src/main/kotlin/com/google/protobuf/ExtensionList.kt                   \
-  java/core/src/main/kotlin/com/google/protobuf/OnlyForUseByGeneratedProtoCode.kt  \
-  java/core/src/main/kotlin/com/google/protobuf/ProtoDslMarker.kt                  \
-  java/core/src/main/kotlin/com/google/protobuf/UnmodifiableCollections.kt         \
   java/core/src/test/java/com/google/protobuf/AbstractMessageTest.java             \
   java/core/src/test/java/com/google/protobuf/AbstractProto2LiteSchemaTest.java    \
   java/core/src/test/java/com/google/protobuf/AbstractProto2SchemaTest.java        \
@@ -507,18 +498,9 @@ java_EXTRA_DIST=
   java/core/src/test/java/com/google/protobuf/WireFormatTest.java                  \
   java/core/src/test/java/com/google/protobuf/WrappersLiteOfMethodTest.java        \
   java/core/src/test/java/com/google/protobuf/WrappersOfMethodTest.java            \
-  java/core/src/test/kotlin/com/google/protobuf/DslListTest.kt                     \
-  java/core/src/test/kotlin/com/google/protobuf/DslMapTest.kt                      \
-  java/core/src/test/kotlin/com/google/protobuf/ExtendableMessageExtensionsTest.kt \
-  java/core/src/test/kotlin/com/google/protobuf/ExtensionListTest.kt               \
-  java/core/src/test/kotlin/com/google/protobuf/Proto2Test.kt                      \
-  java/core/src/test/kotlin/com/google/protobuf/Proto3Test.kt                      \
   java/core/src/test/proto/com/google/protobuf/any_test.proto                      \
   java/core/src/test/proto/com/google/protobuf/cached_field_size_test.proto        \
   java/core/src/test/proto/com/google/protobuf/deprecated_file.proto               \
-  java/core/src/test/proto/com/google/protobuf/evil_names_proto2.proto             \
-  java/core/src/test/proto/com/google/protobuf/evil_names_proto3.proto             \
-  java/core/src/test/proto/com/google/protobuf/example_extensible_message.proto    \
   java/core/src/test/proto/com/google/protobuf/field_presence_test.proto           \
   java/core/src/test/proto/com/google/protobuf/lazy_fields_lite.proto              \
   java/core/src/test/proto/com/google/protobuf/lite_equals_and_hash.proto          \
@@ -528,7 +510,6 @@ java_EXTRA_DIST=
   java/core/src/test/proto/com/google/protobuf/map_lite_test.proto                 \
   java/core/src/test/proto/com/google/protobuf/map_test.proto                      \
   java/core/src/test/proto/com/google/protobuf/message_lite_extension_util_test.proto\
-  java/core/src/test/proto/com/google/protobuf/multiple_files_proto3.proto         \
   java/core/src/test/proto/com/google/protobuf/multiple_files_test.proto           \
   java/core/src/test/proto/com/google/protobuf/nested_builders_test.proto          \
   java/core/src/test/proto/com/google/protobuf/nested_extension.proto              \
@@ -549,6 +530,27 @@ java_EXTRA_DIST=
   java/core/src/test/proto/com/google/protobuf/test_check_utf8_size.proto          \
   java/core/src/test/proto/com/google/protobuf/test_custom_options.proto           \
   java/core/src/test/proto/com/google/protobuf/wrappers_test.proto                 \
+  java/kotlin/src/main/kotlin/com/google/protobuf/DslList.kt                       \
+  java/kotlin/src/main/kotlin/com/google/protobuf/DslMap.kt                        \
+  java/kotlin/src/main/kotlin/com/google/protobuf/DslProxy.kt                      \
+  java/kotlin/src/main/kotlin/com/google/protobuf/ExtendableMessageExtensions.kt   \
+  java/kotlin/src/main/kotlin/com/google/protobuf/ExtendableMessageLiteExtensions.kt\
+  java/kotlin/src/main/kotlin/com/google/protobuf/ExtensionList.kt                 \
+  java/kotlin/src/main/kotlin/com/google/protobuf/OnlyForUseByGeneratedProtoCode.kt\
+  java/kotlin/src/main/kotlin/com/google/protobuf/ProtoDslMarker.kt                \
+  java/kotlin/src/main/kotlin/com/google/protobuf/UnmodifiableCollections.kt       \
+  java/kotlin/src/test/kotlin/com/google/protobuf/DslListTest.kt                   \
+  java/kotlin/src/test/kotlin/com/google/protobuf/DslMapTest.kt                    \
+  java/kotlin/src/test/kotlin/com/google/protobuf/ExtendableMessageExtensionsTest.kt\
+  java/kotlin/src/test/kotlin/com/google/protobuf/ExtensionListTest.kt             \
+  java/kotlin/src/test/kotlin/com/google/protobuf/Proto2Test.kt                    \
+  java/kotlin/src/test/kotlin/com/google/protobuf/Proto3Test.kt                    \
+  java/kotlin/src/test/proto/com/google/protobuf/evil_names_proto2.proto           \
+  java/kotlin/src/test/proto/com/google/protobuf/evil_names_proto3.proto           \
+  java/kotlin/src/test/proto/com/google/protobuf/example_extensible_message.proto  \
+  java/kotlin/src/test/proto/com/google/protobuf/multiple_files_proto3.proto       \
+  java/kotlin-lite/src/test/kotlin/com/google/protobuf/ExtendableMessageLiteExtensionsTest.kt\
+  java/kotlin-lite/src/test/kotlin/com/google/protobuf/Proto2LiteTest.kt           \
   java/lite.md                                                                     \
   java/lite/BUILD                                                                  \
   java/lite/generate-sources-build.xml                                             \
@@ -558,8 +560,6 @@ java_EXTRA_DIST=
   java/lite/process-lite-sources-build.xml                                         \
   java/lite/src/test/java/com/google/protobuf/LiteTest.java                        \
   java/lite/src/test/java/com/google/protobuf/Proto2MessageLiteInfoFactory.java    \
-  java/lite/src/test/kotlin/com/google/protobuf/ExtendableMessageLiteExtensionsTest.kt \
-  java/lite/src/test/kotlin/com/google/protobuf/Proto2LiteTest.kt                  \
   java/pom.xml                                                                     \
   java/util/BUILD                                                                  \
   java/util/pom.xml                                                                \

java/core/pom.xml

@@ -37,11 +37,6 @@
       <artifactId>guava</artifactId>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>com.google.guava</groupId>
-      <artifactId>guava-testlib</artifactId>
-      <scope>test</scope>
-    </dependency>
     <dependency>
       <groupId>com.google.truth</groupId>
       <artifactId>truth</artifactId>

java/kotlin-lite/target/antrun/build-main.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<project name="maven-antrun-" default="main"  >
-<target name="main">
-  <ant antfile="process-lite-sources-build.xml"/>
-</target>
-</project>

java/kotlin-lite/target/classes/META-INF/MANIFEST.MF

@@ -1,21 +0,0 @@
-Manifest-Version: 1.0
-Automatic-Module-Name: com.google.protobuf
-Bnd-LastModified: 1617123864936
-Build-Jdk: 11.0.10
-Built-By: deannagarcia
-Bundle-Description: Lite version of Protocol Buffers library. This versi
- on is optimized for code size, but does    not guarantee API/ABI stabil
- ity.
-Bundle-DocURL: https://developers.google.com/protocol-buffers/
-Bundle-License: https://opensource.org/licenses/BSD-3-Clause
-Bundle-ManifestVersion: 2
-Bundle-Name: Protocol Buffers [Lite]
-Bundle-SymbolicName: com.google.protobuf
-Bundle-Version: 3.15.6
-Created-By: Apache Maven Bundle Plugin
-Export-Package: com.google.protobuf;version="3.15.6"
-Import-Package: sun.misc;resolution:=optional,com.google.protobuf;versio
- n="[3.15,4)",kotlin,kotlin.annotation,kotlin.jvm.internal,kotlin.jvm.in
- ternal.markers
-Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version=1.7))"
-Tool: Bnd-3.0.0.201509101326