Skip to content

Commit

Permalink
#61 - Refactor to use maven multi-module release
Browse files Browse the repository at this point in the history
  • Loading branch information
rbygrave committed Oct 29, 2020
1 parent cc1ded2 commit 905d7e5
Show file tree
Hide file tree
Showing 4 changed files with 32 additions and 47 deletions.
24 changes: 7 additions & 17 deletions inject-generator/pom.xml
Original file line number Diff line number Diff line change
@@ -1,32 +1,22 @@
<?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>

<groupId>io.avaje</groupId>
<artifactId>avaje-inject-generator</artifactId>
<version>1.5-SNAPSHOT</version>

<parent>
<groupId>org.avaje</groupId>
<artifactId>java8-oss</artifactId>
<version>2.2</version>
<groupId>io.avaje</groupId>
<artifactId>avaje-inject-parent</artifactId>
<version>1.5-SNAPSHOT</version>
</parent>

<scm>
<developerConnection>scm:git:git@github.com:avaje/avaje-inject.git</developerConnection>
<tag>HEAD</tag>
</scm>

<properties>
<inject.version>1.4</inject.version>
</properties>
<artifactId>avaje-inject-generator</artifactId>
<name>avaje inject generator</name>
<description>annotation processor generating di as source code</description>

<dependencies>

<dependency>
<groupId>io.avaje</groupId>
<artifactId>avaje-inject</artifactId>
<version>${inject.version}</version>
<version>1.5-SNAPSHOT</version>
</dependency>

<dependency>
Expand Down
19 changes: 6 additions & 13 deletions inject-test/pom.xml
Original file line number Diff line number Diff line change
@@ -1,33 +1,26 @@
<?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>

<groupId>io.avaje</groupId>
<artifactId>avaje-inject-test</artifactId>
<version>1</version>

<parent>
<groupId>org.avaje</groupId>
<artifactId>java8-oss</artifactId>
<version>2.2</version>
<groupId>io.avaje</groupId>
<artifactId>avaje-inject-parent</artifactId>
<version>1.5-SNAPSHOT</version>
</parent>

<properties>
<inject.version>1.4-SNAPSHOT</inject.version>
</properties>
<artifactId>avaje-inject-test</artifactId>

<dependencies>

<dependency>
<groupId>io.avaje</groupId>
<artifactId>avaje-inject</artifactId>
<version>${inject.version}</version>
<version>${project.version}</version>
</dependency>

<dependency>
<groupId>io.avaje</groupId>
<artifactId>avaje-inject-generator</artifactId>
<version>${inject.version}</version>
<version>${project.version}</version>
<scope>provided</scope>
</dependency>

Expand Down
22 changes: 6 additions & 16 deletions inject/pom.xml
Original file line number Diff line number Diff line change
@@ -1,25 +1,15 @@
<?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>

<groupId>io.avaje</groupId>
<artifactId>avaje-inject</artifactId>
<version>1.5-SNAPSHOT</version>

<parent>
<groupId>org.avaje</groupId>
<artifactId>java8-oss</artifactId>
<version>2.2</version>
<groupId>io.avaje</groupId>
<artifactId>avaje-inject-parent</artifactId>
<version>1.5-SNAPSHOT</version>
</parent>

<scm>
<developerConnection>scm:git:git@github.com:avaje/avaje-inject.git</developerConnection>
<tag>HEAD</tag>
</scm>

<properties>
<maven-javadoc-plugin.version>3.2.0</maven-javadoc-plugin.version>
</properties>
<artifactId>avaje-inject</artifactId>
<name>avaje inject</name>
<description>avaje dependency injection library</description>

<dependencies>

Expand Down
14 changes: 13 additions & 1 deletion pom.xml
Original file line number Diff line number Diff line change
@@ -1,11 +1,23 @@
<?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>
<parent>
<groupId>org.avaje</groupId>
<artifactId>java8-oss</artifactId>
<version>2.2</version>
</parent>

<groupId>io.avaje</groupId>
<artifactId>avaje-inject-parent</artifactId>
<version>1</version>
<version>1.5-SNAPSHOT</version>
<packaging>pom</packaging>
<name>avaje inject parent</name>
<description>parent pom for avaje inject library</description>

<scm>
<developerConnection>scm:git:git@github.com:avaje/avaje-inject.git</developerConnection>
<tag>HEAD</tag>
</scm>

<modules>
<module>inject</module>
Expand Down

0 comments on commit 905d7e5

Please sign in to comment.