Update POM for OSSRH release; see ticket https://issues.sonatype.org/browse/OSSRH-13979
diff --git a/nb-configuration.xml b/nb-configuration.xml
index 39376a3..f57ca7e 100644
--- a/nb-configuration.xml
+++ b/nb-configuration.xml
@@ -1,32 +1,32 @@
<?xml version="1.0" encoding="UTF-8"?>
<project-shared-configuration>
- <!--
+ <!--
This file contains additional configuration written by modules in the NetBeans IDE.
The configuration is intended to be shared among all the users of project and
therefore it is assumed to be part of version control checkout.
Without this configuration present, some functionality in the IDE may be limited or fail altogether.
-->
- <properties xmlns="http://www.netbeans.org/ns/maven-properties-data/1">
- <!--
+ <properties xmlns="http://www.netbeans.org/ns/maven-properties-data/1">
+ <!--
Properties that influence various parts of the IDE, especially code formatting and the like.
You can copy and paste the single properties, into the pom.xml file and the IDE will pick them up.
That way multiple projects can share the same settings (useful for formatting rules for example).
Any value defined here will override the pom.xml file value but is only applicable to the current project.
-->
- <netbeans.hint.license>intel-license</netbeans.hint.license>
- <org-netbeans-modules-editor-indent.CodeStyle.usedProfile>project</org-netbeans-modules-editor-indent.CodeStyle.usedProfile>
- <org-netbeans-modules-editor-indent.CodeStyle.project.spaces-per-tab>4</org-netbeans-modules-editor-indent.CodeStyle.project.spaces-per-tab>
- <org-netbeans-modules-editor-indent.CodeStyle.project.tab-size>4</org-netbeans-modules-editor-indent.CodeStyle.project.tab-size>
- <org-netbeans-modules-editor-indent.CodeStyle.project.indent-shift-width>4</org-netbeans-modules-editor-indent.CodeStyle.project.indent-shift-width>
- <org-netbeans-modules-editor-indent.CodeStyle.project.expand-tabs>false</org-netbeans-modules-editor-indent.CodeStyle.project.expand-tabs>
- <org-netbeans-modules-editor-indent.CodeStyle.project.text-limit-width>80</org-netbeans-modules-editor-indent.CodeStyle.project.text-limit-width>
- <org-netbeans-modules-editor-indent.CodeStyle.project.text-line-wrap>none</org-netbeans-modules-editor-indent.CodeStyle.project.text-line-wrap>
- <org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.spaces-per-tab>2</org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.spaces-per-tab>
- <org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.tab-size>4</org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.tab-size>
- <org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.indent-shift-width>2</org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.indent-shift-width>
- <org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.expand-tabs>true</org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.expand-tabs>
- <org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.text-limit-width>80</org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.text-limit-width>
- <org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.text-line-wrap>none</org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.text-line-wrap>
- <org-netbeans-modules-editor-indent.text.x-fortran.CodeStyle.project.text-limit-width>132</org-netbeans-modules-editor-indent.text.x-fortran.CodeStyle.project.text-limit-width>
- </properties>
+ <netbeans.hint.license>intel-license</netbeans.hint.license>
+ <org-netbeans-modules-editor-indent.CodeStyle.usedProfile>project</org-netbeans-modules-editor-indent.CodeStyle.usedProfile>
+ <org-netbeans-modules-editor-indent.CodeStyle.project.spaces-per-tab>2</org-netbeans-modules-editor-indent.CodeStyle.project.spaces-per-tab>
+ <org-netbeans-modules-editor-indent.CodeStyle.project.tab-size>2</org-netbeans-modules-editor-indent.CodeStyle.project.tab-size>
+ <org-netbeans-modules-editor-indent.CodeStyle.project.indent-shift-width>2</org-netbeans-modules-editor-indent.CodeStyle.project.indent-shift-width>
+ <org-netbeans-modules-editor-indent.CodeStyle.project.expand-tabs>false</org-netbeans-modules-editor-indent.CodeStyle.project.expand-tabs>
+ <org-netbeans-modules-editor-indent.CodeStyle.project.text-limit-width>80</org-netbeans-modules-editor-indent.CodeStyle.project.text-limit-width>
+ <org-netbeans-modules-editor-indent.CodeStyle.project.text-line-wrap>none</org-netbeans-modules-editor-indent.CodeStyle.project.text-line-wrap>
+ <org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.spaces-per-tab>2</org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.spaces-per-tab>
+ <org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.tab-size>4</org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.tab-size>
+ <org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.indent-shift-width>2</org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.indent-shift-width>
+ <org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.expand-tabs>true</org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.expand-tabs>
+ <org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.text-limit-width>80</org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.text-limit-width>
+ <org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.text-line-wrap>none</org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.text-line-wrap>
+ <org-netbeans-modules-editor-indent.text.x-fortran.CodeStyle.project.text-limit-width>132</org-netbeans-modules-editor-indent.text.x-fortran.CodeStyle.project.text-limit-width>
+ </properties>
</project-shared-configuration>
diff --git a/pom.xml b/pom.xml
index 1fd5e49..ae24a8f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,8 +4,27 @@
<groupId>com.intel.jndn.utils</groupId>
<artifactId>jndn-utils</artifactId>
<version>0.9.3</version>
- <packaging>jar</packaging>
+ <name>jndn-utils</name>
<description>Collection of tools to simplify synchronous and asynchronous data transfer over the NDN network</description>
+ <url>https://github.com/01org/jndn-utils</url>
+ <packaging>jar</packaging>
+ <licenses>
+ <license>
+ <name>LGPL v3</name>
+ <url>https://www.gnu.org/licenses/lgpl.html</url>
+ </license>
+ </licenses>
+ <developers>
+ <developer>
+ <name>Andrew Brown</name>
+ <url>http://github.com/andrewsbrown</url>
+ </developer>
+ </developers>
+ <scm>
+ <url>https://github.com/01org/jndn-utils</url>
+ <connection>scm:git:git@github.com:01org/jndn-utils.git</connection>
+ <developerConnection>scm:git:git@github.com:01org/jndn-utils.git</developerConnection>
+ </scm>
<dependencies>
<dependency>
<groupId>net.named-data</groupId>
@@ -31,28 +50,61 @@
<maven.compiler.source>1.7</maven.compiler.source>
<maven.compiler.target>1.7</maven.compiler.target>
</properties>
- <repositories>
- <repository>
- <id>ubit-artifactory-or.intel.com</id>
- <name>IT Artifactory (libs)</name>
- <url>https://ubit-artifactory-or.intel.com/artifactory/libs-release-local</url>
- </repository>
- <repository>
- <id>ubit-artifactory-or.intel.com-ext</id>
- <name>IT Artifactory (ext)</name>
- <url>https://ubit-artifactory-or.intel.com/artifactory/ext-releases-local</url>
- </repository>
- </repositories>
- <distributionManagement>
- <repository>
- <id>ubit-artifactory-or.intel.com</id>
- <name>ubit-artifactory-or.intel.com-releases</name>
- <url>https://ubit-artifactory-or.intel.com/artifactory/libs-release-local</url>
- </repository>
- <snapshotRepository>
- <id>ubit-artifactory-or.intel.com</id>
- <name>ubit-artifactory-or.intel.com-snapshots</name>
- <url>https://ubit-artifactory-or.intel.com/artifactory/libs-snapshot-local</url>
- </snapshotRepository>
- </distributionManagement>
+ <build>
+ <plugins>
+ <!-- OSSRH-directed plugins (see http://central.sonatype.org/pages/apache-maven.html) -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-source-plugin</artifactId>
+ <version>2.4</version>
+ <executions>
+ <execution>
+ <id>attach-sources</id>
+ <goals>
+ <goal>jar-no-fork</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <version>2.10.1</version>
+ <executions>
+ <execution>
+ <id>attach-javadocs</id>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.sonatype.plugins</groupId>
+ <artifactId>nexus-staging-maven-plugin</artifactId>
+ <version>1.6.3</version>
+ <extensions>true</extensions>
+ <configuration>
+ <serverId>ossrh</serverId>
+ <stagingProfileId>a80137db01223a</stagingProfileId>
+ <nexusUrl>https://oss.sonatype.org/</nexusUrl>
+ <autoReleaseAfterClose>true</autoReleaseAfterClose>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-gpg-plugin</artifactId>
+ <version>1.5</version>
+ <executions>
+ <execution>
+ <id>sign-artifacts</id>
+ <phase>verify</phase>
+ <goals>
+ <goal>sign</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
</project>
\ No newline at end of file
diff --git a/src/main/java/com/intel/jndn/utils/Client.java b/src/main/java/com/intel/jndn/utils/Client.java
index 0ded051..5f55236 100644
--- a/src/main/java/com/intel/jndn/utils/Client.java
+++ b/src/main/java/com/intel/jndn/utils/Client.java
@@ -46,7 +46,7 @@
}
/**
- * Asynchronously request the Data for an Interest. This will send the
+ * Asynchronously request the Data for an Interest. This will send the
* Interest and return immediately; use futureData.get() to block until the
* Data returns (see FutureData) or manage the event processing independently.
*
diff --git a/src/main/java/com/intel/jndn/utils/InternalFace.java b/src/main/java/com/intel/jndn/utils/InternalFace.java
index 1985902..29f652a 100644
--- a/src/main/java/com/intel/jndn/utils/InternalFace.java
+++ b/src/main/java/com/intel/jndn/utils/InternalFace.java
@@ -12,6 +12,7 @@
/**
* TODO waiting on Face to become overridable
+ *
* @author Andrew Brown <andrew.brown@intel.com>
*/
public class InternalFace {
diff --git a/src/main/java/com/intel/jndn/utils/OnServeInterest.java b/src/main/java/com/intel/jndn/utils/OnServeInterest.java
index 0f235d6..8be4f6a 100644
--- a/src/main/java/com/intel/jndn/utils/OnServeInterest.java
+++ b/src/main/java/com/intel/jndn/utils/OnServeInterest.java
@@ -15,8 +15,10 @@
/**
* Functional interface for serving data from Server.on()
+ *
* @author Andrew Brown <andrew.brown@intel.com>
*/
public interface OnServeInterest {
- public Data onInterest(Name prefix, Interest interest);
+
+ public Data onInterest(Name prefix, Interest interest);
}