Skip to content

Commit

Permalink
Restructure
Browse files Browse the repository at this point in the history
  • Loading branch information
@fabapp2
fabapp2 committed Nov 28, 2023
1 parent 2b7a6ed commit cfffd75
Show file tree
Hide file tree
Showing 4 changed files with 143 additions and 127 deletions.
1 change: 0 additions & 1 deletion pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@

<modules>
<module>spring-rewrite-commons-launcher</module>
<module>spring-rewrite-commons-functional-tests</module>
<module>spring-rewrite-commons-examples</module>
</modules>

Expand Down
78 changes: 59 additions & 19 deletions spring-rewrite-commons-functional-tests/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -1,15 +1,11 @@
<?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">
<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.springframework.rewrite</groupId>
<artifactId>spring-rewrite-commons</artifactId>
<version>0.1.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

<groupId>org.springframework.rewrite</groupId>
<artifactId>spring-rewrite-commons-functional-tests</artifactId>
<version>0.1.0-SNAPSHOT</version>
<packaging>pom</packaging>

<name>Functional tests for Spring Rewrite Commons</name>
Expand All @@ -24,21 +20,65 @@
<module>private-artifact-repository-tests</module>
</modules>

<properties>
<maven.compiler.source>17</maven.compiler.source>
<maven.compiler.target>17</maven.compiler.target>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

<!-- prod dependencies -->
<spring-boot.version>3.1.3</spring-boot.version>
<rewrite.version>8.5.1</rewrite.version>
<rewrite-maven-plugin.version>5.3.2</rewrite-maven-plugin.version>
<jaxb-api.version>2.3.1</jaxb-api.version>
<rewrite-maven-plugin.version>5.3.2</rewrite-maven-plugin.version>
<jaxb-api.version>2.3.1</jaxb-api.version>

<!-- testing dependencies-->
<maven.version>3.9.1</maven.version>
<maven-resolver.version>1.9.13</maven-resolver.version>
<maven-wagon-http.version>3.5.3</maven-wagon-http.version>
<plexus-cypher.version>1.8</plexus-cypher.version>
<maven-invoker.version>3.2.0</maven-invoker.version>
<junit-pioneer.version>2.1.0</junit-pioneer.version>

<!-- plugins-->
<maven-compiler-plugin.version>3.11.0</maven-compiler-plugin.version>
<maven-surefire-plugin.version>3.0.0-M7</maven-surefire-plugin.version>
<maven-javadoc-plugin.version>3.4.1</maven-javadoc-plugin.version>
<versions-maven-plugin.version>2.16.2</versions-maven-plugin.version>
<maven-jar-plugin.version>3.3.0</maven-jar-plugin.version>
<spring-javaformat-maven-plugin.version>0.0.39</spring-javaformat-maven-plugin.version>
<license-maven-plugin.version>4.1</license-maven-plugin.version>
<lombok-maven-plugin.version>1.18.20.0</lombok-maven-plugin.version>
<artifactory-maven-plugin.version>3.6.1</artifactory-maven-plugin.version>

<!-- Should be same as the Spring managed version -->
<lombok.version.annotationProcessorPath>1.18.28</lombok.version.annotationProcessorPath>
</properties>

