diff options
| -rw-r--r-- | bundle-plugin-test/src/test/java/com/yahoo/BundleIT.java | 1 | ||||
| -rw-r--r-- | config-model/pom.xml | 2 | ||||
| -rw-r--r-- | config-model/src/main/java/com/yahoo/config/model/MapConfigModelRegistry.java | 2 | ||||
| -rw-r--r-- | configserver/pom.xml | 22 | ||||
| -rw-r--r-- | jdisc_core_test/integration_test/src/test/java/com/yahoo/jdisc/core/OsgiLogServiceIntegrationTest.java | 2 | ||||
| -rw-r--r-- | pom.xml | 9 |
6 files changed, 21 insertions, 17 deletions
diff --git a/bundle-plugin-test/src/test/java/com/yahoo/BundleIT.java b/bundle-plugin-test/src/test/java/com/yahoo/BundleIT.java index f8c205307e8..f9fbb21d117 100644 --- a/bundle-plugin-test/src/test/java/com/yahoo/BundleIT.java +++ b/bundle-plugin-test/src/test/java/com/yahoo/BundleIT.java @@ -116,6 +116,7 @@ public class BundleIT { assertThat(webInfUrl, containsString("/WEB-INF/web.xml")); } + @SuppressWarnings("unchecked") @Test public void bundle_class_path_mappings_are_generated() throws URISyntaxException { URL mappingsUrl = getClass().getResource("/" + ProjectBundleClassPaths.classPathMappingsFileName()); diff --git a/config-model/pom.xml b/config-model/pom.xml index c1f0af8d871..68975438956 100644 --- a/config-model/pom.xml +++ b/config-model/pom.xml @@ -344,6 +344,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-jar-plugin</artifactId> + <version>3.0.2</version> <executions> <!-- for testing --> <execution> @@ -379,6 +380,7 @@ <classesDirectory>target/test-classes</classesDirectory> <outputDirectory>tmp/</outputDirectory> <finalName>apiplugin</finalName> + <classifier>apiplugin</classifier> <includes> <include>**/test/ApiPlugin.class</include> <include>**/test/ApiService.class</include> diff --git a/config-model/src/main/java/com/yahoo/config/model/MapConfigModelRegistry.java b/config-model/src/main/java/com/yahoo/config/model/MapConfigModelRegistry.java index d47a009928d..9f5e509ba05 100644 --- a/config-model/src/main/java/com/yahoo/config/model/MapConfigModelRegistry.java +++ b/config-model/src/main/java/com/yahoo/config/model/MapConfigModelRegistry.java @@ -56,6 +56,8 @@ public class MapConfigModelRegistry extends ConfigModelRegistry { * @param builders A variable argument list of builders to use in this map * @return a ConfigModelRegistry instance. */ + @SafeVarargs + @SuppressWarnings("varargs") public static ConfigModelRegistry createFromList(ConfigModelBuilder<? extends ConfigModel> ... builders) { return new MapConfigModelRegistry(Arrays.asList(builders)); } diff --git a/configserver/pom.xml b/configserver/pom.xml index c98cc7e7b9c..0351000b760 100644 --- a/configserver/pom.xml +++ b/configserver/pom.xml @@ -206,21 +206,13 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-jar-plugin</artifactId> - <executions> - <execution> - <phase>package</phase> - <goals> - <goal>jar</goal> - </goals> - <configuration> - <archive> - <manifest> - <mainClass>com.yahoo.vespa.config.server.Server</mainClass> - </manifest> - </archive> - </configuration> - </execution> - </executions> + <configuration> + <archive> + <manifest> + <mainClass>com.yahoo.vespa.config.server.Server</mainClass> + </manifest> + </archive> + </configuration> </plugin> <!-- For creating config classes for tests, main config classes created by bundle plugin --> diff --git a/jdisc_core_test/integration_test/src/test/java/com/yahoo/jdisc/core/OsgiLogServiceIntegrationTest.java b/jdisc_core_test/integration_test/src/test/java/com/yahoo/jdisc/core/OsgiLogServiceIntegrationTest.java index 3ec05295750..cd3155191f0 100644 --- a/jdisc_core_test/integration_test/src/test/java/com/yahoo/jdisc/core/OsgiLogServiceIntegrationTest.java +++ b/jdisc_core_test/integration_test/src/test/java/com/yahoo/jdisc/core/OsgiLogServiceIntegrationTest.java @@ -52,10 +52,10 @@ public class OsgiLogServiceIntegrationTest { LogEntry entry = log.nextElement(); assertNotNull(entry); System.err.println("log entry: "+entry.getMessage()+" bundle="+entry.getBundle()); + assertEquals(expectedMessage, entry.getMessage()); assertNull(entry.getBundle()); assertNotNull(entry.getServiceReference()); assertEquals(OsgiLogHandler.toServiceLevel(expectedLevel), entry.getLevel()); - assertEquals(expectedMessage, entry.getMessage()); assertEquals(expectedException, entry.getException()); assertTrue(expectedTimeGE <= entry.getTime()); } @@ -100,6 +100,11 @@ <showDeprecation>false</showDeprecation> <compilerArgs> <arg>-Xlint:all</arg> + <arg>-Xlint:-serial</arg> + <arg>-Xlint:-try</arg> + <arg>-Xlint:-processing</arg> + <arg>-Xlint:-varargs</arg> + <arg>-Werror</arg> </compilerArgs> </configuration> </plugin> @@ -124,7 +129,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-jar-plugin</artifactId> - <version>2.4</version> + <version>3.0.2</version> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> @@ -1058,6 +1063,7 @@ <jersey2.version>2.23.2</jersey2.version> <jetty.version>9.4.4.v20170414</jetty.version> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> + <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> <test.hide>true</test.hide> <doclint>all</doclint> <scala.major-version>2.11</scala.major-version> @@ -1072,6 +1078,7 @@ <module>application-model</module> <module>application-preprocessor</module> <module>bundle-plugin</module> + <module>bundle-plugin-test</module> <module>chain</module> <module>clustercontroller-apps</module> <module>clustercontroller-apputil</module> |