Bumps support branch to 1.13.10-rc2
Additionally improves .gitignore
Change-Id: I5bebbdced1b0df2a92b244c92d997ef66478ceb5
diff --git a/.gitignore b/.gitignore
index 8bc2e12..13355ca 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,8 @@
.settings
*.swp
*.iml
+*~
+*.class
+.checkstyle
+target
+.idea
diff --git a/api/pom.xml b/api/pom.xml
index 11a5f95..54c6179 100755
--- a/api/pom.xml
+++ b/api/pom.xml
@@ -49,24 +49,24 @@
</dependencies>
<build>
- <plugins>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <extensions>true</extensions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-source-plugin</artifactId>
- <executions>
- <execution>
- <id>attach-sources</id>
- <goals>
- <goal>jar</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <extensions>true</extensions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-source-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>attach-sources</id>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
</build>
</project>
diff --git a/app/pom.xml b/app/pom.xml
index d486161..ddc7d7b 100755
--- a/app/pom.xml
+++ b/app/pom.xml
@@ -104,7 +104,6 @@
<plugin>
<groupId>org.onosproject</groupId>
<artifactId>onos-maven-plugin</artifactId>
- <version>1.11</version>
</plugin>
<plugin>
<groupId>org.apache.felix</groupId>
diff --git a/pom.xml b/pom.xml
index 6b49347..37b4df4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.onosproject</groupId>
<artifactId>onos-dependencies</artifactId>
- <version>1.13.9-rc4</version>
+ <version>1.13.10-rc2</version>
<relativePath></relativePath>
</parent>
@@ -33,7 +33,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <onos.version>1.13.9-rc4</onos.version>
+ <onos.version>1.13.10-rc2</onos.version>
<onos.app.name>org.opencord.sadis</onos.app.name>
<onos.app.category>Utility</onos.app.category>
<onos.app.title>Subscriber and Access Device Information Service</onos.app.title>
@@ -73,11 +73,23 @@
</dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-checkstyle-plugin</artifactId>
+ <configuration>
+ <sourceDirectories>${project.build.sourceDirectory}</sourceDirectories>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
<repositories>
<repository>
<id>central</id>
<name>Central Repository</name>
- <url>http://repo.maven.apache.org/maven2</url>
+ <url>https://repo.maven.apache.org/maven2</url>
<layout>default</layout>
<snapshots>
<enabled>false</enabled>