Skip to content

Commit

Permalink
cleanup pom names and added nexus staging maven plugin. preparing for…
Browse files Browse the repository at this point in the history 
… release (#28)
  • Loading branch information
Ken Gullaksen committed Nov 6, 2014
1 parent 328af13 commit 44af060
Show file tree
Hide file tree
Showing 4 changed files with 165 additions and 153 deletions.
4 changes: 2 additions & 2 deletions android/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
Expand All @@ -9,7 +9,7 @@
</parent>
<artifactId>android</artifactId>
<packaging>jar</packaging>
<name>android</name>
<name>QRGen-android</name>

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
Expand Down
4 changes: 2 additions & 2 deletions core/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
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>

Expand All @@ -11,7 +11,7 @@

<artifactId>core</artifactId>
<packaging>jar</packaging>
<name>QRGen</name>
<name>QRGen-core</name>
<description>a simple QRCode generation api for java built on top ZXING</description>
<url>http://kenglxn.github.io/QRGen/</url>

Expand Down
152 changes: 76 additions & 76 deletions javase/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -1,86 +1,86 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
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>
<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
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>

<parent>
<groupId>net.glxn.qrgen</groupId>
<artifactId>qrgen-parent</artifactId>
<version>2.0-SNAPSHOT</version>
</parent>
<parent>
<groupId>net.glxn.qrgen</groupId>
<artifactId>qrgen-parent</artifactId>
<version>2.0-SNAPSHOT</version>
</parent>

<artifactId>javase</artifactId>
<packaging>jar</packaging>
<name>QRGen</name>
<description>a simple QRCode generation api for java built on top ZXING</description>
<url>http://kenglxn.github.io/QRGen/</url>
<artifactId>javase</artifactId>
<packaging>jar</packaging>
<name>QRGen-javase</name>
<description>a simple QRCode generation api for java built on top ZXING</description>
<url>http://kenglxn.github.io/QRGen/</url>

<licenses>
<license>
<name>Apache License v2</name>
<url>http://www.apache.org/licenses/LICENSE-2.0.html</url>
</license>
</licenses>
<licenses>
<license>
<name>Apache License v2</name>
<url>http://www.apache.org/licenses/LICENSE-2.0.html</url>
</license>
</licenses>

<scm>
<connection>scm:git:[email protected]:kenglxn/QRGen.git</connection>
<developerConnection>scm:git:[email protected]:kenglxn/QRGen.git</developerConnection>
<url>[email protected]:kenglxn/QRGen.git</url>
</scm>
<scm>
<connection>scm:git:[email protected]:kenglxn/QRGen.git</connection>
<developerConnection>scm:git:[email protected]:kenglxn/QRGen.git</developerConnection>
<url>[email protected]:kenglxn/QRGen.git</url>
</scm>

<developers>
<developer>
<name>Ken Gullaksen</name>
<email>[email protected]</email>
</developer>
</developers>
<developers>
<developer>
<name>Ken Gullaksen</name>
<email>[email protected]</email>
</developer>
</developers>

<build>
<plugins>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<version>${maven-compiler-plugin.version}</version>
<configuration>
<source>${maven-compiler-plugin.source}</source>
<target>${maven-compiler-plugin.target}</target>
<encoding>UTF-8</encoding>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<executions>
<execution>
<goals>
<goal>jar</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<executions>
<execution>
<goals>
<goal>jar</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
<build>
<plugins>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<version>${maven-compiler-plugin.version}</version>
<configuration>
<source>${maven-compiler-plugin.source}</source>
<target>${maven-compiler-plugin.target}</target>
<encoding>UTF-8</encoding>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<executions>
<execution>
<goals>
<goal>jar</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<executions>
<execution>
<goals>
<goal>jar</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>

<dependencies>
<dependency>
<groupId>com.google.zxing</groupId>
<artifactId>javase</artifactId>
</dependency>
<dependency>
<groupId>net.glxn.qrgen</groupId>
<artifactId>core</artifactId>
<version>${project.version}</version>
</dependency>
<dependencies>
<dependency>
<groupId>com.google.zxing</groupId>
<artifactId>javase</artifactId>
</dependency>
<dependency>
<groupId>net.glxn.qrgen</groupId>
<artifactId>core</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.jfree</groupId>
<artifactId>jfreesvg</artifactId>
Expand All @@ -89,6 +89,6 @@
<groupId>junit</groupId>
<artifactId>junit</artifactId>
</dependency>
</dependencies>
</dependencies>

</project>
158 changes: 85 additions & 73 deletions pom.xml
View file
Original file line number Diff line number Diff line change
@@ -1,66 +1,68 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
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>
<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
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>

<parent>
<groupId>org.sonatype.oss</groupId>
<artifactId>oss-parent</artifactId>
<version>7</version>
</parent>
<parent>
<groupId>org.sonatype.oss</groupId>
<artifactId>oss-parent</artifactId>
<version>7</version>
</parent>

<groupId>net.glxn.qrgen</groupId>
<artifactId>qrgen-parent</artifactId>
<version>2.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>QRGen-parent</name>
<description>a simple QRCode generation api for java built on top ZXING</description>
<url>http://kenglxn.github.io/QRGen/</url>
<groupId>net.glxn.qrgen</groupId>
<artifactId>qrgen-parent</artifactId>
<version>2.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>QRGen-parent</name>
<description>a simple QRCode generation api for java built on top ZXING</description>
<url>http://kenglxn.github.io/QRGen/</url>

<licenses>
<license>
<name>Apache License v2</name>
<url>http://www.apache.org/licenses/LICENSE-2.0.html</url>
</license>
</licenses>
<licenses>
<license>
<name>Apache License v2</name>
<url>http://www.apache.org/licenses/LICENSE-2.0.html</url>
</license>
</licenses>

<scm>
<connection>scm:git:[email protected]:kenglxn/QRGen.git</connection>
<developerConnection>scm:git:[email protected]:kenglxn/QRGen.git</developerConnection>
<url>[email protected]:kenglxn/QRGen.git</url>
</scm>
<scm>
<connection>scm:git:[email protected]:kenglxn/QRGen.git</connection>
<developerConnection>scm:git:[email protected]:kenglxn/QRGen.git</developerConnection>
<url>[email protected]:kenglxn/QRGen.git</url>
</scm>

<developers>
<developer>
<name>Ken Gullaksen</name>
<email>[email protected]</email>
</developer>
</developers>
<developers>
<developer>
<name>Ken Gullaksen</name>
<email>[email protected]</email>
</developer>
</developers>

<modules>
<module>core</module>
<module>javase</module>
<module>android</module>
</modules>
<modules>
<module>core</module>
<module>javase</module>
<module>android</module>
</modules>

<properties>
<zxing.version>3.1.0</zxing.version>
<properties>
<zxing.version>3.1.0</zxing.version>
<jfree.svg.version>2.1</jfree.svg.version>
<junit.version>4.8.2</junit.version>
<robolectric.version>2.2</robolectric.version>
<fest-android.version>1.0.7</fest-android.version>
<android.platform.version>4.1.1.4</android.platform.version>
<maven-compiler-plugin.source>1.7</maven-compiler-plugin.source>
<maven-compiler-plugin.target>1.7</maven-compiler-plugin.target>
<maven-compiler-plugin.version>2.3.2</maven-compiler-plugin.version>
</properties>
<junit.version>4.8.2</junit.version>
<robolectric.version>2.2</robolectric.version>
<fest-android.version>1.0.7</fest-android.version>
<android.platform.version>4.1.1.4</android.platform.version>
<maven-compiler-plugin.source>1.7</maven-compiler-plugin.source>
<maven-compiler-plugin.target>1.7</maven-compiler-plugin.target>
<maven-compiler-plugin.version>2.3.2</maven-compiler-plugin.version>
<maven-checkstyle-plugin.version>2.12.1</maven-checkstyle-plugin.version>
<nexus-staging-maven-plugin.version>1.6.3</nexus-staging-maven-plugin.version>
</properties>

<reporting>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
<version>2.12.1</version>
<version>${maven-checkstyle-plugin.version}</version>
<configuration>
<configLocation>checkstyle.xml</configLocation>
</configuration>
Expand All @@ -75,31 +77,41 @@
</plugins>
</reporting>

<build>
<plugins>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<version>${maven-compiler-plugin.version}</version>
<configuration>
<source>${maven-compiler-plugin.source}</source>
<target>${maven-compiler-plugin.target}</target>
<encoding>UTF-8</encoding>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<executions>
<execution>
<goals>
<goal>jar</goal>
</goals>
</execution>
</executions>
</plugin>

</plugins>
</build>
<build>
<plugins>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<version>${maven-compiler-plugin.version}</version>
<configuration>
<source>${maven-compiler-plugin.source}</source>
<target>${maven-compiler-plugin.target}</target>
<encoding>UTF-8</encoding>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<executions>
<execution>
<goals>
<goal>jar</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.sonatype.plugins</groupId>
<artifactId>nexus-staging-maven-plugin</artifactId>
<version>${nexus-staging-maven-plugin.version}</version>
<extensions>true</extensions>
<configuration>
<serverId>ossrh</serverId>
<nexusUrl>https://oss.sonatype.org/</nexusUrl>
<autoReleaseAfterClose>true</autoReleaseAfterClose>
</configuration>
</plugin>
</plugins>
</build>

<dependencyManagement>
<dependencies>
Expand Down

0 comments on commit 44af060

Please sign in to comment.