reset scm at parent level, comment sample module and constant in artifactId
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1232112 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/webconsole-plugins/servicediagnostics/core/pom.xml b/webconsole-plugins/servicediagnostics/core/pom.xml
index 71d2742..e80d0c6 100644
--- a/webconsole-plugins/servicediagnostics/core/pom.xml
+++ b/webconsole-plugins/servicediagnostics/core/pom.xml
@@ -9,17 +9,11 @@
<relativePath>../pom.xml</relativePath>
</parent>
- <artifactId>${project.groupId}.servicediagnostics.plugin</artifactId>
+ <artifactId>org.apache.felix.servicediagnostics.plugin</artifactId>
<packaging>bundle</packaging>
<version>0.1.0-SNAPSHOT</version>
<name>Apache Felix Web Console Service Diagnostics Plugin</name>
- <scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/felix/trunk/webconsole-plugins/servicediagnostics/core</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/felix/trunk/webconsole-plugins/servicediagnostics/core</developerConnection>
- <url>http://svn.apache.org/viewvc/felix/trunk/webconsole-plugins/servicediagnostics/core</url>
- </scm>
-
<dependencies>
<dependency>
<groupId>org.apache.felix</groupId>
diff --git a/webconsole-plugins/servicediagnostics/pom.xml b/webconsole-plugins/servicediagnostics/pom.xml
index 17cba31..f512ab6 100644
--- a/webconsole-plugins/servicediagnostics/pom.xml
+++ b/webconsole-plugins/servicediagnostics/pom.xml
@@ -37,15 +37,15 @@
This is a plugin for the Apache Felix OSGi web console providing a graphical representation of services and missing required dependencies.
</description>
- <!--scm>
+ <scm>
<connection>scm:svn:http://svn.apache.org/repos/asf/felix/trunk/webconsole-plugins/servicediagnostics</connection>
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/felix/trunk/webconsole-plugins/servicediagnostics</developerConnection>
<url>http://svn.apache.org/viewvc/felix/trunk/webconsole-plugins/servicediagnostics</url>
- </scm-->
+ </scm>
<modules>
<module>core</module>
- <module>sample</module>
+ <!--module>sample</module-->
</modules>
<repositories>
@@ -100,6 +100,7 @@
<plugin>
<groupId>org.scala-tools</groupId>
<artifactId>maven-scala-plugin</artifactId>
+ <version>2.15.2</version>
<executions>
<execution>
<goals>