Skip to content

Commit e3dba4b

Browse files
scordioscordio
committed
Convert to multimodule project
This change moves the content of `assertj-assertions-generator` to `assertj-generator` and prepares the former for relocation.
1 parent 3392b19 commit e3dba4b

File tree

3 files changed

+207
-162
lines changed

3 files changed

+207
-162
lines changed

‎assertj-assertions-generator/pom.xml‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<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 https://maven.apache.org/xsd/maven-4.0.0.xsd">
3+
<modelVersion>4.0.0</modelVersion>
4+
5+
<parent>
6+
<groupId>org.assertj</groupId>
7+
<artifactId>assertj-generator-build</artifactId>
8+
<version>3.0.0-M5-SNAPSHOT</version>
9+
</parent>
10+
11+
<artifactId>assertj-assertions-generator</artifactId>
12+
13+
<name>AssertJ Assertions Generator</name>
14+
15+
<distributionManagement>
16+
<relocation>
17+
<artifactId>assertj-generator</artifactId>
18+
</relocation>
19+
</distributionManagement>
20+
</project>

‎assertj-generator/pom.xml‎

Lines changed: 174 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,174 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<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 https://maven.apache.org/xsd/maven-4.0.0.xsd">
3+
<modelVersion>4.0.0</modelVersion>
4+
5+
<parent>
6+
<groupId>org.assertj</groupId>
7+
<artifactId>assertj-generator-build</artifactId>
8+
<version>3.0.0-M5-SNAPSHOT</version>
9+
</parent>
10+
11+
<artifactId>assertj-generator</artifactId>
12+
13+
<name>AssertJ Generator</name>
14+
15+
<properties>
16+
<maven.compiler.release>17</maven.compiler.release>
17+
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
18+
<!-- Needed to properly bring in the Maven dependencies, see http://maven.apache.org/surefire/maven-surefire-plugin/examples/class-loading.html -->
19+
<surefire.useSystemClassLoader>false</surefire.useSystemClassLoader>
20+
<!-- Dependency versions overriding -->
21+
<junit-jupiter.version>5.11.1</junit-jupiter.version>
22+
</properties>
23+
24+
<dependencyManagement>
25+
<dependencies>
26+
<dependency>
27+
<groupId>com.google.guava</groupId>
28+
<artifactId>guava</artifactId>
29+
<version>33.4.8-jre</version>
30+
</dependency>
31+
</dependencies>
32+
</dependencyManagement>
33+
<dependencies>
34+
<!-- Compile -->
35+
<dependency>
36+
<groupId>org.apache.commons</groupId>
37+
<artifactId>commons-lang3</artifactId>
38+
<version>3.17.0</version>
39+
</dependency>
40+
<dependency>
41+
<groupId>commons-cli</groupId>
42+
<artifactId>commons-cli</artifactId>
43+
<version>1.9.0</version>
44+
</dependency>
45+
<dependency>
46+
<groupId>com.google.guava</groupId>
47+
<artifactId>guava</artifactId>
48+
</dependency>
49+
<dependency>
50+
<groupId>ch.qos.logback</groupId>
51+
<artifactId>logback-classic</artifactId>
52+
<version>1.5.18</version>
53+
</dependency>
54+
<!-- Test -->
55+
<dependency>
56+
<groupId>com.google.testing.compile</groupId>
57+
<artifactId>compile-testing</artifactId>
58+
<version>0.21.0</version>
59+
<scope>test</scope>
60+
<exclusions>
61+
<exclusion>
62+
<groupId>junit</groupId>
63+
<artifactId>junit</artifactId>
64+
</exclusion>
65+
</exclusions>
66+
</dependency>
67+
<dependency>
68+
<groupId>commons-io</groupId>
69+
<artifactId>commons-io</artifactId>
70+
<version>2.19.0</version>
71+
<scope>test</scope>
72+
</dependency>
73+
<dependency>
74+
<groupId>org.assertj</groupId>
75+
<artifactId>assertj-core</artifactId>
76+
<version>3.27.3</version>
77+
<scope>test</scope>
78+
</dependency>
79+
<dependency>
80+
<groupId>org.junit.jupiter</groupId>
81+
<artifactId>junit-jupiter</artifactId>
82+
<scope>test</scope>
83+
</dependency>
84+
</dependencies>
85+
86+
<build>
87+
<finalName>assertion-generator</finalName>
88+
<plugins>
89+
<plugin>
90+
<groupId>org.apache.maven.plugins</groupId>
91+
<artifactId>maven-assembly-plugin</artifactId>
92+
<version>3.7.1</version>
93+
<executions>
94+
<execution>
95+
<id>unix-assembly</id>
96+
<phase>package</phase>
97+
<goals>
98+
<goal>single</goal>
99+
</goals>
100+
<configuration>
101+
<descriptors>
102+
<descriptor>src/main/resources/assemblies/unix-assembly.xml</descriptor>
103+
</descriptors>
104+
</configuration>
105+
</execution>
106+
<execution>
107+
<!-- override make-assembly defined in parent pom to make windows assembly -->
108+
<id>make-assembly</id>
109+
<phase>package</phase>
110+
<goals>
111+
<goal>single</goal>
112+
</goals>
113+
<configuration>
114+
<descriptors>
115+
<descriptor>src/main/resources/assemblies/windows-assembly.xml</descriptor>
116+
</descriptors>
117+
</configuration>
118+
</execution>
119+
</executions>
120+
</plugin>
121+
<plugin>
122+
<groupId>org.apache.maven.plugins</groupId>
123+
<artifactId>maven-jar-plugin</artifactId>
124+
<configuration>
125+
<archive>
126+
<manifest>
127+
<!-- Classpath is added to the manifest of the created jar file. -->
128+
<addClasspath>true</addClasspath>
129+
<!-- classpath prefix - used to specify that all needed libraries are found under lib/ directory -->
130+
<classpathPrefix>lib/</classpathPrefix>
131+
<mainClass>org.assertj.assertions.generator.cli.AssertionGeneratorLauncher</mainClass>
132+
</manifest>
133+
</archive>
134+
</configuration>
135+
</plugin>
136+
<plugin>
137+
<groupId>org.codehaus.mojo</groupId>
138+
<artifactId>flatten-maven-plugin</artifactId>
139+
<executions>
140+
<execution>
141+
<id>flatten</id>
142+
<phase>process-resources</phase>
143+
<goals>
144+
<goal>flatten</goal>
145+
</goals>
146+
<configuration>
147+
<flattenMode>ossrh</flattenMode>
148+
<pomElements>
149+
<build>remove</build>
150+
</pomElements>
151+
</configuration>
152+
</execution>
153+
<execution>
154+
<id>flatten-clean</id>
155+
<phase>clean</phase>
156+
<goals>
157+
<goal>clean</goal>
158+
</goals>
159+
</execution>
160+
</executions>
161+
</plugin>
162+
<plugin>
163+
<groupId>org.jacoco</groupId>
164+
<artifactId>jacoco-maven-plugin</artifactId>
165+
<configuration>
166+
<excludes>
167+
<exclude>**/AssertionGeneratorLauncher.*</exclude>
168+
</excludes>
169+
<outputDirectory>target/site/jacoco</outputDirectory>
170+
</configuration>
171+
</plugin>
172+
</plugins>
173+
</build>
174+
</project>

