Permalink
Browse files

Version changed.

0.7.0 uploaded to maven central
Some changes in java docs
  • Loading branch information...
harwey committed Jan 24, 2018
1 parent bde37fd commit 27287a5e95be8975ec6f8afb786dde6ae68f5184
Showing with 114 additions and 15 deletions.
  1. +2 −0 .gitignore
  2. +108 −10 pom.xml
  3. +2 −3 src/main/java/ch/ethz/vppserver/ippclient/IppUtil.java
  4. +2 −2 src/main/java/org/cups4j/PrintJob.java
@@ -1,2 +1,4 @@
/target/
/.settings/
/pom.xml.versionsBackup
/pom-2018-01-24.xml
118 pom.xml
@@ -2,10 +2,9 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>org.cups4j</groupId>
<artifactId>cups4j</artifactId>
<version>0.7.0-SNAPSHOT</version>
<version>0.7.1-SNAPSHOT</version>
<packaging>jar</packaging>
<name>cups4j</name>
@@ -30,10 +29,21 @@
<scm>
<connection>scm:git:git://github.com/harwey/cups4j</connection>
<developerConnection>scm:git:git@github.com:harwey/cups4j</developerConnection>
<url>git@github.com:harwey/cups4j.git</url>
<developerConnection>scm:git:ssh://github.com:harwey/cups4j</developerConnection>
<url>http://github.com/harwey/cups4j/tree/master</url>
</scm>
<distributionManagement>
<snapshotRepository>
<id>ossrh</id>
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
</snapshotRepository>
<repository>
<id>ossrh</id>
<url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
</repository>
</distributionManagement>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
@@ -63,7 +73,7 @@
<artifactId>slf4j-api</artifactId>
<version>1.7.25</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
@@ -89,9 +99,11 @@
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>3.0.2</version>
<configuration>
<archive>
<manifest>
@@ -102,35 +114,121 @@
</archive>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<version>3.0.1</version>
<executions>
<execution>
<id>attach-sources</id>
<goals>
<goal>jar</goal>
<goal>jar-no-fork</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>3.0.0</version>
<executions>
<execution>
<id>attach-javadocs</id>
<goals>
<goal>jar</goal>
</goals>
<configuration>
<!-- See profile for JDK8 -->
<additionalparam>-Xdoclint:none</additionalparam>
</configuration>
</execution>
</executions>
<configuration>
<additionalparam>-Xdoclint:none</additionalparam>
</configuration>
</plugin>
</plugins>
</build>
<profiles>
<profile>
<id>release</id>
<build>
<plugins>
<plugin>
<groupId>org.sonatype.plugins</groupId>
<artifactId>nexus-staging-maven-plugin</artifactId>
<version>1.6.7</version>
<extensions>true</extensions>
<configuration>
<serverId>ossrh</serverId>
<nexusUrl>https://oss.sonatype.org/</nexusUrl>
<autoReleaseAfterClose>true</autoReleaseAfterClose>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>3.0.2</version>
<configuration>
<archive>
<manifest>
<addClasspath>true</addClasspath>
<classpathPrefix>lib/</classpathPrefix>
<mainClass>org.cups4j.client.Cups</mainClass>
</manifest>
</archive>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<version>3.0.1</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>3.0.0</version>
<executions>
<execution>
<id>attach-javadocs</id>
<goals>
<goal>jar</goal>
</goals>
<configuration>
<additionalparam>-Xdoclint:none</additionalparam>
</configuration>
</execution>
</executions>
</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>
</profile>
</profiles>
</project>
@@ -26,7 +26,7 @@
*
* See the GNU Lesser General Public License for more details. You should have
* received a copy of the GNU Lesser General Public License along with this
* program; if not, see <http://www.gnu.org/licenses/>.
* program; if not, see http://www.gnu.org/licenses.
*/
public class IppUtil {
@@ -209,8 +209,7 @@ static public String getTranslatedString(String str, String charsetName) throws
/**
* concatenate nio-ByteBuffers
*
* @param buffers
* ArrayList<ByteBuffer>
* @param ArrayList <ByteBuffer> buffers
* @return ByteBuffer
*/
public static ByteBuffer concatenateBytebuffers(ArrayList<ByteBuffer> buffers) {
@@ -93,7 +93,7 @@ public Builder copies(int copies) {
/**
* Page ranges
*
* @pageRanges pageRanges 1-3, 5, 8, 10-13
* @param String pageRanges 1-3, 5, 8, 10-13
* @return Builder
*/
public Builder pageRanges(String pageRanges) {
@@ -194,7 +194,7 @@ public Builder resolution(String resolution) {
* );
* </p>
* <p>
* -> take a look config/ippclient/list-of-attributes.xml for more
* take a look config/ippclient/list-of-attributes.xml for more
* information
* </p>
*

0 comments on commit 27287a5

Please sign in to comment.