diff options
author | Baily Roberts | 2024-03-17 02:16:49 +0000 |
---|---|---|
committer | Baily Roberts | 2024-03-18 21:17:32 +0000 |
commit | 497047a16675195a441c3e07402290620ecc1ecd (patch) | |
tree | 7a108cc674ff47c9dfbcda409a3c8ef04a7305ef | |
parent | eb0926c721dbde3164176a981c3ed550b54598d9 (diff) | |
download | org.eclipse.osee-dev.tar.gz org.eclipse.osee-dev.tar.xz org.eclipse.osee-dev.zip |
refactor[TW25438]: Cleanup Build filesdev
Signed-off-by: Baily Roberts <Baily.Roberts@boeing.com>
70 files changed, 624 insertions, 438 deletions
diff --git a/plugins/.bazelrc b/plugins/.bazelrc index dfdaa60f3b9..f2f8d7cbcf7 100644 --- a/plugins/.bazelrc +++ b/plugins/.bazelrc @@ -1,5 +1,5 @@ build --java_language_version=11 -build --define=built_by_bazel=yes +build --test_env=built_by_bazel=yes build --javacopt="-XepDisableAllChecks" build --test_output=all build --java_runtime_version=remotejdk_11 diff --git a/plugins/BUILD b/plugins/BUILD index 81a02a5774f..f45e5e496d3 100644 --- a/plugins/BUILD +++ b/plugins/BUILD @@ -1,5 +1,46 @@ package(default_visibility = ["//visibility:public"]) +test_suite( + name = "server_tests", + tests = ["//org.eclipse.osee.framework.jdk.core.test:JdkCoreTestSuite", + "//org.eclipse.osee.account.admin.test:AccountAdmin_JUnit_TestSuite", + "//org.eclipse.osee.account.rest.test:AccountRestTestSuite", + "//org.eclipse.osee.ats.core.test:AllAtsCoreTestSuite", + "//org.eclipse.osee.ats.rest.test:AtsServer_JUnit_TestSuite", + "//org.eclipse.osee.authentication.admin.test:AuthAdminTestSuite", + "//org.eclipse.osee.authentication.ldap.test:LdapAuthenticationTestSuite", + "//org.eclipse.osee.authorization.admin.test:AuthAdminTestSuite", + "//org.eclipse.osee.cache.admin.test:CacheAdminTestSuite", + "//org.eclipse.osee.config.admin.test:ConfigAdminTestSuite", + "//org.eclipse.osee.console.admin.test:AllConsoleAdminTestSuite", + "//org.eclipse.osee.define.rest.test:OseeDefineTestSuite", + "//org.eclipse.osee.disposition.rest.test:Disposition_JUnit_TestSuite", + "//org.eclipse.osee.framework.core.model.test:AllCoreModelTestSuite", + "//org.eclipse.osee.framework.core.server.test:CoreServerTestSuite", + "//org.eclipse.osee.framework.help.ui.test:HelpUiTestSuite", + "//org.eclipse.osee.framework.core.test:FrameworkCoreTestSuite", + "//org.eclipse.osee.framework.logging.test:AllLoggingTestSuite", + "//org.eclipse.osee.framework.messaging.event.res.test:AllEventResTestSuite", + "//org.eclipse.osee.framework.messaging.test:AllMessagingIntegrationTestSuite", + "//org.eclipse.osee.framework.resource.management.test:ResourceManagementTestSuite", + "//org.eclipse.osee.jaxrs.server.test:JaxRsServerTestSuite", + "//org.eclipse.osee.jdbc.test:AllJdbcTestSuite", + "//org.eclipse.osee.orcs.core.test:OrcsCoreTestSuite", + "//org.eclipse.osee.orcs.db.test:OrcsDb_JUnit_TestSuite", + "//org.eclipse.osee.orcs.rest.test:OrcsRest_JUnit_TestSuite", + "//org.eclipse.osee.template.engine.test:OseeTemplateEngineTestSuite", + ], + + +) + +test_suite( + name = "client_tests", + tests = ["//org.eclipse.osee.ats.ide.help.ui.test:AtsHelpUiTestSuite", + "//org.eclipse.osee.framework.skynet.core.test:AllSkynetCoreJunitTestSuite", + "//org.eclipse.osee.define.ide.test:AllDefineJunitTestSuite", + "//org.eclipse.osee.framework.ui.skynet.test:AllUiSkynetJunitTestSuite"] +) alias( name = "accessor", @@ -138,6 +179,11 @@ alias( ) alias( + name = "framework_jdk_core_test", + actual = "//org.eclipse.osee.framework.jdk.core.test" +) + +alias( name = "framework_messaging", actual = "//org.eclipse.osee.framework.messaging" ) diff --git a/plugins/WORKSPACE b/plugins/WORKSPACE index a49f04ccad5..c07856be068 100644 --- a/plugins/WORKSPACE +++ b/plugins/WORKSPACE @@ -3,80 +3,6 @@ load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_file") load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_jar") -http_jar( - name = "eclipse_core_net", - url = "https://www.eclipse.org/downloads/download.php?file=/releases/2020-06/202006171000/plugins/org.eclipse.core.net_1.3.900.v20200428-1255.jar&r=1", - downloaded_file_name = "org.eclipse.core.net_1.3.900.v20200428-1255.jar" -) - -http_jar( - name = "equinox_security", - url = "https://www.eclipse.org/downloads/download.php?file=/releases/2020-06/202006171000/plugins/org.eclipse.equinox.security_1.3.500.v20200114-1637.jar&r=1", - downloaded_file_name = "org.eclipse.equinox.security_1.3.500.v20200114-1637.jar" -) - -http_jar( - name = "jcraft", - url = "https://www.eclipse.org/downloads/download.php?file=/releases/2020-06/202006171000/plugins/com.jcraft.jsch_0.1.55.v20190404-1902.jar&r=1", - downloaded_file_name = "com.jcraft.jsch_0.1.55.v20190404-1902.jar" -) - -http_jar( - name = "javax_annotation", - url = "https://www.eclipse.org/downloads/download.php?file=/releases/2020-06/202006171000/plugins/javax.annotation_1.3.5.v20200504-1837.jar&r=1", -) - -http_jar( - name = "javax_activation", - url = "https://www.eclipse.org/downloads/download.php?file=/releases/2020-06/202006171000/plugins/javax.activation_1.1.0.v201211130549.jar&r=1", -) - -http_jar( - name = "javax_transaction", - url = "https://www.eclipse.org/downloads/download.php?file=/releases/2020-06/202006171000/plugins/javax.transaction_1.1.1.v201105210645.jar&r=1" -) - -http_jar( - name = "javax_ws_rs", - url = "https://www.eclipse.org/downloads/download.php?file=/releases/2020-06/202006171000/plugins/javax.ws.rs_2.1.6.v20221203-1659.jar&r=1" -) - -http_jar( - name = "javax_xml", - url = "https://www.eclipse.org/downloads/download.php?file=/releases/2020-06/202006171000/plugins/javax.xml_1.4.1.v20220503-2331.jar&r=1" -) - -http_jar( - name = "javax_xml_bind", - url = "https://www.eclipse.org/downloads/download.php?file=/releases/2020-06/202006171000/plugins/javax.xml.bind_2.2.0.v201105210648.jar&r=1" -) - -http_jar( - name = "javax_xml_ws", - url = "https://www.eclipse.org/downloads/download.php?file=/releases/2020-06/202006171000/plugins/javax.xml.ws_2.1.0.v200902101523.jar&r=1" -) - -http_jar( - name = "javax_xml_soap", - url = "https://www.eclipse.org/downloads/download.php?file=/releases/2020-06/202006171000/plugins/javax.xml.soap_1.3.0.v201105210645.jar&r=1" -) - -http_jar( - name = "javax_servlet", - url = "https://www.eclipse.org/downloads/download.php?file=/releases/2020-06/202006171000/plugins/javax.servlet_3.1.0.v201410161800.jar&r=1" -) - -http_jar( - name = "javax_validation", - url = "https://www.eclipse.org/downloads/download.php?file=/releases/2020-06/202006171000/plugins/javax.validation_1.1.0.v20221112-0806.jar&r=1" -) - -http_jar( - name = "javax_mail", - url = "https://www.eclipse.org/downloads/download.php?file=/releases/2020-06/202006171000/plugins/javax.mail_1.4.0.v201005080615.jar&r=1" -) - - http_archive( name = "rules_pkg", @@ -101,7 +27,6 @@ http_archive( url = "https://github.com/bazelbuild/rules_jvm_external/archive/%s.zip" % RULES_JVM_EXTERNAL_TAG, ) - local_repository( name = "ext_jars", path = "ext.jars" @@ -155,7 +80,6 @@ maven_install( "org.osgi:org.osgi.framework:1.10.0", "org.eclipse.core:org.eclipse.core.resources:3.7.100", "javax.mail:mail:1.4.1", - #"javax.transaction:javax.transaction-api:1.2", "org.antlr:antlr-runtime:3.2", "com.google.guava:guava:30.1-jre", "org.apache.poi:poi:4.1.1", @@ -185,7 +109,6 @@ maven_install( "org.osgi:org.osgi.service.component:1.5.0", "org.osgi:org.osgi.service.event:1.4.1", "org.osgi:org.osgi.framework:1.10.0", - "org.eclipse.core:runtime:3.10.0-v20140318-2214", "io.swagger.core.v3:swagger-core:2.2.7", "io.swagger.core.v3:swagger-jaxrs2:2.2.7", "io.swagger.core.v3:swagger-models:2.2.7", @@ -194,18 +117,331 @@ maven_install( "org.eclipse.jgit:org.eclipse.jgit:5.8.0.202006091008-r", "org.jsoup:jsoup:1.8.3", "com.jcraft:jsch:0.1.55", + "org.apache.commons:commons-math3:3.6.1", "org.apache.geronimo.specs:geronimo-jms_1.1_spec:1.1", "org.apache.activemq:activemq-all:5.14.0", "org.glassfish.jaxb:jaxb-runtime:3.0.1", "org.apache.commons:commons-lang3:3.12.0", - "net.oauth.core:oauth:20090531" + "org.apache.commons:commons-collections4:4.4", + "net.oauth.core:oauth:20090531", + "org.apache.ws.xmlschema:xmlschema-core:2.2.5", ], repositories = [ # Private repositories are supported through HTTP Basic auth "https://repo1.maven.org/maven2", - "https://download.eclipse.org/tools/orbit/downloads/drops/R20201130205003/", - "https://download.eclipse.org/releases/2020-06/202006171000/plugins" ] , ) + + +http_jar( + name = "eclipse_core_net", + url = "https://www.eclipse.org/downloads/download.php?file=/releases/2020-06/202006171000/plugins/org.eclipse.core.net_1.3.900.v20200428-1255.jar&r=1", + downloaded_file_name = "org.eclipse.core.net_1.3.900.v20200428-1255.jar" +) + +http_jar( + name = "equinox_security", + url = "https://www.eclipse.org/downloads/download.php?file=/releases/2020-06/202006171000/plugins/org.eclipse.equinox.security_1.3.500.v20200114-1637.jar&r=1", + downloaded_file_name = "org.eclipse.equinox.security_1.3.500.v20200114-1637.jar" +) + +http_jar( + name = "jcraft", + url = "https://www.eclipse.org/downloads/download.php?file=/releases/2020-06/202006171000/plugins/com.jcraft.jsch_0.1.55.v20190404-1902.jar&r=1", + downloaded_file_name = "com.jcraft.jsch_0.1.55.v20190404-1902.jar" +) + +http_jar( + name = "javax_annotation", + url = "https://www.eclipse.org/downloads/download.php?file=/releases/2020-06/202006171000/plugins/javax.annotation_1.3.5.v20200504-1837.jar&r=1", + downloaded_file_name = "javax.annotation_1.3.5.v20200504-1837.jar" +) + +http_jar( + name = "javax_activation", + url = "https://www.eclipse.org/downloads/download.php?file=/releases/2020-06/202006171000/plugins/javax.activation_1.1.0.v201211130549.jar&r=1", + downloaded_file_name = "javax.activation_1.1.0.v201211130549.jar" +) + +http_jar( + name = "javax_transaction", + url = "https://download.eclipse.org/tools/orbit/downloads/drops/R20181102183712/repository/plugins/javax.transaction_1.1.1.v201105210645.jar", + downloaded_file_name = "javax.transaction_1.1.1.v201105210645.jar" +) + +http_jar( + name = "javax_ws_rs", + url = "https://www.eclipse.org/downloads/download.php?file=/releases/2020-06/202006171000/plugins/javax.ws.rs_2.1.6.v20200505-2127.jar&r=1", + downloaded_file_name = "javax.ws.rs_2.1.6.v20200505-2127.jar" +) + +http_jar( + name = "javax_xml", + url = "https://www.eclipse.org/downloads/download.php?file=/tools/orbit/downloads/drops/R20230531010532/repository/plugins/javax.xml_1.4.1.v20220503-2331.jar", + downloaded_file_name = "javax.xml_1.4.1.v20220503-2331.jar" +) + +http_jar( + name = "javax_xml_bind", + url = "https://www.eclipse.org/downloads/download.php?file=/releases/2020-06/202006171000/plugins/javax.xml.bind_2.2.0.v201105210648.jar&r=1", + downloaded_file_name = "javax.xml.bind_2.2.0.v201105210648.jar" +) + +http_jar( + name = "javax_xml_ws", + url = "https://www.eclipse.org/downloads/download.php?file=/releases/2020-06/202006171000/plugins/javax.xml.ws_2.1.0.v200902101523.jar&r=1", + downloaded_file_name = "javax.xml.ws.jar" +) + +http_jar( + name = "javax_xml_soap", + url = "https://download.eclipse.org/tools/orbit/downloads/drops/R20181102183712/repository/plugins/javax.xml.soap_1.3.0.v201105210645.jar", + downloaded_file_name = "javax.xml.soap_1.3.0.v201105210645.jar" +) + +http_jar( + name = "javax_servlet", + url = "https://www.eclipse.org/downloads/download.php?file=/releases/2020-06/202006171000/plugins/javax.servlet_3.1.0.v201410161800.jar&r=1", + downloaded_file_name = "javax.servlet_3.1.0.v201410161800.jar" +) + +http_jar( + name = "javax_validation", + url = "https://www.eclipse.org/downloads/download.php?file=/tools/orbit/downloads/drops/R20230531010532/repository/plugins/javax.validation_1.1.0.v20221112-0806.jar", + downloaded_file_name = "javax.validation_1.1.0.v20221112-0806.jar" +) + +http_jar( + name = "javax_mail", + url = "https://www.eclipse.org/downloads/download.php?file=/releases/2020-06/202006171000/plugins/javax.mail_1.4.0.v201005080615.jar&r=1", + downloaded_file_name = "javax.mail_1.4.0.v201005080615.jar" +) + +http_jar( + name = "eclipse_core_runtime", + url = "https://www.eclipse.org/downloads/download.php?file=/releases/2020-06/202006171000/plugins/org.eclipse.core.runtime_3.18.0.v20200506-2143.jar&r=1", + downloaded_file_name = "org.eclipse.core.runtime_3.18.0.v20200506-2143.jar" +) + +http_jar( + name = "eclipse_core_jobs", + url = "https://www.eclipse.org/downloads/download.php?file=/releases/2020-06/202006171000/plugins/org.eclipse.core.jobs_3.10.800.v20200421-0950.jar&r=1", + downloaded_file_name = "org.eclipse.core.jobs_3.10.800.v20200421-0950.jar" +) + +http_jar( + name = "eclipse_core_resources", + url = "https://www.eclipse.org/downloads/download.php?file=/releases/2020-06/202006171000/plugins/org.eclipse.core.resources_3.13.700.v20200209-1624.jar&r=1", + downloaded_file_name = "org.eclipse.core.resources_3.13.700.v20200209-1624.jar" +) + +http_jar( + name = "eclipse_core_commands", + url = "https://www.eclipse.org/downloads/download.php?file=/releases/2020-06/202006171000/plugins/org.eclipse.core.commands_3.9.700.v20191217-1850.jar&r=1", + downloaded_file_name = "org.eclipse.core.commands_3.9.700.v20191217-1850.jar" +) + +http_jar( + name = "eclipse_core_filesystem", + url = "https://www.eclipse.org/downloads/download.php?file=/releases/2020-06/202006171000/plugins/org.eclipse.core.filesystem_1.7.700.v20200110-1734.jar&r=1", + downloaded_file_name = "org.eclipse.core.filesystem_1.7.700.v20200110-1734.jar" +) + +http_jar( + name = "eclipse_core_filebuffers", + url = "https://www.eclipse.org/downloads/download.php?file=/releases/2020-06/202006171000/plugins/org.eclipse.core.filebuffers_3.6.1000.v20200409-1035.jar&r=1", + downloaded_file_name = "org.eclipse.core.filebuffers_3.6.1000.v20200409-1035.jar" +) + +http_jar( + name = "eclipse_core_expressions", + url = "https://www.eclipse.org/downloads/download.php?file=/releases/2020-06/202006171000/plugins/org.eclipse.core.expressions_3.6.800.v20200319-0911.jar&r=1", + downloaded_file_name = "org.eclipse.core.expressions_3.6.800.v20200319-0911.jar" +) + +http_jar( + name = "eclipse_core_contenttype", + url = "https://www.eclipse.org/downloads/download.php?file=/releases/2020-06/202006171000/plugins/org.eclipse.core.contenttype_3.7.700.v20200517-1644.jar&r=1", + downloaded_file_name = "org.eclipse.core.contenttype_3.7.700.v20200517-1644.jar" +) + +http_jar( + name = "eclipse_core_variables", + url = "https://www.eclipse.org/downloads/download.php?file=/releases/2020-06/202006171000/plugins/org.eclipse.core.variables_3.4.800.v20200120-1101.jar&r=1", + downloaded_file_name = "org.eclipse.core.variables_3.4.800.v20200120-1101.jar" +) + +http_jar( + name = "eclipse_debug_core", + url = "https://www.eclipse.org/downloads/download.php?file=/releases/2020-06/202006171000/plugins/org.eclipse.debug.core_3.15.100.v20200514-0816.jar&r=1", + downloaded_file_name = "org.eclipse.debug.core_3.15.100.v20200514-0816.jar" +) + +http_jar( + name = "eclipse_text", + url = "https://www.eclipse.org/downloads/download.php?file=/releases/2020-06/202006171000/plugins/org.eclipse.text_3.10.200.v20200428-0633.jar&r=1", + downloaded_file_name = "org.eclipse.text_3.10.200.v20200428-0633.jar" +) + +http_jar( + name = "eclipse_equinox_common", + url = "https://www.eclipse.org/downloads/download.php?file=/releases/2020-06/202006171000/plugins/org.eclipse.equinox.common_3.12.0.v20200504-1602.jar&r=1", + downloaded_file_name = "org.eclipse.equinox.common_3.12.0.v20200504-1602.jar" +) + +http_jar( + name = "eclipse_equinox_registry", + url = "https://www.eclipse.org/downloads/download.php?file=/releases/2020-06/202006171000/plugins/org.eclipse.equinox.registry_3.8.800.v20200406-0956.jar&r=1", + downloaded_file_name = "org.eclipse.equinox.registry_3.8.800.v20200406-0956.jar" +) + +http_jar( + name = "eclipse_equinox_preferences", + url = "https://www.eclipse.org/downloads/download.php?file=/releases/2020-06/202006171000/plugins/org.eclipse.equinox.preferences_3.8.0.v20200422-1833.jar&r=1", + downloaded_file_name = "org.eclipse.equinox.preferences_3.8.0.v20200422-1833.jar" +) + +http_jar( + name = "eclipse_equinox_app", + url = "https://www.eclipse.org/downloads/download.php?file=/releases/2020-06/202006171000/plugins/org.eclipse.equinox.app_1.4.500.v20200422-1833.jar&r=1", + downloaded_file_name = "org.eclipse.equinox.app_1.4.500.v20200422-1833.jar" +) + +http_jar( + name = "eclipse_equinox_console", + url = "https://www.eclipse.org/downloads/download.php?file=/releases/2020-06/202006171000/plugins/org.eclipse.equinox.console_1.4.100.v20200525-1407.jar&r=1", + downloaded_file_name = "org.eclipse.equinox.console_1.4.100.v20200525-1407.jar" +) +http_jar( + name = "eclipse_equinox_launcher", + url = "https://www.eclipse.org/downloads/download.php?file=/releases/2020-06/202006171000/plugins/org.eclipse.equinox.launcher_1.5.700.v20200207-2156.jar&r=1", + downloaded_file_name = "org.eclipse.equinox.launcher_1.5.700.v20200207-2156.jar" +) + +http_jar( + name = "eclipse_osgi", + url = "https://www.eclipse.org/downloads/download.php?file=/releases/2020-06/202006171000/plugins/org.eclipse.osgi_3.15.300.v20200520-1959.jar&r=1", + downloaded_file_name = "org.eclipse.osgi_3.15.300.v20200520-1959.jar" +) + +http_jar( + name = "eclipse_osgi_services", + url = "https://www.eclipse.org/downloads/download.php?file=/releases/2020-06/202006171000/plugins/org.eclipse.osgi.services_3.8.0.v20190206-2147.jar&r=1", + downloaded_file_name = "org.eclipse.osgi.services_3.8.0.v20190206-2147.jar" +) + +http_jar( + name = "eclipse_osgi_util", + url = "https://www.eclipse.org/downloads/download.php?file=/releases/2020-06/202006171000/plugins/org.eclipse.osgi.util_3.5.300.v20190708-1141.jar&r=1", + downloaded_file_name = "org.eclipse.osgi.util_3.5.300.v20190708-1141.jar" +) + +http_jar( + name = "eclipse_zest_core", + url = "https://www.eclipse.org/downloads/download.php?file=/releases/2020-06/202006171000/plugins/org.eclipse.zest.core_1.5.300.201606061308.jar&r=1", + downloaded_file_name = "org.eclipse.zest.core_1.5.300.201606061308.jar" +) + +http_jar( + name = "eclipse_zest_layouts", + url = "https://www.eclipse.org/downloads/download.php?file=/releases/2020-06/202006171000/plugins/org.eclipse.zest.layouts_1.1.300.201606061308.jar&r=1", + downloaded_file_name = "org.eclipse.zest.layouts_1.1.300.201606061308.jar" +) + +http_jar( + name = "eclipse_search", + url = "https://www.eclipse.org/downloads/download.php?file=/releases/2020-06/202006171000/plugins/org.eclipse.search_3.11.1000.v20200410-1852.jar&r=1", + downloaded_file_name = "org.eclipse.search_3.11.1000.v20200410-1852.jar" +) + +http_jar( + name = "eclipse_compare", + url = "https://www.eclipse.org/downloads/download.php?file=/releases/2020-06/202006171000/plugins/org.eclipse.compare_3.7.1000.v20200511-1203.jar&r=1", + downloaded_file_name = "org.eclipse.compare_3.7.1000.v20200511-1203.jar" +) + +http_jar( + name = "apache_commons_codec", + url = "https://www.eclipse.org/downloads/download.php?file=/tools/orbit/downloads/drops/R20230531010532/repository/plugins/org.apache.commons.codec_1.14.0.v20221112-0806.jar", + downloaded_file_name = "org.apache.commons.codec_1.14.0.v20221112-0806.jar" +) + +http_jar( + name = "apache_xerces", + url = "https://www.eclipse.org/downloads/download.php?file=/tools/orbit/downloads/drops/R20230531010532/repository/plugins/org.apache.xerces_2.12.2.v20220131-0835.jar", + downloaded_file_name = "org.apache.xerces_2.12.2.v20220131-0835.jar" +) + +http_jar( + name = "apache_xml_resolver", + url = "https://www.eclipse.org/downloads/download.php?file=/tools/orbit/downloads/drops/R20230531010532/repository/plugins/org.apache.xml.resolver_1.2.0.v20220715-1206.jar", + downloaded_file_name = "org.apache.xml.resolver_1.2.0.v20220715-1206.jar" +) + +http_jar( + name = "antlr_runtime", + url = "https://www.eclipse.org/downloads/download.php?file=/releases/2020-06/202006171000/plugins/org.antlr.runtime_3.2.0.v201101311130.jar&r=1", + downloaded_file_name = "org.antlr.runtime_3.2.0.v201101311130.jar" +) + +http_jar( + name = "google_guava", + url = "https://www.eclipse.org/downloads/download.php?file=/tools/orbit/downloads/drops/R20230531010532/repository/plugins/com.google.guava_30.1.0.v20221112-0806.jar", + downloaded_file_name = "com.google.guava_30.1.0.v20221112-0806.jar" +) + +http_jar( + name = "slf4j_api", + url = "https://www.eclipse.org/downloads/download.php?file=/tools/orbit/downloads/drops/R20230531010532/repository/plugins/org.slf4j.api_1.7.30.v20221112-0806.jar", + downloaded_file_name = "org.slf4j.api_1.7.30.v20221112-0806.jar" +) + +http_jar( + name = "swagger_core", + url = "https://ci.eclipse.org/osee/job/osee_nightly/lastSuccessfulBuild/artifact/org.eclipse.osee/plugins/org.eclipse.osee.server.p2/target/repository/plugins/swagger-core_2.2.7.jar", + downloaded_file_name = "swagger-core_2.2.7.jar" +) + +http_jar( + name = "swagger_annotations", + url = "https://ci.eclipse.org/osee/job/osee_nightly/lastSuccessfulBuild/artifact/org.eclipse.osee/plugins/org.eclipse.osee.server.p2/target/repository/plugins/swagger-annotations_2.2.7.jar", + downloaded_file_name = "swagger-annotations_2.2.7.jar" +) + +http_jar( + name = "swagger_integration", + url = "https://ci.eclipse.org/osee/job/osee_nightly/lastSuccessfulBuild/artifact/org.eclipse.osee/plugins/org.eclipse.osee.server.p2/target/repository/plugins/swagger-integration_2.2.7.jar", + downloaded_file_name = "swagger-integration_2.2.7.jar" +) + +http_jar( + name = "swagger_jaxrs2", + url = "https://ci.eclipse.org/osee/job/osee_nightly/lastSuccessfulBuild/artifact/org.eclipse.osee/plugins/org.eclipse.osee.server.p2/target/repository/plugins/swagger-jaxrs2_2.2.7.jar", + downloaded_file_name = "swagger-jaxrs2_2.2.7.jar" +) + +http_jar( + name = "swagger_models", + url = "https://ci.eclipse.org/osee/job/osee_nightly/lastSuccessfulBuild/artifact/org.eclipse.osee/plugins/org.eclipse.osee.server.p2/target/repository/plugins/swagger-models_2.2.7.jar", + downloaded_file_name = "swagger-models_2.2.7.jar" +) + +http_jar( + name = "apache_poi", + url = "https://ci.eclipse.org/osee/job/osee_nightly/lastSuccessfulBuild/artifact/org.eclipse.osee/plugins/org.eclipse.osee.server.p2/target/repository/plugins/org.apache.poi_4.1.1.v20221112-0806.jar", + downloaded_file_name = "org.apache.poi_4.1.1.v20221112-0806.jar" +) + +http_jar( + name = "apache_poi_ooxml", + url = "https://ci.eclipse.org/osee/job/osee_nightly/lastSuccessfulBuild/artifact/org.eclipse.osee/plugins/org.eclipse.osee.server.p2/target/repository/plugins/org.apache.poi.ooxml_4.1.1.v20221112-0806.jar", + downloaded_file_name = "org.apache.poi.ooxml_4.1.1.v20221112-0806.jar" +) + +http_jar( + name = "apache_poi_ooxml.schemas", + url = "https://ci.eclipse.org/osee/job/osee_nightly/lastSuccessfulBuild/artifact/org.eclipse.osee/plugins/org.eclipse.osee.server.p2/target/repository/plugins/org.apache.poi.ooxml.schemas_4.1.1.v20221112-0806.jar", + downloaded_file_name = "org.apache.poi.ooxml.schemas_4.1.1.v20221112-0806.jar" +) diff --git a/plugins/ext.jars/BUILD b/plugins/ext.jars/BUILD index 4a2ee0d382d..bd92cbfaf1e 100644 --- a/plugins/ext.jars/BUILD +++ b/plugins/ext.jars/BUILD @@ -54,52 +54,6 @@ java_import( ], ) -java_import( - name = "eclipse_core", - jars = [ - "org.eclipse.core.runtime_3.18.0.v20200506-2143.jar", - "org.eclipse.core.resources_3.13.700.v20200209-1624.jar", - "org.eclipse.core.jobs_3.10.800.v20200421-0950.jar", - "org.eclipse.core.commands_3.9.700.v20191217-1850.jar", - "org.eclipse.core.contenttype_3.7.700.v20200517-1644.jar", - "org.eclipse.debug.core_3.15.100.v20200514-0816.jar", - "org.eclipse.core.filesystem_1.7.700.v20200110-1734.jar", - "org.eclipse.core.filebuffers_3.6.1000.v20200409-1035.jar", - "org.eclipse.core.variables_3.4.800.v20200120-1101.jar", - "org.eclipse.compare_3.7.1000.v20200511-1203.jar", - "org.eclipse.text_3.10.200.v20200428-0633.jar", - "org.eclipse.search_3.11.1000.v20200410-1852.jar", - "org.eclipse.zest.core_1.5.300.201606061308.jar", - "org.eclipse.zest.layouts_1.1.300.201606061308.jar", - "org.eclipse.draw2d_3.10.100.201606061308.jar", - "org.eclipse.gef_3.11.0.201606061308.jar", - "org.apache.ws.xmlschema.core_2.2.5.jar", - "org.apache.xerces_2.12.2.v20220131-0835.jar", - "org.apache.xml.resolver_1.2.0.v20220715-1206.jar" - ], -) - -java_import( - name = "eclipse_osgi_services", - jars = [ - "org.eclipse.osgi.services_3.8.0.v20190206-2147.jar", - "org.eclipse.osgi_3.15.300.v20200520-1959.jar", - "org.eclipse.osgi.util_3.5.300.v20190708-1141.jar" - ], -) - -java_import( - name = "eclipse_equinox_common", - jars = [ - "org.eclipse.equinox.common_3.12.0.v20200504-1602.jar", - "org.eclipse.equinox.registry_3.8.800.v20200406-0956.jar", - "org.eclipse.equinox.preferences_3.8.0.v20200422-1833.jar", - "org.eclipse.equinox.app_1.4.500.v20200422-1833.jar", - "org.eclipse.equinox.console_1.4.100.v20200525-1407.jar", - "org.eclipse.equinox.launcher_1.5.700.v20200207-2156.jar", - "org.eclipse.core.expressions_3.6.800.v20200319-0911.jar" - ], -) java_import( name = "nebula", @@ -117,8 +71,6 @@ java_import( "org.apache.commons.io_2.6.0.v20190123-2029.jar", "org.apache.commons.dbcp_1.4.0.v201204271417.jar", "org.apache.commons.pool_1.6.0.v201204271246.jar", - "org.apache.commons.collections4_4.4.0.v20221112-0806.jar", - "org.apache.commons.math3_3.6.1.v20221112-0806.jar" ], ) diff --git a/plugins/org.eclipse.osee.accessor/BUILD b/plugins/org.eclipse.osee.accessor/BUILD index e7a49b13488..c4211ce5cba 100644 --- a/plugins/org.eclipse.osee.accessor/BUILD +++ b/plugins/org.eclipse.osee.accessor/BUILD @@ -47,11 +47,8 @@ java_library( "@maven//:io_swagger_core_v3_swagger_jaxrs2", "@maven//:org_apache_cxf_cxf_rt_frontend_jaxrs", "@maven//:io_swagger_core_v3_swagger_models", - "@ext_jars//:eclipse_osgi_services", "@ext_jars//:nebula", - "@ext_jars//:eclipse_core", "@ext_jars//:apache_commons_lang", - "@ext_jars//:eclipse_equinox_common" ], ) diff --git a/plugins/org.eclipse.osee.account.rest.test/BUILD b/plugins/org.eclipse.osee.account.rest.test/BUILD index 63715c5c6da..80e06969746 100644 --- a/plugins/org.eclipse.osee.account.rest.test/BUILD +++ b/plugins/org.eclipse.osee.account.rest.test/BUILD @@ -32,8 +32,6 @@ java_library( "@maven//:org_osgi_org_osgi_service_event", "@maven//:org_osgi_org_osgi_service_component", "@maven//:org_osgi_org_osgi_framework", - "@maven//:org_eclipse_core_runtime", - "@maven//:org_eclipse_osgi", "@maven//:org_eclipse_core_org_eclipse_core_resources", "@maven//:javax_mail_mail", "@maven//:org_antlr_antlr_runtime", diff --git a/plugins/org.eclipse.osee.account.rest/BUILD b/plugins/org.eclipse.osee.account.rest/BUILD index 585fc268edf..8f78736e546 100644 --- a/plugins/org.eclipse.osee.account.rest/BUILD +++ b/plugins/org.eclipse.osee.account.rest/BUILD @@ -70,15 +70,13 @@ java_library( "@maven//:org_osgi_org_osgi_service_event", "@maven//:org_osgi_org_osgi_service_component", "@maven//:org_osgi_org_osgi_framework", - "@maven//:org_eclipse_core_runtime", "@maven//:org_eclipse_core_org_eclipse_core_resources", "@maven//:javax_mail_mail", "@maven//:org_antlr_antlr_runtime", "@maven//:com_google_guava_guava", "@maven//:javax_servlet_javax_servlet_api", "@maven//:org_hsqldb_hsqldb", - "@ext_jars//:javax", - "@ext_jars//:eclipse_osgi_services", + "@javax_annotation//jar", "@ext_jars//:poi" ], ) diff --git a/plugins/org.eclipse.osee.app/BUILD b/plugins/org.eclipse.osee.app/BUILD index 6970ca48828..5a3ee8e881b 100644 --- a/plugins/org.eclipse.osee.app/BUILD +++ b/plugins/org.eclipse.osee.app/BUILD @@ -66,6 +66,5 @@ java_library( "@maven//:com_google_guava_guava", "@maven//:org_hsqldb_hsqldb", "@maven//:javax_servlet_javax_servlet_api", - "@ext_jars//:eclipse_osgi_services", ], ) diff --git a/plugins/org.eclipse.osee.ats.api/BUILD b/plugins/org.eclipse.osee.ats.api/BUILD index 9516c40d659..376ef255207 100644 --- a/plugins/org.eclipse.osee.ats.api/BUILD +++ b/plugins/org.eclipse.osee.ats.api/BUILD @@ -49,7 +49,8 @@ java_library( "@maven//:io_swagger_core_v3_swagger_core", "@maven//:io_swagger_core_v3_swagger_jaxrs2", "@maven//:io_swagger_core_v3_swagger_models", - "@ext_jars//:eclipse_osgi_services", + "@eclipse_osgi_services//jar", + "@eclipse_osgi//jar", "@ext_jars//:nebula", "@ext_jars//:apache_commons_lang" ], diff --git a/plugins/org.eclipse.osee.ats.core/BUILD b/plugins/org.eclipse.osee.ats.core/BUILD index 68d0dacf18b..a0599b33e5b 100644 --- a/plugins/org.eclipse.osee.ats.core/BUILD +++ b/plugins/org.eclipse.osee.ats.core/BUILD @@ -57,8 +57,10 @@ java_library( "@maven//:org_antlr_antlr_runtime", "@maven//:com_google_guava_guava", "@maven//:org_apache_cxf_cxf_rt_frontend_jaxrs", - "@ext_jars//:eclipse_osgi_services", "@ext_jars//:nebula", - "@ext_jars//:apache_commons_lang" + "@ext_jars//:apache_commons_lang", + "@eclipse_osgi//jar", + "@eclipse_osgi_services//jar" + ], ) diff --git a/plugins/org.eclipse.osee.ats.ide.demo/BUILD b/plugins/org.eclipse.osee.ats.ide.demo/BUILD index a0c1590384b..097ba904bd9 100644 --- a/plugins/org.eclipse.osee.ats.ide.demo/BUILD +++ b/plugins/org.eclipse.osee.ats.ide.demo/BUILD @@ -59,9 +59,7 @@ java_library( "@maven//:com_google_guava_guava", "@maven//:org_hsqldb_hsqldb", "@maven//:org_jsoup_jsoup", - "@ext_jars//:eclipse_core", "@ext_jars//:eclipse_equinox_common", - "@ext_jars//:eclipse_osgi_services", "@ext_jars//:jface" ], ) diff --git a/plugins/org.eclipse.osee.ats.ide.help.ui.test/BUILD b/plugins/org.eclipse.osee.ats.ide.help.ui.test/BUILD index becf2707d95..38282304727 100644 --- a/plugins/org.eclipse.osee.ats.ide.help.ui.test/BUILD +++ b/plugins/org.eclipse.osee.ats.ide.help.ui.test/BUILD @@ -2,5 +2,6 @@ java_test( name = "AtsHelpUiTestSuite", srcs = glob(["**/*.java"]), deps = ["//org.eclipse.osee.ats.ide.help.ui", "//org.eclipse.osee.framework.core.packages", - "@ext_jars//:eclipse_equinox_common", "@ext_jars//:eclipse_osgi_services"] + "@eclipse_equinox_common//jar", "@eclipse_osgi//jar" + ] ) diff --git a/plugins/org.eclipse.osee.ats.ide.integration.tests/BUILD b/plugins/org.eclipse.osee.ats.ide.integration.tests/BUILD index d09f6757876..49f7b5f4378 100644 --- a/plugins/org.eclipse.osee.ats.ide.integration.tests/BUILD +++ b/plugins/org.eclipse.osee.ats.ide.integration.tests/BUILD @@ -87,7 +87,6 @@ java_library( "@maven//:org_apache_activemq_activemq_all", "@maven//:org_mockito_mockito_core", "@maven//:org_hamcrest_hamcrest_core", - "@ext_jars//:eclipse_osgi_services", "@ext_jars//:junit", "@ext_jars//:nebula", "@ext_jars//:apache_commons_lang", @@ -96,7 +95,6 @@ java_library( "@ext_jars//:rmf", "@ext_jars//:emf", "@ext_jars//:jface", - "@ext_jars//:eclipse_core", "@ext_jars//:eclipse_equinox_common" ], ) diff --git a/plugins/org.eclipse.osee.ats.ide/BUILD b/plugins/org.eclipse.osee.ats.ide/BUILD index a0e9eac6595..64577b23bff 100644 --- a/plugins/org.eclipse.osee.ats.ide/BUILD +++ b/plugins/org.eclipse.osee.ats.ide/BUILD @@ -80,14 +80,12 @@ java_library( "@maven//:org_apache_activemq_activemq_all", "@maven//:org_mockito_mockito_core", "@maven//:org_hamcrest_hamcrest_core", - "@ext_jars//:eclipse_osgi_services", "@ext_jars//:junit", "@ext_jars//:nebula", "@ext_jars//:apache_commons_lang", "@ext_jars//:eclipse_ui", "@ext_jars//:swt", "@ext_jars//:jface", - "@ext_jars//:eclipse_core", "@ext_jars//:eclipse_equinox_common" ], ) diff --git a/plugins/org.eclipse.osee.ats.rest/BUILD b/plugins/org.eclipse.osee.ats.rest/BUILD index b55d48afa16..606a2778347 100644 --- a/plugins/org.eclipse.osee.ats.rest/BUILD +++ b/plugins/org.eclipse.osee.ats.rest/BUILD @@ -62,8 +62,8 @@ java_library( "@maven//:org_antlr_antlr_runtime", "@maven//:com_google_guava_guava", "@maven//:org_apache_cxf_cxf_rt_frontend_jaxrs", - "@ext_jars//:eclipse_osgi_services", - "@ext_jars//:eclipse_equinox_common", + "@eclipse_osgi//jar", + "@eclipse_equinox_common//jar", "@ext_jars//:nebula", "@ext_jars//:apache_commons_lang" ], diff --git a/plugins/org.eclipse.osee.authentication.ldap.test/BUILD b/plugins/org.eclipse.osee.authentication.ldap.test/BUILD index a9e7ab792c8..55035cb908e 100644 --- a/plugins/org.eclipse.osee.authentication.ldap.test/BUILD +++ b/plugins/org.eclipse.osee.authentication.ldap.test/BUILD @@ -1,6 +1,6 @@ java_test( name = "LdapAuthenticationTestSuite", srcs = glob(["**/*.java"]), - deps = ["//org.eclipse.osee.authentication.ldap:authentication_ldap","@maven//:org_mockito_mockito_core", - "//:authentication_admin"] + deps = ["//org.eclipse.osee.authentication.ldap","@maven//:org_mockito_mockito_core", + "//org.eclipse.osee.authentication.admin"] ) diff --git a/plugins/org.eclipse.osee.client.demo/BUILD b/plugins/org.eclipse.osee.client.demo/BUILD index 8118f7a626c..449ad26a27d 100644 --- a/plugins/org.eclipse.osee.client.demo/BUILD +++ b/plugins/org.eclipse.osee.client.demo/BUILD @@ -84,13 +84,11 @@ java_library( "@maven//:org_apache_activemq_activemq_all", "@maven//:org_mockito_mockito_core", "@maven//:org_hamcrest_hamcrest_core", - "@ext_jars//:eclipse_osgi_services", - "@ext_jars//:nebula", +. "@ext_jars//:nebula", "@ext_jars//:apache_commons_lang", "@ext_jars//:eclipse_ui", "@ext_jars//:swt", "@ext_jars//:jface", - "@ext_jars//:eclipse_core", "@ext_jars//:eclipse_equinox_common" ], ) diff --git a/plugins/org.eclipse.osee.client.test.framework/BUILD b/plugins/org.eclipse.osee.client.test.framework/BUILD index 0711cbe55d6..0898c5664c8 100644 --- a/plugins/org.eclipse.osee.client.test.framework/BUILD +++ b/plugins/org.eclipse.osee.client.test.framework/BUILD @@ -79,14 +79,12 @@ java_library( "@maven//:org_apache_activemq_activemq_all", "@maven//:org_mockito_mockito_core", "@maven//:org_hamcrest_hamcrest_core", - "@ext_jars//:eclipse_osgi_services", "@ext_jars//:junit", "@ext_jars//:nebula", "@ext_jars//:apache_commons_lang", "@ext_jars//:eclipse_ui", "@ext_jars//:swt", "@ext_jars//:jface", - "@ext_jars//:eclipse_core", "@ext_jars//:eclipse_equinox_common" ], ) diff --git a/plugins/org.eclipse.osee.config.admin.test/BUILD b/plugins/org.eclipse.osee.config.admin.test/BUILD index 4750a8432c2..031af82733b 100644 --- a/plugins/org.eclipse.osee.config.admin.test/BUILD +++ b/plugins/org.eclipse.osee.config.admin.test/BUILD @@ -1,5 +1,5 @@ java_test( name = "ConfigAdminTestSuite", srcs = glob(["**/*.java"]), - deps = ["//org.eclipse.osee.config.admin:config_admin", "@maven//:org_mockito_mockito_core"] + deps = ["//org.eclipse.osee.config.admin", "@maven//:org_mockito_mockito_core"] ) diff --git a/plugins/org.eclipse.osee.config.admin/BUILD b/plugins/org.eclipse.osee.config.admin/BUILD index c889101244b..7aaf07a8219 100644 --- a/plugins/org.eclipse.osee.config.admin/BUILD +++ b/plugins/org.eclipse.osee.config.admin/BUILD @@ -37,7 +37,8 @@ java_library( "@maven//:jakarta_ws_rs_jakarta_ws_rs_api", "@maven//:javax_activation_activation", "@maven//:jakarta_xml_bind_jakarta_xml_bind_api", - "@ext_jars//:eclipse_osgi_services" + "@eclipse_osgi//jar", + "@eclipse_osgi_services//jar" ], ) diff --git a/plugins/org.eclipse.osee.console.admin.test/BUILD b/plugins/org.eclipse.osee.console.admin.test/BUILD index 6e54541542a..83649724405 100644 --- a/plugins/org.eclipse.osee.console.admin.test/BUILD +++ b/plugins/org.eclipse.osee.console.admin.test/BUILD @@ -1,6 +1,5 @@ java_test( name = "AllConsoleAdminTestSuite", srcs = glob(["**/*.java"]), - deps = ["//org.eclipse.osee.console.admin","//org.eclipse.osee.framework.jdk.core", - "@ext_jars//:eclipse_osgi_services"] + deps = ["//org.eclipse.osee.console.admin","//org.eclipse.osee.framework.jdk.core","@eclipse_osgi//jar"] ) diff --git a/plugins/org.eclipse.osee.console.admin/BUILD b/plugins/org.eclipse.osee.console.admin/BUILD index 6461d52a8a8..1b15832ba9a 100644 --- a/plugins/org.eclipse.osee.console.admin/BUILD +++ b/plugins/org.eclipse.osee.console.admin/BUILD @@ -31,7 +31,7 @@ java_library( "@maven//:jakarta_ws_rs_jakarta_ws_rs_api", "@maven//:javax_activation_activation", "@maven//:jakarta_xml_bind_jakarta_xml_bind_api", - "@ext_jars//:eclipse_osgi_services" + "@eclipse_osgi//jar", ], ) diff --git a/plugins/org.eclipse.osee.define.ide.test/BUILD b/plugins/org.eclipse.osee.define.ide.test/BUILD index 56a3993ee6b..5b620a270ec 100644 --- a/plugins/org.eclipse.osee.define.ide.test/BUILD +++ b/plugins/org.eclipse.osee.define.ide.test/BUILD @@ -64,14 +64,11 @@ java_library( "@maven//:org_apache_activemq_activemq_all", "@maven//:org_mockito_mockito_core", "@maven//:org_hamcrest_hamcrest_core", - "@ext_jars//:eclipse_osgi_services", "@ext_jars//:nebula", "@ext_jars//:apache_commons_lang", "@ext_jars//:eclipse_ui", "@ext_jars//:swt", "@ext_jars//:jface", - "@ext_jars//:eclipse_core", - "@ext_jars//:eclipse_equinox_common" ], ) diff --git a/plugins/org.eclipse.osee.define.ide/BUILD b/plugins/org.eclipse.osee.define.ide/BUILD index 10d42e3941e..a10982135a8 100644 --- a/plugins/org.eclipse.osee.define.ide/BUILD +++ b/plugins/org.eclipse.osee.define.ide/BUILD @@ -83,14 +83,18 @@ java_library( "@maven//:org_apache_activemq_activemq_all", "@maven//:org_mockito_mockito_core", "@maven//:org_hamcrest_hamcrest_core", - "@ext_jars//:eclipse_osgi_services", + "@eclipse_core_resources//jar", + "@eclipse_core_filesystem//jar", + "@eclipse_core_runtime//jar", + "@eclipse_equinox_common//jar", + "@eclipse_osgi//jar", + "@eclipse_core_jobs//jar", + "@eclipse_equinox_registry//jar", "@ext_jars//:nebula", "@ext_jars//:apache_commons_lang", "@ext_jars//:eclipse_ui", "@ext_jars//:swt", "@ext_jars//:jface", - "@ext_jars//:eclipse_core", - "@ext_jars//:eclipse_equinox_common" ], ) diff --git a/plugins/org.eclipse.osee.define.operations.api/BUILD b/plugins/org.eclipse.osee.define.operations.api/BUILD index 755a66614c3..e965af79989 100644 --- a/plugins/org.eclipse.osee.define.operations.api/BUILD +++ b/plugins/org.eclipse.osee.define.operations.api/BUILD @@ -7,33 +7,23 @@ osgi_jar_converter( ) java_library( - name = "org.eclipse.osee.define.operations.api", - resources = ["manifest"], - srcs = glob(["**/*.java"]), - deps = [ - "java_deps", - "//framework_core_packages", - "//org.eclipse.osee.jdbc", - "//org.eclipse.osee.orcs", - "//org.eclipse.osee.console.admin", - "//org.eclipse.osee.cache.admin", - "//org.eclipse.osee.activity.api", - "//org.eclipse.osee.define.rest.api" - ], - visibility = [ - "//visibility:public" - ] + name = "org.eclipse.osee.define.operations.api", + resources = ["resources"], + srcs = glob(["**/*.java"]), + deps = ["java_deps","//org.eclipse.osee.framework.core.packages","//org.eclipse.osee.orcs", + "//org.eclipse.osee.framework.core.server","//org.eclipse.osee.define.rest.api", + "//org.eclipse.osee.activity.api",], + visibility = ["//visibility:public"] ) filegroup( - name = "manifest", - srcs = ["META-INF/MANIFEST.MF"] + name = "resources", + srcs = glob(["**/*"]), ) - java_library( - name = "java_deps", - exports = [ + name = "java_deps", + exports = [ "@maven//:com_fasterxml_jackson_core_jackson_core", "@maven//:com_fasterxml_jackson_core_jackson_databind", "@maven//:com_fasterxml_jackson_core_jackson_annotations", @@ -53,6 +43,5 @@ java_library( "@maven//:io_swagger_core_v3_swagger_core", "@maven//:io_swagger_core_v3_swagger_jaxrs2", "@maven//:io_swagger_core_v3_swagger_models", - "@ext_jars//:eclipse_osgi_services", ] ) diff --git a/plugins/org.eclipse.osee.define.rest.api/BUILD b/plugins/org.eclipse.osee.define.rest.api/BUILD index d1e9053763f..be30f6f3815 100644 --- a/plugins/org.eclipse.osee.define.rest.api/BUILD +++ b/plugins/org.eclipse.osee.define.rest.api/BUILD @@ -7,20 +7,19 @@ osgi_jar_converter( ) java_library( - name = "org.eclipse.osee.define.rest.api", - srcs = glob(["**/*.java"]), - resources = ["manifest"], - deps = ["java_deps", "//org.eclipse.osee.framework.core.packages","//org.eclipse.osee.jdbc", - "//org.eclipse.osee.orcs", "//org.eclipse.osee.framework.core.model", - "//org.eclipse.osee.console.admin","//org.eclipse.osee.cache.admin", - "//org.eclipse.osee.activity.api"], - visibility = ["//visibility:public"] + name = "org.eclipse.osee.define.rest.api", + resources = ["resources"], + srcs = glob(["**/*.java"]), + deps = ["java_deps","//org.eclipse.osee.framework.core.packages","//org.eclipse.osee.orcs", + "//org.eclipse.osee.framework.core.server", + "//org.eclipse.osee.activity.api","//org.eclipse.osee.framework.core.model"], + visibility = ["//visibility:public"] ) filegroup( - name = "manifest", - srcs = ["META-INF/MANIFEST.MF"] + name = "resources", + srcs = glob(["**/*"]), ) java_library( @@ -29,23 +28,19 @@ java_library( "@maven//:com_fasterxml_jackson_core_jackson_core", "@maven//:com_fasterxml_jackson_core_jackson_databind", "@maven//:com_fasterxml_jackson_core_jackson_annotations", - "@maven//:org_apache_cxf_cxf_rt_frontend_jaxrs", - "@maven//:org_apache_cxf_cxf_rt_rs_service_description", - "@maven//:commons_codec_commons_codec", "@maven//:org_eclipse_jdt_org_eclipse_jdt_annotation", "@maven//:jakarta_ws_rs_jakarta_ws_rs_api", "@maven//:javax_activation_activation", "@maven//:jakarta_xml_bind_jakarta_xml_bind_api", - "@maven//:org_slf4j_slf4j_api", "@maven//:javax_mail_mail", "@maven//:org_antlr_antlr_runtime", "@maven//:com_google_guava_guava", - "@maven//:org_hsqldb_hsqldb", - "@maven//:javax_servlet_javax_servlet_api", - "@maven//:org_eclipse_jgit_org_eclipse_jgit", - "@maven//:io_swagger_core_v3_swagger_core", - "@maven//:io_swagger_core_v3_swagger_jaxrs2", "@maven//:io_swagger_core_v3_swagger_models", - "@ext_jars//:eclipse_osgi_services", - ], + "@maven//:io_swagger_core_v3_swagger_core", + "@maven//:io_swagger_core_v3_swagger_jaxrs2", + "@maven//:org_apache_cxf_cxf_rt_rs_service_description", + "@maven//:org_apache_cxf_cxf_rt_frontend_jaxrs", + "@maven//:org_eclipse_jgit_org_eclipse_jgit", + "@ext_jars//:jgit" + ], ) diff --git a/plugins/org.eclipse.osee.define/BUILD b/plugins/org.eclipse.osee.define/BUILD index 17bb6aacc3a..d94ef69e901 100644 --- a/plugins/org.eclipse.osee.define/BUILD +++ b/plugins/org.eclipse.osee.define/BUILD @@ -76,8 +76,8 @@ java_library( "@maven//:org_jsoup_jsoup", "@maven//:com_jcraft_jsch", "@maven//:org_eclipse_jgit_org_eclipse_jgit", - "@ext_jars//:eclipse_osgi_services", - "@ext_jars//:nebula", + "@eclipse_osgi_services//jar", + "@eclipse_osgi//jar", "@ext_jars//:apache_commons_lang", "@ext_jars//:rmf", "@ext_jars//:emf", diff --git a/plugins/org.eclipse.osee.disposition.rest.test/BUILD b/plugins/org.eclipse.osee.disposition.rest.test/BUILD index 507857caa1a..945b5c65b83 100644 --- a/plugins/org.eclipse.osee.disposition.rest.test/BUILD +++ b/plugins/org.eclipse.osee.disposition.rest.test/BUILD @@ -1,6 +1,6 @@ java_test( name = "Disposition_JUnit_TestSuite", - resources = ["manifest","tmz"], + resources = ["resources",], srcs = glob(["**/*.java"]), deps = ["//org.eclipse.osee.disposition.rest", "//org.eclipse.osee.disposition.rest.model", @@ -8,23 +8,13 @@ java_test( "//org.eclipse.osee.orcs", "@maven//:org_mockito_mockito_core", "@maven//:com_fasterxml_jackson_core_jackson_core", "@maven//:com_fasterxml_jackson_core_jackson_annotations", - "@maven//:jakarta_ws_rs_jakarta_ws_rs_api","@maven//:com_fasterxml_jackson_core_jackson_databind","@ext_jars//:eclipse_osgi_services"] + "@maven//:jakarta_ws_rs_jakarta_ws_rs_api","@maven//:com_fasterxml_jackson_core_jackson_databind"] ) filegroup( - name = "tmz", + name = "resources", srcs = glob(["**/*"]) ) -filegroup( - name = "manifest", - srcs = - [ - "META-INF/MANIFEST.MF", - "support/sampleTmo.tmo" - ] -) - - diff --git a/plugins/org.eclipse.osee.disposition.rest/BUILD b/plugins/org.eclipse.osee.disposition.rest/BUILD index f9a4a02664a..50b8094a321 100644 --- a/plugins/org.eclipse.osee.disposition.rest/BUILD +++ b/plugins/org.eclipse.osee.disposition.rest/BUILD @@ -49,7 +49,7 @@ java_library( "@maven//:io_swagger_core_v3_swagger_annotations", "@maven//:io_swagger_core_v3_swagger_jaxrs2", "@maven//:io_swagger_core_v3_swagger_models", - "@ext_jars//:javax", + "@javax_annotation//jar", "@ext_jars//:apache_commons_lang" ], ) diff --git a/plugins/org.eclipse.osee.framework.branch.gantt/BUILD b/plugins/org.eclipse.osee.framework.branch.gantt/BUILD index a7d9258765b..8fc5be5e0b3 100644 --- a/plugins/org.eclipse.osee.framework.branch.gantt/BUILD +++ b/plugins/org.eclipse.osee.framework.branch.gantt/BUILD @@ -53,11 +53,9 @@ java_library( "@maven//:org_apache_activemq_activemq_all", "@maven//:org_mockito_mockito_core", "@maven//:org_hamcrest_hamcrest_core", - "@ext_jars//:eclipse_osgi_services", "@ext_jars//:eclipse_ui", "@ext_jars//:swt", "@ext_jars//:jface", - "@ext_jars//:eclipse_core", "@ext_jars//:eclipse_equinox_common", "@ext_jars//:apache_commons_lang", "@ext_jars//:nebula" diff --git a/plugins/org.eclipse.osee.framework.core.client/BUILD b/plugins/org.eclipse.osee.framework.core.client/BUILD index 89d7169c5f7..9a2ec4ff198 100644 --- a/plugins/org.eclipse.osee.framework.core.client/BUILD +++ b/plugins/org.eclipse.osee.framework.core.client/BUILD @@ -43,8 +43,10 @@ java_library( "@maven//:com_google_guava_guava", "@maven//:org_hsqldb_hsqldb", "@maven//:org_jsoup_jsoup", - "@ext_jars//:eclipse_core", - "@ext_jars//:eclipse_equinox_common", - "@ext_jars//:eclipse_osgi_services", + "@eclipse_osgi//jar", + "@eclipse_core_runtime//jar", + "@eclipse_equinox_common//jar", + "@eclipse_equinox_registry//jar", + "@eclipse_osgi_services//jar" ], ) diff --git a/plugins/org.eclipse.osee.framework.core.model/BUILD b/plugins/org.eclipse.osee.framework.core.model/BUILD index 77ef59c4ec3..73318c23f2f 100644 --- a/plugins/org.eclipse.osee.framework.core.model/BUILD +++ b/plugins/org.eclipse.osee.framework.core.model/BUILD @@ -40,9 +40,7 @@ java_library( "@maven//:javax_mail_mail", "@maven//:org_antlr_antlr_runtime", "@maven//:com_google_guava_guava", - "@ext_jars//:eclipse_core", - "@ext_jars//:eclipse_equinox_common", - "@ext_jars//:eclipse_osgi_services" + "@eclipse_equinox_common//jar" ], ) diff --git a/plugins/org.eclipse.osee.framework.core.server/BUILD b/plugins/org.eclipse.osee.framework.core.server/BUILD index 36c690009d3..0d6f2f0d282 100644 --- a/plugins/org.eclipse.osee.framework.core.server/BUILD +++ b/plugins/org.eclipse.osee.framework.core.server/BUILD @@ -46,6 +46,6 @@ java_library( "@maven//:com_google_guava_guava", "@maven//:org_hsqldb_hsqldb", "@maven//:javax_servlet_javax_servlet_api", - "@ext_jars//:eclipse_osgi_services", + "@eclipse_osgi//jar" ], ) diff --git a/plugins/org.eclipse.osee.framework.core.test/BUILD b/plugins/org.eclipse.osee.framework.core.test/BUILD index 441abfe2ee3..6643c0d0f04 100644 --- a/plugins/org.eclipse.osee.framework.core.test/BUILD +++ b/plugins/org.eclipse.osee.framework.core.test/BUILD @@ -23,8 +23,9 @@ java_library( "@maven//:org_mockito_mockito_core", "@maven//:org_hamcrest_hamcrest_core", "@maven//:org_junit_junit5_api", - "@ext_jars//:eclipse_equinox_common", - "@ext_jars//:eclipse_osgi_services", + "@eclipse_osgi//jar", + "@eclipse_equinox_common//jar" + #"@ext_jars//:eclipse_equinox_common", ], ) diff --git a/plugins/org.eclipse.osee.framework.core.test/src/org/eclipse/osee/framework/core/util/ManifestTest.java b/plugins/org.eclipse.osee.framework.core.test/src/org/eclipse/osee/framework/core/util/ManifestTest.java index 8061d74ed92..8842e66370b 100644 --- a/plugins/org.eclipse.osee.framework.core.test/src/org/eclipse/osee/framework/core/util/ManifestTest.java +++ b/plugins/org.eclipse.osee.framework.core.test/src/org/eclipse/osee/framework/core/util/ManifestTest.java @@ -35,14 +35,16 @@ public class ManifestTest { File pluginsRoot = new File(pluginsPath); File[] pluginDirs = pluginsRoot.listFiles(); List<File> hasVersions = new ArrayList<>(); - for (File pluginDir : pluginDirs) { + if (pluginDirs != null) { + for (File pluginDir : pluginDirs) { - if (pluginDir.getAbsolutePath().contains("jms")) { - continue; - } - File manifestDir = new File(pluginDir, "META-INF" + File.separator + "MANIFEST.MF"); - if (manifestHasVersion(manifestDir)) { - hasVersions.add(pluginDir); + if (pluginDir.getAbsolutePath().contains("jms")) { + continue; + } + File manifestDir = new File(pluginDir, "META-INF" + File.separator + "MANIFEST.MF"); + if (manifestHasVersion(manifestDir)) { + hasVersions.add(pluginDir); + } } } diff --git a/plugins/org.eclipse.osee.framework.core/BUILD b/plugins/org.eclipse.osee.framework.core/BUILD index af696682fde..89f6c96ee73 100644 --- a/plugins/org.eclipse.osee.framework.core/BUILD +++ b/plugins/org.eclipse.osee.framework.core/BUILD @@ -40,9 +40,12 @@ java_library( "@maven//:javax_mail_mail", "@maven//:org_antlr_antlr_runtime", "@maven//:com_google_guava_guava", - "@ext_jars//:eclipse_core", - "@ext_jars//:eclipse_equinox_common", - "@ext_jars//:eclipse_osgi_services" + "@eclipse_core_runtime//jar", + "@eclipse_core_jobs//jar", + "@eclipse_core_resources//jar", + "@eclipse_equinox_common//jar", + "@eclipse_osgi//jar", + "@eclipse_osgi_services//jar" ], ) diff --git a/plugins/org.eclipse.osee.framework.database.init/BUILD b/plugins/org.eclipse.osee.framework.database.init/BUILD index af6b1ff03b8..1fdaea4f153 100644 --- a/plugins/org.eclipse.osee.framework.database.init/BUILD +++ b/plugins/org.eclipse.osee.framework.database.init/BUILD @@ -46,8 +46,6 @@ java_library( "@maven//:com_google_guava_guava", "@maven//:org_hsqldb_hsqldb", "@maven//:org_jsoup_jsoup", - "@ext_jars//:eclipse_core", "@ext_jars//:eclipse_equinox_common", - "@ext_jars//:eclipse_osgi_services", ], ) diff --git a/plugins/org.eclipse.osee.framework.help.ui.test/BUILD b/plugins/org.eclipse.osee.framework.help.ui.test/BUILD index f65e36c1804..5b7b1e95dd9 100644 --- a/plugins/org.eclipse.osee.framework.help.ui.test/BUILD +++ b/plugins/org.eclipse.osee.framework.help.ui.test/BUILD @@ -25,8 +25,7 @@ java_library( "@maven//:com_google_guava_guava", "@maven//:org_mockito_mockito_core", "@maven//:org_hamcrest_hamcrest_core", - "@ext_jars//:eclipse_equinox_common", - "@ext_jars//:eclipse_osgi_services" + "@eclipse_equinox_common//jar", "@eclipse_osgi//jar" ], ) diff --git a/plugins/org.eclipse.osee.framework.help.ui/BUILD b/plugins/org.eclipse.osee.framework.help.ui/BUILD index c495d26a801..30825182038 100644 --- a/plugins/org.eclipse.osee.framework.help.ui/BUILD +++ b/plugins/org.eclipse.osee.framework.help.ui/BUILD @@ -47,8 +47,6 @@ java_library( "@maven//:com_google_guava_guava", "@maven//:org_mockito_mockito_core", "@maven//:org_hamcrest_hamcrest_core", - "@ext_jars//:eclipse_equinox_common", - "@ext_jars//:eclipse_osgi_services" ], ) diff --git a/plugins/org.eclipse.osee.framework.logging.test/BUILD b/plugins/org.eclipse.osee.framework.logging.test/BUILD index 15086ec7ad5..fd3fe4a42aa 100644 --- a/plugins/org.eclipse.osee.framework.logging.test/BUILD +++ b/plugins/org.eclipse.osee.framework.logging.test/BUILD @@ -1,5 +1,5 @@ java_test( name = "AllLoggingTestSuite", srcs = glob(["**/*.java"]), - deps = ["//org.eclipse.osee.framework.logging:framework_logging"] + deps = ["//org.eclipse.osee.framework.logging"] )
\ No newline at end of file diff --git a/plugins/org.eclipse.osee.framework.messaging/BUILD b/plugins/org.eclipse.osee.framework.messaging/BUILD index f959ef4fe69..2334e2a2e1d 100644 --- a/plugins/org.eclipse.osee.framework.messaging/BUILD +++ b/plugins/org.eclipse.osee.framework.messaging/BUILD @@ -49,6 +49,6 @@ java_library( "@maven//:org_apache_geronimo_specs_geronimo_jms_1_1_spec", "@maven//:org_apache_activemq_activemq_all", "@maven//:org_glassfish_jaxb_jaxb_runtime", - "@ext_jars//:eclipse_osgi_services", + "@eclipse_osgi//jar" ], ) diff --git a/plugins/org.eclipse.osee.framework.plugin.core/BUILD b/plugins/org.eclipse.osee.framework.plugin.core/BUILD index 48539bb94bb..088485243ce 100644 --- a/plugins/org.eclipse.osee.framework.plugin.core/BUILD +++ b/plugins/org.eclipse.osee.framework.plugin.core/BUILD @@ -34,9 +34,14 @@ java_library( "@maven//:javax_mail_mail", "@maven//:org_antlr_antlr_runtime", "@maven//:com_google_guava_guava", - "@ext_jars//:eclipse_core", - "@ext_jars//:eclipse_osgi_services", - "@ext_jars//:eclipse_equinox_common", + "@eclipse_core_runtime//jar", + "@eclipse_core_jobs//jar", + "@eclipse_core_resources//jar", + "@eclipse_equinox_common//jar", + "@eclipse_equinox_registry//jar", + "@eclipse_equinox_preferences//jar", + "@eclipse_equinox_app//jar", + "@eclipse_osgi//jar" ], ) diff --git a/plugins/org.eclipse.osee.framework.server.ide.api/BUILD b/plugins/org.eclipse.osee.framework.server.ide.api/BUILD index 9517e42aabe..bbc42889ed5 100644 --- a/plugins/org.eclipse.osee.framework.server.ide.api/BUILD +++ b/plugins/org.eclipse.osee.framework.server.ide.api/BUILD @@ -40,10 +40,6 @@ java_library( "@maven//:org_antlr_antlr_runtime", "@maven//:com_google_guava_guava", "@maven//:javax_servlet_javax_servlet_api", - "@ext_jars//:eclipse_core", - "@ext_jars//:nebula", - "@ext_jars//:eclipse_equinox_common", - "@ext_jars//:eclipse_osgi_services" ], ) diff --git a/plugins/org.eclipse.osee.framework.server.ide/BUILD b/plugins/org.eclipse.osee.framework.server.ide/BUILD index d1a0293c84c..6e6858eae2f 100644 --- a/plugins/org.eclipse.osee.framework.server.ide/BUILD +++ b/plugins/org.eclipse.osee.framework.server.ide/BUILD @@ -52,9 +52,10 @@ java_library( "@maven//:org_antlr_antlr_runtime", "@maven//:com_google_guava_guava", "@maven//:javax_servlet_javax_servlet_api", - "@ext_jars//:eclipse_core", + "@eclipse_osgi//jar", + "@eclipse_osgi_services//jar", + "@eclipse_core_jobs//jar", + "@eclipse_equinox_common//jar", "@ext_jars//:nebula", - "@ext_jars//:eclipse_equinox_common", - "@ext_jars//:eclipse_osgi_services" ], ) diff --git a/plugins/org.eclipse.osee.framework.skynet.core.test/BUILD b/plugins/org.eclipse.osee.framework.skynet.core.test/BUILD index 44da403661e..d7f2d347bbd 100644 --- a/plugins/org.eclipse.osee.framework.skynet.core.test/BUILD +++ b/plugins/org.eclipse.osee.framework.skynet.core.test/BUILD @@ -63,9 +63,8 @@ java_library( "@maven//:org_hsqldb_hsqldb", "@maven//:org_jsoup_jsoup", "@maven//:org_mockito_mockito_core", - "@ext_jars//:eclipse_core", - "@ext_jars//:eclipse_equinox_common", - "@ext_jars//:eclipse_osgi_services", + #"@ext_jars//:eclipse_equinox_common", + "@eclipse_equinox_common//jar", "@ext_jars//:apache_commons_lang" ], ) diff --git a/plugins/org.eclipse.osee.framework.skynet.core/BUILD b/plugins/org.eclipse.osee.framework.skynet.core/BUILD index 3088075e133..7961e737b73 100644 --- a/plugins/org.eclipse.osee.framework.skynet.core/BUILD +++ b/plugins/org.eclipse.osee.framework.skynet.core/BUILD @@ -67,9 +67,14 @@ java_library( "@maven//:com_google_guava_guava", "@maven//:org_hsqldb_hsqldb", "@maven//:org_jsoup_jsoup", - "@ext_jars//:eclipse_core", - "@ext_jars//:eclipse_equinox_common", - "@ext_jars//:eclipse_osgi_services" + "@eclipse_core_jobs//jar", + "@eclipse_core_resources//jar", + "@eclipse_core_runtime//jar", + "@eclipse_equinox_common//jar", + "@eclipse_equinox_registry//jar", + "@eclipse_osgi//jar", + "@eclipse_osgi_services//jar", + "@eclipse_debug_core//jar" ], ) diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/relation/order/RelationOrderParser.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/relation/order/RelationOrderParser.java index d9246f3214c..eedeff5caab 100644 --- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/relation/order/RelationOrderParser.java +++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/relation/order/RelationOrderParser.java @@ -17,11 +17,8 @@ import java.io.IOException; import java.io.StringReader; import java.util.ArrayList; import java.util.Collections; -import java.util.HashMap; import java.util.Hashtable; import java.util.List; -import java.util.Map; -import java.util.ServiceLoader; import java.util.Map.Entry; import org.eclipse.osee.framework.core.OrcsTokenService; import org.eclipse.osee.framework.core.data.OrcsTokenServiceImpl; @@ -35,11 +32,8 @@ import org.eclipse.osee.framework.jdk.core.type.Pair; import org.eclipse.osee.framework.jdk.core.util.io.xml.AbstractSaxHandler; import org.eclipse.osee.framework.skynet.core.artifact.ArtifactLoader; import org.osgi.framework.BundleContext; -import org.osgi.framework.BundleException; import org.osgi.framework.ServiceReference; import org.osgi.framework.ServiceRegistration; -import org.osgi.framework.launch.Framework; -import org.osgi.framework.launch.FrameworkFactory; import org.xml.sax.Attributes; import org.xml.sax.InputSource; import org.xml.sax.SAXException; @@ -65,16 +59,15 @@ public class RelationOrderParser { }; private final OrcsTokenService tokenService; - public RelationOrderParser() { - String builtByBazel = System.getProperty("built_by_bazel"); - if(builtByBazel != null && builtByBazel.equals("yes")) { + String builtByBazel = System.getenv("built_by_bazel"); + if (builtByBazel != null && builtByBazel.equals("yes")) { BundleContext context = OsgiUtil.createOsgiBundleContext(); - ServiceRegistration<OrcsTokenService> servReg = context.registerService(OrcsTokenService.class, new OrcsTokenServiceImpl(), new Hashtable()); + ServiceRegistration<OrcsTokenService> servReg = + context.registerService(OrcsTokenService.class, new OrcsTokenServiceImpl(), new Hashtable()); ServiceReference<OrcsTokenService> servRef = servReg.getReference(); tokenService = context.getService(servRef); - } - else { + } else { tokenService = OsgiUtil.getService(ArtifactLoader.class, OrcsTokenService.class); } } @@ -124,7 +117,8 @@ public class RelationOrderParser { sb.append(">"); } - private void writeEntry(StringBuilder sb, Entry<Pair<RelationTypeToken, RelationSide>, Pair<RelationSorter, List<String>>> entry) { + private void writeEntry(StringBuilder sb, + Entry<Pair<RelationTypeToken, RelationSide>, Pair<RelationSorter, List<String>>> entry) { Pair<RelationTypeToken, RelationSide> key = entry.getKey(); sb.append("<"); sb.append("Order "); diff --git a/plugins/org.eclipse.osee.framework.ui.branch.graph/BUILD b/plugins/org.eclipse.osee.framework.ui.branch.graph/BUILD index 766bd3de491..8e08a4b1de3 100644 --- a/plugins/org.eclipse.osee.framework.ui.branch.graph/BUILD +++ b/plugins/org.eclipse.osee.framework.ui.branch.graph/BUILD @@ -74,11 +74,9 @@ java_library( "@maven//:org_apache_activemq_activemq_all", "@maven//:org_mockito_mockito_core", "@maven//:org_hamcrest_hamcrest_core", - "@ext_jars//:eclipse_osgi_services", "@ext_jars//:eclipse_ui", "@ext_jars//:swt", "@ext_jars//:jface", - "@ext_jars//:eclipse_core", "@ext_jars//:eclipse_equinox_common", "@ext_jars//:apache_commons_lang", "@ext_jars//:nebula" diff --git a/plugins/org.eclipse.osee.framework.ui.data.model.editor/BUILD b/plugins/org.eclipse.osee.framework.ui.data.model.editor/BUILD index 7b4bf4279be..116b7b47184 100644 --- a/plugins/org.eclipse.osee.framework.ui.data.model.editor/BUILD +++ b/plugins/org.eclipse.osee.framework.ui.data.model.editor/BUILD @@ -77,13 +77,11 @@ java_library( "@maven//:org_apache_activemq_activemq_all", "@maven//:org_mockito_mockito_core", "@maven//:org_hamcrest_hamcrest_core", - "@ext_jars//:eclipse_osgi_services", "@ext_jars//:eclipse_ui", "@ext_jars//:swt", "@ext_jars//:jface", "@ext_jars//:emf", "@ext_jars//:graphiti", - "@ext_jars//:eclipse_core", "@ext_jars//:eclipse_equinox_common", "@ext_jars//:apache_commons_lang", "@ext_jars//:nebula" diff --git a/plugins/org.eclipse.osee.framework.ui.plugin/BUILD b/plugins/org.eclipse.osee.framework.ui.plugin/BUILD index 855f847b8d2..ffde39c985d 100644 --- a/plugins/org.eclipse.osee.framework.ui.plugin/BUILD +++ b/plugins/org.eclipse.osee.framework.ui.plugin/BUILD @@ -7,7 +7,7 @@ osgi_jar_converter( java_library( name = "org.eclipse.osee.framework.ui.plugin", - resources = ["xml_files", "exsd_files", "img"], + resources = ["resources"], srcs = glob(["**/*.java"]), deps = ["java_deps", "//org.eclipse.osee.framework.core.packages", @@ -37,55 +37,8 @@ java_library( ) filegroup( - name = "xml_files", - srcs = - [ - "plugin.xml" - ], -) - -filegroup( - name = "exsd_files", - srcs = - [ - "OSEE-INF/extensionPts/PropertyStoreControl.exsd", - "OSEE-INF/extensionPts/WorkbenchTargetProvider.exsd", - "OSEE-INF/extensionPts/XNavigateItemProvider.exsd", - "META-INF/MANIFEST.MF" - ], -) - -filegroup( - name = "img", - srcs = - [ - "OSEE-INF/images/admin.gif", - "OSEE-INF/images/browse.gif", - "OSEE-INF/images/bug.gif", - "OSEE-INF/images/chkbox_disabled.gif", - "OSEE-INF/images/chkbox_enabled.gif", - "OSEE-INF/images/edit.gif", - "OSEE-INF/images/errorSm.gif", - "OSEE-INF/images/faq.gif", - "OSEE-INF/images/filter.gif", - "OSEE-INF/images/folder.gif", - "OSEE-INF/images/gear.gif", - "OSEE-INF/images/lockkey.gif", - "OSEE-INF/images/needSave.gif", - "OSEE-INF/images/new.gif", - "OSEE-INF/images/open.gif", - "OSEE-INF/images/osee_16.png", - "OSEE-INF/images/permission.bmp", - "OSEE-INF/images/publish.gif", - "OSEE-INF/images/refresh.gif", - "OSEE-INF/images/remove.gif", - "OSEE-INF/images/report.gif", - "OSEE-INF/images/sample.gif", - "OSEE-INF/images/saved.gif", - "OSEE-INF/images/train.gif", - "OSEE-INF/images/viewMenu.gif", - "OSEE-INF/images/www.gif" - ], + name = "resources", + srcs = glob(["**/*"]) ) java_library( @@ -110,12 +63,17 @@ java_library( "@maven//:org_eclipse_jdt_org_eclipse_jdt_core", "@maven//:org_apache_geronimo_specs_geronimo_jms_1_1_spec", "@maven//:org_apache_activemq_activemq_all", - "@ext_jars//:eclipse_osgi_services", + "@eclipse_osgi//jar", + "@eclipse_osgi_services//jar", + "@eclipse_core_commands//jar", + "@eclipse_core_jobs//jar", + "@eclipse_core_resources//jar", + "@eclipse_core_runtime//jar", + "@eclipse_equinox_common//jar", + "@eclipse_equinox_registry//jar", "@ext_jars//:eclipse_ui", "@ext_jars//:swt", "@ext_jars//:jface", - "@ext_jars//:eclipse_core", - "@ext_jars//:eclipse_equinox_common", "@ext_jars//:help", "@ext_jars//:junit" ], diff --git a/plugins/org.eclipse.osee.framework.ui.product/BUILD b/plugins/org.eclipse.osee.framework.ui.product/BUILD index 5b4b87e03e5..8093634fa85 100644 --- a/plugins/org.eclipse.osee.framework.ui.product/BUILD +++ b/plugins/org.eclipse.osee.framework.ui.product/BUILD @@ -67,13 +67,11 @@ java_library( "@maven//:org_apache_activemq_activemq_all", "@maven//:org_mockito_mockito_core", "@maven//:org_hamcrest_hamcrest_core", - "@ext_jars//:eclipse_osgi_services", "@ext_jars//:eclipse_ui", "@ext_jars//:swt", "@ext_jars//:jface", "@ext_jars//:emf", "@ext_jars//:graphiti", - "@ext_jars//:eclipse_core", "@ext_jars//:eclipse_equinox_common", "@ext_jars//:apache_commons_lang", "@ext_jars//:nebula" diff --git a/plugins/org.eclipse.osee.framework.ui.skynet.test/BUILD b/plugins/org.eclipse.osee.framework.ui.skynet.test/BUILD index 0a5356d8e95..e39895301c2 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet.test/BUILD +++ b/plugins/org.eclipse.osee.framework.ui.skynet.test/BUILD @@ -75,12 +75,12 @@ java_library( "@maven//:org_apache_activemq_activemq_all", "@maven//:org_mockito_mockito_core", "@maven//:org_hamcrest_hamcrest_core", - "@ext_jars//:eclipse_osgi_services", + "@eclipse_core_commands//jar", + "@eclipse_equinox_common//jar", + "@eclipse_core_runtime//jar", "@ext_jars//:eclipse_ui", "@ext_jars//:swt", "@ext_jars//:jface", - "@ext_jars//:eclipse_core", - "@ext_jars//:eclipse_equinox_common", "@ext_jars//:apache_commons_lang", "@ext_jars//:nebula" ], diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/BUILD b/plugins/org.eclipse.osee.framework.ui.skynet/BUILD index 6f93c02c482..fcaf16dc779 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/BUILD +++ b/plugins/org.eclipse.osee.framework.ui.skynet/BUILD @@ -7,7 +7,7 @@ osgi_jar_converter( java_library( name = "org.eclipse.osee.framework.ui.skynet", - resources = ["src-img","manifest","osgi-inf","osee-inf"], + resources = ["resources"], srcs = glob(["**/*.java"]), deps = ["java_deps", "//org.eclipse.osee.framework.core.packages", @@ -44,29 +44,9 @@ java_library( ) filegroup( - name = "manifest", - srcs = - [ - "META-INF/MANIFEST.MF" - ], -) - -filegroup( - name = "osee-inf", - srcs = - glob([ - "OSEE-INF/*" - ]), -) - -filegroup( - name = "src-img", - srcs = glob(["**/*.gif",]), -) - -filegroup( - name = "osgi-inf", - srcs = glob(["OSGI-INF/*"]) + name = "resources", + srcs = glob(["**/*"]) + ) java_library( @@ -99,12 +79,25 @@ java_library( "@maven//:com_vladsch_flexmark_flexmark_ext_tables", "@maven//:com_vladsch_flexmark_flexmark_util_ast", "@maven//:com_vladsch_flexmark_flexmark", - "@ext_jars//:eclipse_osgi_services", + "@eclipse_core_resources//jar", + "@eclipse_core_commands//jar", + "@eclipse_core_runtime//jar", + "@eclipse_core_jobs//jar", + "@eclipse_core_filesystem//jar", + "@eclipse_equinox_common//jar", + "@eclipse_equinox_preferences//jar", + "@eclipse_equinox_app//jar", + "@eclipse_equinox_registry//jar", + "@eclipse_osgi//jar", + "@eclipse_osgi_services//jar", + "@eclipse_zest_core//jar", + "@eclipse_zest_layouts//jar", + "@eclipse_debug_core//jar", + "@eclipse_search//jar", + "@eclipse_compare//jar", "@ext_jars//:eclipse_ui", "@ext_jars//:swt", "@ext_jars//:jface", - "@ext_jars//:eclipse_core", - "@ext_jars//:eclipse_equinox_common", "@ext_jars//:apache_commons_lang", "@ext_jars//:nebula" ], diff --git a/plugins/org.eclipse.osee.framework.ui.swt/BUILD b/plugins/org.eclipse.osee.framework.ui.swt/BUILD index a1ec8903ca8..a2948994b58 100644 --- a/plugins/org.eclipse.osee.framework.ui.swt/BUILD +++ b/plugins/org.eclipse.osee.framework.ui.swt/BUILD @@ -37,10 +37,11 @@ java_library( "@maven//:javax_mail_mail", "@maven//:org_antlr_antlr_runtime", "@maven//:com_google_guava_guava", - "@ext_jars//:eclipse_equinox_common", + "@eclipse_equinox_common//jar", + "@eclipse_core_commands//jar", + "@eclipse_core_runtime//jar", "@ext_jars//:swt", "@ext_jars//:jface", "@ext_jars//:eclipse_ui", - "@ext_jars//:eclipse_core" ], ) diff --git a/plugins/org.eclipse.osee.framework.ui.ws/BUILD b/plugins/org.eclipse.osee.framework.ui.ws/BUILD index 45904c567eb..b06a384185e 100644 --- a/plugins/org.eclipse.osee.framework.ui.ws/BUILD +++ b/plugins/org.eclipse.osee.framework.ui.ws/BUILD @@ -7,8 +7,9 @@ osgi_jar_converter( java_library( name = "org.eclipse.osee.framework.ui.ws", - srcs = glob(["**/*.java"]), - deps = ["java_deps", + srcs = glob(["**/*.java"]), + resources = ["manifest"], + deps = ["java_deps", "//org.eclipse.osee.framework.core.packages", "//org.eclipse.osee.framework.core.client", "//org.eclipse.osee.framework.plugin.core", @@ -70,11 +71,10 @@ java_library( "@maven//:org_apache_activemq_activemq_all", "@maven//:org_mockito_mockito_core", "@maven//:org_hamcrest_hamcrest_core", - "@ext_jars//:eclipse_osgi_services", + "@eclipse_core_resources//jar", + "@eclipse_equinox_common//jar", "@ext_jars//:eclipse_ui", "@ext_jars//:swt", "@ext_jars//:jface", - "@ext_jars//:eclipse_core", - "@ext_jars//:eclipse_equinox_common", ], ) diff --git a/plugins/org.eclipse.osee.jaxrs.server/BUILD b/plugins/org.eclipse.osee.jaxrs.server/BUILD index ab42140ad22..88a6d9a74f5 100644 --- a/plugins/org.eclipse.osee.jaxrs.server/BUILD +++ b/plugins/org.eclipse.osee.jaxrs.server/BUILD @@ -44,9 +44,9 @@ filegroup( java_library( name = "java_deps", exports = [ - "@maven//:com_fasterxml_jackson_core_jackson_core", - "@maven//:com_fasterxml_jackson_core_jackson_databind", - "@maven//:com_fasterxml_jackson_core_jackson_annotations", + "@maven//:com_fasterxml_jackson_core_jackson_core", + "@maven//:com_fasterxml_jackson_core_jackson_databind", + "@maven//:com_fasterxml_jackson_core_jackson_annotations", "@maven//:com_fasterxml_jackson_jaxrs_jackson_jaxrs_base", "@maven//:com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider", "@maven//:jakarta_xml_bind_jakarta_xml_bind_api", @@ -55,7 +55,7 @@ java_library( "@maven//:org_apache_cxf_cxf_rt_frontend_jaxrs", "@maven//:org_apache_cxf_cxf_rt_rs_client", "@maven//:org_apache_cxf_cxf_rt_rs_security_oauth", - "@maven//:org_apache_cxf_cxf_rt_rs_security_oauth2", + "@maven//:org_apache_cxf_cxf_rt_rs_security_oauth2", "@maven//:org_apache_cxf_cxf_rt_security", "@maven//:org_apache_cxf_cxf_rt_transports_http", "@maven//:org_apache_cxf_cxf_rt_rs_service_description", @@ -68,7 +68,8 @@ java_library( "@maven//:com_google_guava_guava", "@maven//:javax_servlet_javax_servlet_api", "@maven//:javax_annotation_javax_annotation_api", - "@ext_jars//:eclipse_osgi_services", + "@eclipse_osgi//jar", + "@eclipse_osgi_services//jar", "@ext_jars//:poi" ], ) diff --git a/plugins/org.eclipse.osee.jaxrs/BUILD b/plugins/org.eclipse.osee.jaxrs/BUILD index 8c49430d1ac..87688c8123f 100644 --- a/plugins/org.eclipse.osee.jaxrs/BUILD +++ b/plugins/org.eclipse.osee.jaxrs/BUILD @@ -50,7 +50,6 @@ java_library( "@maven//:org_antlr_antlr_runtime", "@maven//:com_google_guava_guava", "@ext_jars//:poi", - "@ext_jars//:javax" ], ) diff --git a/plugins/org.eclipse.osee.jdbc.test/BUILD b/plugins/org.eclipse.osee.jdbc.test/BUILD index 8b4b5718435..e49e2312ffb 100644 --- a/plugins/org.eclipse.osee.jdbc.test/BUILD +++ b/plugins/org.eclipse.osee.jdbc.test/BUILD @@ -2,6 +2,6 @@ java_test( name = "AllJdbcTestSuite", resources = ["src/org/eclipse/osee/jdbc/migration/V1__JdbcTest.sql"], srcs = glob(["**/*.java"]), - deps = ["//org.eclipse.osee.jdbc", "//org.eclipse.osee.framework.core.packages","@ext_jars//:eclipse_osgi_services", + deps = ["//org.eclipse.osee.jdbc", "//org.eclipse.osee.framework.core.packages","@eclipse_osgi_services//jar", "@maven//:org_mockito_mockito_core"] ) diff --git a/plugins/org.eclipse.osee.jdbc/BUILD b/plugins/org.eclipse.osee.jdbc/BUILD index 748a252d887..87ceb883bb8 100644 --- a/plugins/org.eclipse.osee.jdbc/BUILD +++ b/plugins/org.eclipse.osee.jdbc/BUILD @@ -44,7 +44,7 @@ java_library( "@maven//:org_antlr_antlr_runtime", "@maven//:com_google_guava_guava", "@maven//:org_hsqldb_hsqldb", - "@ext_jars//:eclipse_osgi_services", "@ext_jars//:apache_commons_lang", + "@eclipse_osgi_services//jar" ], ) diff --git a/plugins/org.eclipse.osee.logger.slf4j/BUILD b/plugins/org.eclipse.osee.logger.slf4j/BUILD index d34e901dc90..d376652cb86 100644 --- a/plugins/org.eclipse.osee.logger.slf4j/BUILD +++ b/plugins/org.eclipse.osee.logger.slf4j/BUILD @@ -22,9 +22,6 @@ filegroup( java_library( name = "java_deps", - exports = [ - "@maven//:org_slf4j_slf4j_api", - "@ext_jars//:eclipse_osgi_services" - ], + exports = ["@maven//:org_slf4j_slf4j_api","@eclipse_osgi//jar","@eclipse_osgi_services//jar"], ) diff --git a/plugins/org.eclipse.osee.mim/BUILD b/plugins/org.eclipse.osee.mim/BUILD index 50d25f68776..d16bd638453 100644 --- a/plugins/org.eclipse.osee.mim/BUILD +++ b/plugins/org.eclipse.osee.mim/BUILD @@ -52,10 +52,7 @@ java_library( "@maven//:io_swagger_core_v3_swagger_jaxrs2", "@maven//:org_apache_cxf_cxf_rt_frontend_jaxrs", "@maven//:io_swagger_core_v3_swagger_models", - "@ext_jars//:eclipse_osgi_services", "@ext_jars//:nebula", - "@ext_jars//:eclipse_core", "@ext_jars//:apache_commons_lang", - "@ext_jars//:eclipse_equinox_common" ], ) diff --git a/plugins/org.eclipse.osee.orcs.db/BUILD b/plugins/org.eclipse.osee.orcs.db/BUILD index 495a6d1bdc8..da0bbf7e750 100644 --- a/plugins/org.eclipse.osee.orcs.db/BUILD +++ b/plugins/org.eclipse.osee.orcs.db/BUILD @@ -39,8 +39,10 @@ java_library( "@maven//:javax_mail_mail", "@maven//:org_antlr_antlr_runtime", "@maven//:com_google_guava_guava", - "@ext_jars//:eclipse_equinox_common", - "@ext_jars//:eclipse_osgi_services", + "@eclipse_osgi//jar", + "@eclipse_osgi_services//jar", + "@eclipse_core_runtime//jar", + "@eclipse_equinox_common//jar", "@ext_jars//:apache_commons_lang" ], ) diff --git a/plugins/org.eclipse.osee.orcs.rest/BUILD b/plugins/org.eclipse.osee.orcs.rest/BUILD index 350f08bc1a8..89b0e19669a 100644 --- a/plugins/org.eclipse.osee.orcs.rest/BUILD +++ b/plugins/org.eclipse.osee.orcs.rest/BUILD @@ -54,9 +54,9 @@ java_library( "@maven//:io_swagger_core_v3_swagger_core", "@maven//:io_swagger_core_v3_swagger_jaxrs2", "@maven//:io_swagger_core_v3_swagger_models", - "@ext_jars//:eclipse_equinox_common", - "@ext_jars//:eclipse_osgi_services", - "@ext_jars//:eclipse_core" + "@eclipse_osgi_services//jar", + "@eclipse_core_runtime//jar", + "@eclipse_equinox_common//jar" ], ) diff --git a/plugins/org.eclipse.osee.ote.define/BUILD b/plugins/org.eclipse.osee.ote.define/BUILD index 39ce5b22b46..23b5c9d442c 100644 --- a/plugins/org.eclipse.osee.ote.define/BUILD +++ b/plugins/org.eclipse.osee.ote.define/BUILD @@ -62,12 +62,17 @@ java_library( "@maven//:org_apache_activemq_activemq_all", "@maven//:org_mockito_mockito_core", "@maven//:org_hamcrest_hamcrest_core", - "@ext_jars//:eclipse_osgi_services", + "@eclipse_core_resources//jar", + "@eclipse_core_jobs//jar", + "@eclipse_core_runtime//jar", + "@eclipse_equinox_common//jar", + "@eclipse_equinox_registry//jar", + "@eclipse_osgi//jar", + "@eclipse_core_filesystem//jar", + "@eclipse_core_filebuffers//jar", "@ext_jars//:eclipse_ui", "@ext_jars//:swt", "@ext_jars//:jface", - "@ext_jars//:eclipse_core", - "@ext_jars//:eclipse_equinox_common", "@ext_jars//:apache_commons_lang", "@ext_jars//:nebula" ], diff --git a/plugins/org.eclipse.osee.ote.ui.define/BUILD b/plugins/org.eclipse.osee.ote.ui.define/BUILD index f0815d887b7..045a84ba191 100644 --- a/plugins/org.eclipse.osee.ote.ui.define/BUILD +++ b/plugins/org.eclipse.osee.ote.ui.define/BUILD @@ -88,11 +88,9 @@ java_library( "@maven//:org_apache_activemq_activemq_all", "@maven//:org_mockito_mockito_core", "@maven//:org_hamcrest_hamcrest_core", - "@ext_jars//:eclipse_osgi_services", "@ext_jars//:eclipse_ui", "@ext_jars//:swt", "@ext_jars//:jface", - "@ext_jars//:eclipse_core", "@ext_jars//:eclipse_equinox_common", "@ext_jars//:apache_commons_lang", "@ext_jars//:nebula" diff --git a/plugins/org.eclipse.osee.server.p2/BUILD b/plugins/org.eclipse.osee.server.p2/BUILD index 30797c9f395..8c8a02f9759 100644 --- a/plugins/org.eclipse.osee.server.p2/BUILD +++ b/plugins/org.eclipse.osee.server.p2/BUILD @@ -1,5 +1,8 @@ + + + genrule( name = "osee_server_zip", srcs = ["//org.eclipse.osee.server.p2:server_plugins","//org.eclipse.osee.server.p2:server_files","//org.eclipse.osee.server.p2:json","//org.eclipse.osee.server.p2:configuration"], @@ -38,7 +41,7 @@ filegroup( "//org.eclipse.osee.framework.jdk.core:osgi_jar", "//org.eclipse.osee.framework.core:osgi_jar", "//org.eclipse.osee.framework.logging:osgi_jar", - "//org.eclipse.osee.logger.slf4j:osgi_jar", + # "//org.eclipse.osee.logger.slf4j:osgi_jar", "//org.eclipse.osee.logger:osgi_jar", "//org.eclipse.osee.framework.resource.management:osgi_jar", "//org.eclipse.osee.framework.server.ide:osgi_jar", @@ -142,24 +145,85 @@ filegroup( "@maven//:org_yaml_snakeyaml", "@maven//:io_github_classgraph_classgraph", "@maven//:org_apache_commons_commons_lang3", + "@maven//:org_apache_commons_commons_math3", "@maven//:org_jsoup_jsoup", + "@maven//:org_slf4j_slf4j_api", + "@maven//:org_apache_ws_xmlschema_xmlschema_core", + "@maven//:org_apache_commons_commons_collections4", + # "@maven//:io_swagger_core_v3_swagger_annotations", + #"@ext_jars//:eclipse_equinox_common", + #"@ext_jars//:eclipse_core", + #"@ext_jars//:emf", + #"@ext_jars//:apache_commons_lang", + #"@ext_jars//:javax", + #"@ext_jars//:nebula", + #"@ext_jars//:rmf", + #"@ext_jars//:eclipse_osgi_services", + #"@ext_jars//:misc", + #"@ext_jars//:poi", + #"@ext_jars//:swagger", "@maven//:net_oauth_core_oauth", - "@ext_jars//:eclipse_equinox_common", - "@ext_jars//:eclipse_core", + # "@maven//:com_google_guava_guava", "@ext_jars//:emf", "@ext_jars//:apache_commons_lang", - "@ext_jars//:javax", + #"@ext_jars//:javax", "@ext_jars//:nebula", "@ext_jars//:rmf", - "@ext_jars//:eclipse_osgi_services", - "@ext_jars//:misc", - "@ext_jars//:poi", - "@ext_jars//:swagger", + #"@ext_jars//:eclipse_osgi_services", + #"@ext_jars//:misc", + #"@ext_jars//:poi", + #"@ext_jars//:swagger", "@ext_jars//:jgit", "@eclipse_core_net//jar", - "@equinox_security//jar", - "@jcraft//jar" - + "@eclipse_compare//jar", + "@eclipse_search//jar", + "@eclipse_osgi_services//jar", + "@eclipse_osgi//jar", + "@eclipse_osgi_util//jar", + "@eclipse_equinox_console//jar", + "@eclipse_equinox_app//jar", + "@eclipse_equinox_preferences//jar", + "@eclipse_equinox_registry//jar", + "@eclipse_equinox_common//jar", + "@eclipse_equinox_launcher//jar", + "@eclipse_debug_core//jar", + "@eclipse_core_filebuffers//jar", + "@eclipse_core_filesystem//jar", + "@eclipse_core_commands//jar", + "@eclipse_core_resources//jar", + "@eclipse_core_jobs//jar", + "@eclipse_core_runtime//jar", + "@eclipse_core_expressions//jar", + "@eclipse_core_contenttype//jar", + "@eclipse_core_variables//jar", + "@eclipse_text//jar", + "@javax_mail//jar", + "@javax_validation//jar", + "@javax_servlet//jar", + "@javax_xml_soap//jar", + "@javax_xml_ws//jar", + "@javax_xml_bind//jar", + "@javax_xml//jar", + "@javax_ws_rs//jar", + "@javax_transaction//jar", + "@javax_activation//jar", + "@javax_annotation//jar", + "@equinox_security//jar", + "@jcraft//jar", + "@apache_commons_codec//jar", + "@apache_xerces//jar", + "@apache_xml_resolver//jar", + "@google_guava//jar", + "@antlr_runtime//jar", + "@slf4j_api//jar", + "@swagger_core//jar", + "@swagger_annotations//jar", + "@swagger_integration//jar", + "@swagger_jaxrs2//jar", + "@swagger_models//jar", + "@apache_poi//jar", + "@apache_poi_ooxml//jar", + "@apache_poi_ooxml.schemas//jar" ], ) diff --git a/plugins/org.eclipse.osee.support.test.util/BUILD b/plugins/org.eclipse.osee.support.test.util/BUILD index af7ba05d33c..a6aa8e74d15 100644 --- a/plugins/org.eclipse.osee.support.test.util/BUILD +++ b/plugins/org.eclipse.osee.support.test.util/BUILD @@ -79,14 +79,12 @@ java_library( "@maven//:org_apache_activemq_activemq_all", "@maven//:org_mockito_mockito_core", "@maven//:org_hamcrest_hamcrest_core", - "@ext_jars//:eclipse_osgi_services", "@ext_jars//:junit", "@ext_jars//:nebula", "@ext_jars//:apache_commons_lang", "@ext_jars//:eclipse_ui", "@ext_jars//:swt", "@ext_jars//:jface", - "@ext_jars//:eclipse_core", "@ext_jars//:eclipse_equinox_common" ], ) diff --git a/plugins/org.eclipse.osee.template.engine.test/BUILD b/plugins/org.eclipse.osee.template.engine.test/BUILD index e303a5ee459..4b7385ba6b6 100644 --- a/plugins/org.eclipse.osee.template.engine.test/BUILD +++ b/plugins/org.eclipse.osee.template.engine.test/BUILD @@ -1,23 +1,12 @@ java_test( name = "OseeTemplateEngineTestSuite", - resources = ["html_files", "css_files", "xml_files"], + resources = ["resources"], srcs = glob(["**/*.java"]), deps = ["//org.eclipse.osee.template.engine","@maven//:org_mockito_mockito_core", "//org.eclipse.osee.framework.jdk.core"] ) filegroup( - name = "html_files", - srcs = glob(["src/org/eclipse/osee/template/engine/html/*.html"]) + name = "resources", + srcs = glob(["**/*"]) ) - -filegroup( - name = "css_files", - srcs = ["src/org/eclipse/osee/template/engine/css/myTest.css"] -) - -filegroup( - name = "xml_files", - srcs = ["src/org/eclipse/osee/template/engine/xml/testWord.xml"] -) - diff --git a/plugins/org.eclipse.osee.template.engine/BUILD b/plugins/org.eclipse.osee.template.engine/BUILD index daa15cf6576..722b72e13e6 100644 --- a/plugins/org.eclipse.osee.template.engine/BUILD +++ b/plugins/org.eclipse.osee.template.engine/BUILD @@ -53,7 +53,6 @@ java_library( "@maven//:javax_mail_mail", "@maven//:org_antlr_antlr_runtime", "@maven//:com_google_guava_guava", - "@ext_jars//:eclipse_osgi_services", - # "@ext_jars//:eclipse_core" + "@eclipse_osgi//jar", ], ) diff --git a/plugins/org.eclipse.osee.testscript/BUILD b/plugins/org.eclipse.osee.testscript/BUILD index 204790b1ac7..7ff4b2eebb8 100644 --- a/plugins/org.eclipse.osee.testscript/BUILD +++ b/plugins/org.eclipse.osee.testscript/BUILD @@ -52,10 +52,7 @@ java_library( "@maven//:io_swagger_core_v3_swagger_jaxrs2", "@maven//:org_apache_cxf_cxf_rt_frontend_jaxrs", "@maven//:io_swagger_core_v3_swagger_models", - "@ext_jars//:eclipse_osgi_services", "@ext_jars//:nebula", - "@ext_jars//:eclipse_core", "@ext_jars//:apache_commons_lang", - "@ext_jars//:eclipse_equinox_common" ], ) |