Merge pull request #41 from basis-technology-corp/COMN-310

COMN-310: Remove OSGi support

Author: juliencherry

RELEASE-NOTES.md

@@ -1,6 +1,10 @@
 # Cumulative Release Notes for rosette-common-java-api
 
-## 37.6.0
+## 38.0.0
+
+OSGi support has been removed.
+
+## 37.5.5
 
 Add ISO 639-2B support to all language codes
 

api-jackson/pom.xml

@@ -18,13 +18,12 @@
     <modelVersion>4.0.0</modelVersion>
     <artifactId>common-api-jackson</artifactId>
     <name>common-api-jackson</name>
-    <version>37.5.6-SNAPSHOT</version>
+    <version>38.0.0-SNAPSHOT</version>
     <parent>
         <groupId>com.basistech</groupId>
         <artifactId>rosette-common-api</artifactId>
-        <version>37.5.6-SNAPSHOT</version>
+        <version>38.0.0-SNAPSHOT</version>
     </parent>
-    <packaging>bundle</packaging>
     <description>Jackson support for Java API classes for Rosette</description>
     <dependencies>
         <dependency>
@@ -60,18 +59,6 @@
             </testResource>
         </testResources>
         <plugins>
-            <plugin>
-                <groupId>org.apache.felix</groupId>
-                <artifactId>maven-bundle-plugin</artifactId>
-                <extensions>true</extensions>
-                <configuration>
-                    <instructions>
-                        <Export-Package>com.basistech.util.jackson</Export-Package>
-                        <Bundle-Version>${osgi-version}</Bundle-Version>
-                        <Include-Resource>{META-INF/maven/dependencies.properties=${project.build.directory}/classes/META-INF/maven/dependencies.properties},{maven-resources}</Include-Resource>
-                    </instructions>
-                </configuration>
-            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-failsafe-plugin</artifactId>

api/pom.xml

@@ -18,13 +18,12 @@
     <modelVersion>4.0.0</modelVersion>
     <artifactId>common-api</artifactId>
     <name>common-api</name>
-    <version>37.5.6-SNAPSHOT</version>
+    <version>38.0.0-SNAPSHOT</version>
     <parent>
         <groupId>com.basistech</groupId>
         <artifactId>rosette-common-api</artifactId>
-        <version>37.5.6-SNAPSHOT</version>
+        <version>38.0.0-SNAPSHOT</version>
     </parent>
-    <packaging>bundle</packaging>
     <description>Common Java API classes for Rosette</description>
     <properties>
         <spring.version>5.3.27</spring.version>
@@ -58,12 +57,6 @@
             <version>${spring.version}</version>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>com.basistech</groupId>
-            <artifactId>pax-exam-test-composite</artifactId>
-            <version>0.0.5</version>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
@@ -122,18 +115,6 @@
                     </execution>
                 </executions>
             </plugin>
-            <plugin>
-                <groupId>org.apache.felix</groupId>
-                <artifactId>maven-bundle-plugin</artifactId>
-                <extensions>true</extensions>
-                <configuration>
-                    <instructions>
-                        <Export-Package>com.basistech.rosette.*,com.basistech.util.*</Export-Package>
-                        <Bundle-Version>${osgi-version}</Bundle-Version>
-                        <Include-Resource>{META-INF/maven/dependencies.properties=${project.build.directory}/classes/META-INF/maven/dependencies.properties},{maven-resources}</Include-Resource>
-                    </instructions>
-                </configuration>
-            </plugin>
             <plugin>
                 <artifactId>maven-assembly-plugin</artifactId>
                 <inherited>false</inherited>

api/src/main/java/com/basistech/rosette/RosetteSystemBundlePackage.java

@@ -1,5 +1,5 @@
 /*
-* Copyright 2014 Basis Technology Corp.
+* Copyright 2015-2024 Basis Technology Corp.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -22,8 +22,7 @@
 import java.lang.annotation.Target;
 
 /**
- * Mark a package for inclusion in the system bundle
- * when Rosette is deployed in an embedded OSGi container..
+ * Mark a package that contains classes relevant to Rosette Server.
  */
 @Retention(RetentionPolicy.RUNTIME)
 @Target({ ElementType.PACKAGE })

api/src/test/java/com/basistech/util/OsgiIT.java

@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!--
-  Copyright 2010-2022 Basis Technology Corp.
+  Copyright 2010-2024 Basis Technology Corp.
  
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -18,7 +18,7 @@
     <modelVersion>4.0.0</modelVersion>
     <artifactId>rosette-common-api</artifactId>
     <name>rosette-common-api</name>
-    <version>37.5.6-SNAPSHOT</version>
+    <version>38.0.0-SNAPSHOT</version>
     <parent>
         <artifactId>open-source-parent</artifactId>
         <groupId>com.basistech</groupId>
@@ -37,9 +37,6 @@
         <developerConnection>scm:git:[email protected]:basis-technology-corp/rosette-common-java-api.git</developerConnection>
         <tag>rosette-common-api-37.5.3</tag>
     </scm>
-    <properties>
-        <skip-dependency-convergence>true</skip-dependency-convergence>
-    </properties>
     <distributionManagement>
         <site>
             <id>site</id>
@@ -56,34 +53,6 @@
             <plugin>
                 <artifactId>maven-source-plugin</artifactId>
             </plugin>
-            <plugin>
-                <groupId>com.basistech</groupId>
-                <artifactId>bbh-maven-plugin</artifactId>
-                <version>1.0.1</version>
-                <executions>
-                    <execution>
-                        <id>osgi-version</id>
-                        <phase>validate</phase>
-                        <goals>
-                            <goal>osgi-version</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.servicemix.tooling</groupId>
-                <artifactId>depends-maven-plugin</artifactId>
-                <version>1.2</version>
-                <executions>
-                    <execution>
-                        <id>generate-depends-file</id>
-                        <phase>generate-resources</phase>
-                        <goals>
-                            <goal>generate-depends-file</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
         </plugins>
     </build>
 </project>