Skip to content

Commit 6460617

Browse files
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 6460617

File tree

190 files changed

+562
-517
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

190 files changed

+562
-517
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>
Original file line numberDiff line numberDiff line change
@@ -1,59 +1,59 @@
1-
/*
2-
* Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
3-
* the License. You may obtain a copy of the License at
4-
*
5-
* http://www.apache.org/licenses/LICENSE-2.0
6-
*
7-
* Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
8-
* an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
9-
* specific language governing permissions and limitations under the License.
10-
*
11-
* Copyright 2012-2025 the original author or authors.
12-
*/
13-
package org.assertj.assertions.generator.data;
14-
15-
16-
/**
17-
* @author Yvonne Wang
18-
*/
19-
public class Name implements Comparable<Name> {
20-
21-
private String first;
22-
private String last;
23-
24-
public Name() {}
25-
26-
public Name(String first) {
27-
setFirst(first);
28-
}
29-
30-
public Name(String first, String last) {
31-
setFirst(first);
32-
setLast(last);
33-
}
34-
35-
public String getFirst() {
36-
return first;
37-
}
38-
39-
public void setFirst(String first) {
40-
this.first = first;
41-
}
42-
43-
public String getLast() {
44-
return last;
45-
}
46-
47-
public void setLast(String last) {
48-
this.last = last;
49-
}
50-
51-
@Override public String toString() {
52-
return String.format("%s[first='%s', last='%s']", getClass().getSimpleName(), first, last);
53-
}
54-
55-
@Override
56-
public int compareTo(Name o) {
57-
return last.compareTo(o.last);
58-
}
59-
}
1+
/*
2+
* Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
3+
* the License. You may obtain a copy of the License at
4+
*
5+
* http://www.apache.org/licenses/LICENSE-2.0
6+
*
7+
* Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
8+
* an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
9+
* specific language governing permissions and limitations under the License.
10+
*
11+
* Copyright 2012-2025 the original author or authors.
12+
*/
13+
package org.assertj.assertions.generator.data;
14+
15+
16+
/**
17+
* @author Yvonne Wang
18+
*/
19+
public class Name implements Comparable<Name> {
20+
21+
private String first;
22+
private String last;
23+
24+
public Name() {}
25+
26+
public Name(String first) {
27+
setFirst(first);
28+
}
29+
30+
public Name(String first, String last) {
31+
setFirst(first);
32+
setLast(last);
33+
}
34+
35+
public String getFirst() {
36+
return first;
37+
}
38+
39+
public void setFirst(String first) {
40+
this.first = first;
41+
}
42+
43+
public String getLast() {
44+
return last;
45+
}
46+
47+
public void setLast(String last) {
48+
this.last = last;
49+
}
50+
51+
@Override public String toString() {
52+
return String.format("%s[first='%s', last='%s']", getClass().getSimpleName(), first, last);
53+
}
54+
55+
@Override
56+
public int compareTo(Name o) {
57+
return last.compareTo(o.last);
58+
}
59+
}

0 commit comments

Comments
 (0)