‎pom.xml‎

Lines changed: 13 additions & 162 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<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/maven-v4_0_0.xsd ">
2+
<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 https://maven.apache.org/xsd/maven-4.0.0.xsd">
33
<modelVersion>4.0.0</modelVersion>
44

55
<parent>
@@ -8,179 +8,30 @@
88
<version>3.27.3</version>
99
</parent>
1010

11-
<artifactId>assertj-assertions-generator</artifactId>
11+
<artifactId>assertj-generator-build</artifactId>
1212
<version>3.0.0-M5-SNAPSHOT</version>
13+
<packaging>pom</packaging>
1314

14-
<name>AssertJ Assertions Generator</name>
15+
<name>AssertJ Generator Build</name>
16+
17+
<modules>
18+
<module>assertj-assertions-generator</module>
19+
<module>assertj-generator</module>
20+
</modules>
1521

1622
<scm>
17-
<developerConnection>scm:git:https://github.com/assertj/assertj-assertions-generator.git</developerConnection>
18-
<connection>scm:git:https://github.com/assertj/assertj-assertions-generator.git</connection>
19-
<url>https://github.com/assertj/assertj-assertions-generator</url>
23+
<developerConnection>scm:git:https://github.com/assertj/assertj-generator.git</developerConnection>
24+
<connection>scm:git:https://github.com/assertj/assertj-generator.git</connection>
25+
<url>https://github.com/assertj/assertj-generator</url>
2026
<tag>HEAD</tag>
2127
</scm>
2228
<issueManagement>
2329
<system>GitHub</system>
24-
<url>https://github.com/assertj/assertj-assertions-generator/issues</url>
30+
<url>https://github.com/assertj/assertj-generator/issues</url>
2531
</issueManagement>
2632