<dependencyManagement>
<dependencies>
<!-- <dependency>-->
<!-- <groupId>org.springframework.rewrite</groupId>-->
<!-- <artifactId>spring-rewrite-commons-launcher</artifactId>-->
<!-- <version>0.1.0-SNAPSHOT</version>-->
<!-- </dependency>-->
<!-- <dependency>-->
<!-- <groupId>org.springframework.rewrite</groupId>-->
<!-- <artifactId>spring-rewrite-commons-launcher</artifactId>-->
<!-- <classifier>tests</classifier>-->
<!-- <type>test-jar</type>-->
<!-- <version>0.1.0-SNAPSHOT</version>-->
<!-- <scope>test</scope>-->
<!-- </dependency>-->
<dependency>
<groupId>org.springframework.rewrite</groupId>
<artifactId>spring-rewrite-commons-launcher</artifactId>
<version>0.1.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.springframework.rewrite</groupId>
<artifactId>spring-rewrite-commons-launcher</artifactId>
<classifier>tests</classifier>
<type>test-jar</type>
<version>0.1.0-SNAPSHOT</version>
<scope>test</scope>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-dependencies</artifactId>
<version>${spring-boot.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
</dependencies>

</dependencyManagement>
</project>
164 changes: 68 additions & 96 deletions spring-rewrite-commons-functional-tests/private-artifact-repository-tests/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
<?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">
<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>
Expand All @@ -19,37 +20,6 @@
<url>https://spring.io</url>
</organization>

<properties>

<!-- prod dependencies -->
<spring-boot.version>3.1.3</spring-boot.version>
<rewrite.version>8.5.1</rewrite.version>
<rewrite-maven-plugin.version>5.3.2</rewrite-maven-plugin.version>
<jaxb-api.version>2.3.1</jaxb-api.version>

<!-- testing dependencies -->
<maven.version>3.9.1</maven.version>
<maven-resolver.version>1.9.13</maven-resolver.version>
<maven-wagon-http.version>3.5.3</maven-wagon-http.version>
<plexus-cypher.version>1.8</plexus-cypher.version>
<maven-invoker.version>3.2.0</maven-invoker.version>
<junit-pioneer.version>2.1.0</junit-pioneer.version>

<!-- plugins -->
<maven-compiler-plugin.version>3.11.0</maven-compiler-plugin.version>
<maven-surefire-plugin.version>3.0.0-M7</maven-surefire-plugin.version>
<maven-javadoc-plugin.version>3.4.1</maven-javadoc-plugin.version>
<versions-maven-plugin.version>2.16.2</versions-maven-plugin.version>
<maven-jar-plugin.version>3.3.0</maven-jar-plugin.version>
<spring-javaformat-maven-plugin.version>0.0.39</spring-javaformat-maven-plugin.version>
<license-maven-plugin.version>4.1</license-maven-plugin.version>
<lombok-maven-plugin.version>1.18.20.0</lombok-maven-plugin.version>
<artifactory-maven-plugin.version>3.6.1</artifactory-maven-plugin.version>

<!-- Should be same as the Spring managed version -->
<lombok.version.annotationProcessorPath>1.18.28</lombok.version.annotationProcessorPath>
</properties>

<developers>
<developer>
<id>fkrueger</id>
Expand All @@ -67,8 +37,8 @@
<url>https://github.com/spring-projects/rewrite-commons</url>
<connection>scm:git:https://github.com/spring-projects/spring-rewrite-commons</connection>
<developerConnection>scm:git:https://github.com/spring-projects/spring-rewrite-commons.git</developerConnection>
<tag>spring-rewrite-commons-0.1.0</tag>
</scm>
<tag>spring-rewrite-commons-0.1.0</tag>
</scm>
<issueManagement>
<system>Github Issues</system>
<url>https://github.com/spring-projects/spring-rewrite-commons/issues</url>
Expand Down Expand Up @@ -99,6 +69,7 @@
<dependency>
<groupId>org.springframework.rewrite</groupId>
<artifactId>spring-rewrite-commons-launcher</artifactId>
<version>0.1.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.springframework.rewrite</groupId>
Expand All @@ -120,65 +91,65 @@
<artifactId>spring-boot-configuration-processor</artifactId>
<optional>true</optional>
</dependency>
<dependency>
<groupId>com.squareup.okhttp3</groupId>
<artifactId>okhttp</artifactId>
</dependency>
<dependency>
<groupId>org.openrewrite</groupId>
<artifactId>rewrite-maven</artifactId>
<version>${rewrite.version}</version>
</dependency>
<dependency>
<groupId>org.openrewrite</groupId>
<artifactId>rewrite-java</artifactId>
<version>${rewrite.version}</version>
</dependency>
<dependency>
<groupId>org.openrewrite</groupId>
<artifactId>rewrite-java-17</artifactId>
<version>${rewrite.version}</version>
</dependency>
<dependency>
<groupId>org.openrewrite</groupId>
<artifactId>rewrite-json</artifactId>
<version>${rewrite.version}</version>
</dependency>
<dependency>
<groupId>org.openrewrite</groupId>
<artifactId>rewrite-yaml</artifactId>
<version>${rewrite.version}</version>
</dependency>
<dependency>
<groupId>org.openrewrite</groupId>
<artifactId>rewrite-hcl</artifactId>
<version>${rewrite.version}</version>
</dependency>
<dependency>
<groupId>org.openrewrite</groupId>
<artifactId>rewrite-protobuf</artifactId>
<version>${rewrite.version}</version>
</dependency>
<dependency>
<groupId>org.openrewrite</groupId>
<artifactId>rewrite-xml</artifactId>
<version>${rewrite.version}</version>
</dependency>
<dependency>
<groupId>org.openrewrite</groupId>
<artifactId>rewrite-properties</artifactId>
<version>${rewrite.version}</version>
</dependency>
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
<version>${jaxb-api.version}</version>
</dependency>
<!-- <dependency>-->
<!-- <groupId>com.squareup.okhttp3</groupId>-->
<!-- <artifactId>okhttp</artifactId>-->
<!-- </dependency>-->
<!-- <dependency>-->
<!-- <groupId>org.openrewrite</groupId>-->
<!-- <artifactId>rewrite-maven</artifactId>-->
<!-- <version>${rewrite.version}</version>-->
<!-- </dependency>-->
<!-- <dependency>-->
<!-- <groupId>org.openrewrite</groupId>-->
<!-- <artifactId>rewrite-java</artifactId>-->
<!-- <version>${rewrite.version}</version>-->
<!-- </dependency>-->
<!-- <dependency>-->
<!-- <groupId>org.openrewrite</groupId>-->
<!-- <artifactId>rewrite-java-17</artifactId>-->
<!-- <version>${rewrite.version}</version>-->
<!-- </dependency>-->
<!-- <dependency>-->
<!-- <groupId>org.openrewrite</groupId>-->
<!-- <artifactId>rewrite-json</artifactId>-->
<!-- <version>${rewrite.version}</version>-->
<!-- </dependency>-->
<!-- <dependency>-->
<!-- <groupId>org.openrewrite</groupId>-->
<!-- <artifactId>rewrite-yaml</artifactId>-->
<!-- <version>${rewrite.version}</version>-->
<!-- </dependency>-->
<!-- <dependency>-->
<!-- <groupId>org.openrewrite</groupId>-->
<!-- <artifactId>rewrite-hcl</artifactId>-->
<!-- <version>${rewrite.version}</version>-->
<!-- </dependency>-->
<!-- <dependency>-->
<!-- <groupId>org.openrewrite</groupId>-->
<!-- <artifactId>rewrite-protobuf</artifactId>-->
<!-- <version>${rewrite.version}</version>-->
<!-- </dependency>-->
<!-- <dependency>-->
<!-- <groupId>org.openrewrite</groupId>-->
<!-- <artifactId>rewrite-xml</artifactId>-->
<!-- <version>${rewrite.version}</version>-->
<!-- </dependency>-->
<!-- <dependency>-->
<!-- <groupId>org.openrewrite</groupId>-->
<!-- <artifactId>rewrite-properties</artifactId>-->
<!-- <version>${rewrite.version}</version>-->
<!-- </dependency>-->
<!-- <dependency>-->
<!-- <groupId>org.projectlombok</groupId>-->
<!-- <artifactId>lombok</artifactId>-->
<!-- <scope>provided</scope>-->
<!-- </dependency>-->
<!-- <dependency>-->
<!-- <groupId>javax.xml.bind</groupId>-->
<!-- <artifactId>jaxb-api</artifactId>-->
<!-- <version>${jaxb-api.version}</version>-->
<!-- </dependency>-->
<!-- required by MavenPasswordDecrypter -->
<dependency>
<groupId>org.codehaus.plexus</groupId>
Expand Down Expand Up @@ -357,7 +328,7 @@
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<version>1.18.28</version>
<!-- <version>${lombok.version.annotationProcessorPath}</version>-->
<!-- <version>${lombok.version.annotationProcessorPath}</version>-->
</path>
<path>
<groupId>org.springframework.boot</groupId>
Expand Down Expand Up @@ -399,7 +370,7 @@
<configuration>
<properties>
<owner>the original author or authors.</owner>
<email />
<email/>
<year>2023</year>
</properties>
<licenseSets>
Expand Down Expand Up @@ -493,7 +464,8 @@ limitations under the License.
<goal>jar</goal>
</goals>
<configuration>
<classesDirectory>${project.build.directory}/generated-sources/delomboked</classesDirectory>
<classesDirectory>${project.build.directory}/generated-sources/delomboked
</classesDirectory>
<archive>
<manifestEntries>
<Implementation-Title>${project.artifactId}</Implementation-Title>
Expand Down
Loading

0 comments on commit cfffd75

Please sign in to comment.