diff options
| -rw-r--r-- | container-core/pom.xml | 1 | ||||
| -rw-r--r-- | container-di/pom.xml | 1 | ||||
| -rw-r--r-- | container-disc/pom.xml | 1 | ||||
| -rw-r--r-- | dist/vespa.spec | 1 | ||||
| -rw-r--r-- | jdisc_core/pom.xml | 9 | ||||
| -rw-r--r-- | lowercasing_test/src/java/.gitignore | 1 | ||||
| -rw-r--r-- | lowercasing_test/src/java/CMakeLists.txt | 9 | ||||
| -rw-r--r-- | standalone-container/pom.xml | 3 | ||||
| -rw-r--r-- | vespabase/CMakeLists.txt | 2 |
9 files changed, 21 insertions, 7 deletions
diff --git a/container-core/pom.xml b/container-core/pom.xml index e9b2d18628d..650c5e87074 100644 --- a/container-core/pom.xml +++ b/container-core/pom.xml @@ -144,6 +144,7 @@ <groupId>com.yahoo.vespa</groupId> <artifactId>vespajlib</artifactId> <version>${project.version}</version> + <scope>provided</scope> <exclusions> <exclusion> <groupId>log4j</groupId> diff --git a/container-di/pom.xml b/container-di/pom.xml index f78cae8f434..0cab901ab9f 100644 --- a/container-di/pom.xml +++ b/container-di/pom.xml @@ -73,6 +73,7 @@ <groupId>com.yahoo.vespa</groupId> <artifactId>vespajlib</artifactId> <version>${project.version}</version> + <scope>provided</scope> <exclusions> <exclusion> <groupId>log4j</groupId> diff --git a/container-disc/pom.xml b/container-disc/pom.xml index f320eb371bb..b94b626da73 100644 --- a/container-disc/pom.xml +++ b/container-disc/pom.xml @@ -94,6 +94,7 @@ <groupId>com.yahoo.vespa</groupId> <artifactId>vespajlib</artifactId> <version>${project.version}</version> + <scope>provided</scope> </dependency> <dependency> <groupId>com.yahoo.vespa</groupId> diff --git a/dist/vespa.spec b/dist/vespa.spec index 32a756b7e2b..ddf3961a2ea 100644 --- a/dist/vespa.spec +++ b/dist/vespa.spec @@ -186,6 +186,7 @@ exit 0 %{_prefix}/libexec/stop-configserver %{_prefix}/var/db/vespa/config_server/serverdb/classes/*.def %{_prefix}/lib/vespa/jars/*.jar +%{_prefix}/lib/perl5/site_perl/Yahoo/Vespa/*.pm %{_prefix}/lib64/*.so %{_prefix}/bin/* %{_prefix}/sbin/* diff --git a/jdisc_core/pom.xml b/jdisc_core/pom.xml index 315a46a65c4..7bd1a54d330 100644 --- a/jdisc_core/pom.xml +++ b/jdisc_core/pom.xml @@ -121,7 +121,13 @@ <scope>compile</scope> </dependency> <dependency> - <!-- This seems odd. Used for export-package parsing. Lazy stuff. Should be separated out. --> + <groupId>com.yahoo.vespa</groupId> + <artifactId>vespajlib</artifactId> + <version>${project.version}</version> + <scope>compile</scope> + </dependency> + <dependency> + <!-- Used for export-package parsing. Ideally, that should have been a separate artifact. --> <groupId>com.yahoo.vespa</groupId> <artifactId>bundle-plugin</artifactId> <version>${project.version}</version> @@ -206,6 +212,7 @@ <argument>${project.build.directory}/dependency/log4j-over-slf4j.jar</argument> <argument>${project.build.directory}/dependency/config-lib.jar</argument> <argument>${project.build.directory}/dependency/yolean.jar</argument> + <argument>${project.build.directory}/dependency/vespajlib.jar</argument> </arguments> </configuration> </execution> diff --git a/lowercasing_test/src/java/.gitignore b/lowercasing_test/src/java/.gitignore index 5dec1497a4f..b9e1611ac9e 100644 --- a/lowercasing_test/src/java/.gitignore +++ b/lowercasing_test/src/java/.gitignore @@ -1,3 +1,4 @@ build.inc classes lowercasing_test.jar +java_code_compiled diff --git a/lowercasing_test/src/java/CMakeLists.txt b/lowercasing_test/src/java/CMakeLists.txt index 5ef6b6b1e92..34b531c2093 100644 --- a/lowercasing_test/src/java/CMakeLists.txt +++ b/lowercasing_test/src/java/CMakeLists.txt @@ -1,5 +1,6 @@ # Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -add_custom_target(lowercasing_test_java ALL - ant -q -buildfile ${CMAKE_CURRENT_SOURCE_DIR}/build.xml >>/dev/null - DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/build.xml ${CMAKE_CURRENT_SOURCE_DIR}/HelloWorld.java -) +add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/java_code_compiled + COMMAND ant -q -buildfile ${CMAKE_CURRENT_SOURCE_DIR}/build.xml >>/dev/null + COMMAND ${CMAKE_COMMAND} -E touch ${CMAKE_CURRENT_BINARY_DIR}/java_code_compiled + DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/build.xml ${CMAKE_CURRENT_SOURCE_DIR}/HelloWorld.java) +add_custom_target(lowercasing_test_java ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/java_code_compiled) diff --git a/standalone-container/pom.xml b/standalone-container/pom.xml index eb5665760c4..b211d196160 100644 --- a/standalone-container/pom.xml +++ b/standalone-container/pom.xml @@ -85,8 +85,7 @@ config-bundle-jar-with-dependencies.jar, config-model-api-jar-with-dependencies.jar, config-model-jar-with-dependencies.jar, - container-disc-jar-with-dependencies.jar, - vespajlib.jar + container-disc-jar-with-dependencies.jar </discPreInstallBundle> <bundleActivator>com.yahoo.container.standalone.StandaloneContainerActivator</bundleActivator> <jdiscPrivilegedActivator>true</jdiscPrivilegedActivator> diff --git a/vespabase/CMakeLists.txt b/vespabase/CMakeLists.txt index 3519ad9274e..def88408fd5 100644 --- a/vespabase/CMakeLists.txt +++ b/vespabase/CMakeLists.txt @@ -35,3 +35,5 @@ vespa_install_script(src/vespa-start-configserver.sh vespa-start-configserver bi vespa_install_script(src/vespa-start-services.sh vespa-start-services bin) vespa_install_script(src/vespa-stop-configserver.sh vespa-stop-configserver bin) vespa_install_script(src/vespa-stop-services.sh vespa-stop-services bin) + +install(FILES src/Defaults.pm DESTINATION lib/perl5/site_perl/Yahoo/Vespa) |