27-
<properties>
28-
<maven.compiler.release>17</maven.compiler.release>
29-
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
30-
<!-- Needed to properly bring in the Maven dependencies, see http://maven.apache.org/surefire/maven-surefire-plugin/examples/class-loading.html -->
31-
<surefire.useSystemClassLoader>false</surefire.useSystemClassLoader>
32-
<!-- Dependency versions overriding -->
33-
<junit-jupiter.version>5.11.1</junit-jupiter.version>
34-
</properties>
35-
36-
<dependencyManagement>
37-
<dependencies>
38-
<dependency>
39-
<groupId>com.google.guava</groupId>
40-
<artifactId>guava</artifactId>
41-
<version>33.4.8-jre</version>
42-
</dependency>
43-
</dependencies>
44-
</dependencyManagement>
45-
<dependencies>
46-
<!-- Compile -->
47-
<dependency>
48-
<groupId>org.apache.commons</groupId>
49-
<artifactId>commons-lang3</artifactId>
50-
<version>3.17.0</version>
51-
</dependency>
52-
<dependency>
53-
<groupId>commons-cli</groupId>
54-
<artifactId>commons-cli</artifactId>
55-
<version>1.9.0</version>
56-
</dependency>
57-
<dependency>
58-
<groupId>com.google.guava</groupId>
59-
<artifactId>guava</artifactId>
60-
</dependency>
61-
<dependency>
62-
<groupId>ch.qos.logback</groupId>
63-
<artifactId>logback-classic</artifactId>
64-
<version>1.5.18</version>
65-
</dependency>
66-
<!-- Test -->
67-
<dependency>
68-
<groupId>com.google.testing.compile</groupId>
69-
<artifactId>compile-testing</artifactId>
70-
<version>0.21.0</version>
71-
<scope>test</scope>
72-
<exclusions>
73-
<exclusion>
74-
<artifactId>junit</artifactId>
75-
<groupId>junit</groupId>
76-
</exclusion>
77-
</exclusions>
78-
</dependency>
79-
<dependency>
80-
<groupId>commons-io</groupId>
81-
<artifactId>commons-io</artifactId>
82-
<version>2.19.0</version>
83-
<scope>test</scope>
84-
</dependency>
85-
<dependency>
86-
<groupId>org.assertj</groupId>
87-
<artifactId>assertj-core</artifactId>
88-
<version>3.27.3</version>
89-
<scope>test</scope>
90-
</dependency>
91-
<dependency>
92-
<groupId>org.junit.jupiter</groupId>
93-
<artifactId>junit-jupiter</artifactId>
94-
<scope>test</scope>
95-
</dependency>
96-
</dependencies>
97-
9833
<build>
99-
<finalName>assertion-generator</finalName>
10034
<plugins>
101-
<plugin>
102-
<groupId>org.apache.maven.plugins</groupId>
103-
<artifactId>maven-assembly-plugin</artifactId>
104-
<version>3.7.1</version>
105-
<executions>
106-
<execution>
107-
<id>unix-assembly</id>
108-
<phase>package</phase>
109-
<goals>
110-
<goal>single</goal>
111-
</goals>
112-
<configuration>
113-
<descriptors>
114-
<descriptor>src/main/resources/assemblies/unix-assembly.xml</descriptor>
115-
</descriptors>
116-
</configuration>
117-
</execution>
118-
<execution>
119-
<!-- override make-assembly defined in parent pom to make windows assembly -->
120-
<id>make-assembly</id>
121-
<phase>package</phase>
122-
<goals>
123-
<goal>single</goal>
124-
</goals>
125-
<configuration>
126-
<descriptors>
127-
<descriptor>src/main/resources/assemblies/windows-assembly.xml</descriptor>
128-
</descriptors>
129-
</configuration>
130-
</execution>
131-
</executions>
132-
</plugin>
133-
<plugin>
134-
<groupId>org.apache.maven.plugins</groupId>
135-
<artifactId>maven-jar-plugin</artifactId>
136-
<configuration>
137-
<archive>
138-
<manifest>
139-
<!-- Classpath is added to the manifest of the created jar file. -->
140-
<addClasspath>true</addClasspath>
141-
<!-- classpath prefix - used to specify that all needed libraries are found under lib/ directory -->
142-
<classpathPrefix>lib/</classpathPrefix>
143-
<mainClass>org.assertj.assertions.generator.cli.AssertionGeneratorLauncher</mainClass>
144-
</manifest>
145-
</archive>
146-
</configuration>
147-
</plugin>
148-
<plugin>
149-
<groupId>org.codehaus.mojo</groupId>
150-
<artifactId>flatten-maven-plugin</artifactId>
151-
<executions>
152-
<execution>
153-
<id>flatten</id>
154-
<phase>process-resources</phase>
155-
<goals>
156-
<goal>flatten</goal>
157-
</goals>
158-
<configuration>
159-
<flattenMode>ossrh</flattenMode>
160-
<pomElements>
161-
<build>remove</build>
162-
</pomElements>
163-
</configuration>
164-
</execution>
165-
<execution>
166-
<id>flatten-clean</id>
167-
<phase>clean</phase>
168-
<goals>
169-
<goal>clean</goal>
170-
</goals>
171-
</execution>
172-
</executions>
173-
</plugin>
174-
<plugin>
175-
<groupId>org.jacoco</groupId>
176-
<artifactId>jacoco-maven-plugin</artifactId>
177-
<configuration>
178-
<excludes>
179-
<exclude>**/AssertionGeneratorLauncher.*</exclude>
180-
</excludes>
181-
<outputDirectory>target/site/jacoco</outputDirectory>
182-
</configuration>
183-
</plugin>
18435
<plugin>
18536
<groupId>org.sonatype.plugins</groupId>
18637
<artifactId>nexus-staging-maven-plugin</artifactId>

0 commit comments

Comments
 (0)