Skip to content

Commit d81d3e4

Browse files
neoXfirefiliphr
neoXfire
authored and
filiphr
committed
mapstruct#1301 Use Java 8 as baseline for MapStruct
 * Move classes from mapstruct-common into mapstruct * Use Java 8 @repeatable for @mappings and @ValueMappings in the mapstruct module * Add relocation for mapstruct-jdk8 to mapstruct * Use of 1.8 source and target versions from parent POM * Update documentation to match * Update versions of some maven plugin crashing build on Java 8 * Drop JDK 6 & 7 support in integration tests * Remove mapstruct-common module (it was never deployed to Central)
1 parent 20bff96 commit d81d3e4

63 files changed

Lines changed: 36 additions & 854 deletions

File tree

Some content is hidden

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

‎core-common/pom.xml‎

Lines changed: 0 additions & 58 deletions
This file was deleted.

‎core-jdk8/pom.xml‎

Lines changed: 7 additions & 140 deletions
Original file line numberDiff line numberDiff line change
@@ -17,146 +17,13 @@
1717
</parent>
1818

1919
<artifactId>mapstruct-jdk8</artifactId>
20-
<packaging>jar</packaging>
2120
<name>MapStruct Core JDK 8</name>
22-
<description>MapStruct annotations to be used with JDK 8 and later</description>
21+
<description>Deprecated MapStruct artifact containing annotations to be used with JDK 8 and later -
22+
Relocated to mapstruct</description>
23+
<distributionManagement>
24+
<relocation>
25+
<artifactId>mapstruct</artifactId>
26+
</relocation>
27+
</distributionManagement>
2328

24-
<properties>
25-
<common.sources.dir>copied-common-sources</common.sources.dir>
26-
</properties>
27-
28-
<dependencies>
29-
<dependency>
30-
<groupId>${project.groupId}</groupId>
31-
<artifactId>mapstruct-common</artifactId>
32-
<optional>true</optional>
33-
</dependency>
34-
<dependency>
35-
<groupId>junit</groupId>
36-
<artifactId>junit</artifactId>
37-
<scope>test</scope>
38-
</dependency>
39-
<dependency>
40-
<groupId>org.assertj</groupId>
41-
<artifactId>assertj-core</artifactId>
42-
<scope>test</scope>
43-
</dependency>
44-
</dependencies>
45-
46-
<build>
47-
<plugins>
48-
<plugin>
49-
<groupId>org.apache.maven.plugins</groupId>
50-
<artifactId>maven-checkstyle-plugin</artifactId>
51-
<executions>
52-
<execution>
53-
<id>check-style</id>
54-
<phase>verify</phase>
55-
<goals>
56-
<goal>checkstyle</goal>
57-
</goals>
58-
</execution>
59-
</executions>
60-
</plugin>
61-
<plugin>
62-
<groupId>org.apache.maven.plugins</groupId>
63-
<artifactId>maven-source-plugin</artifactId>
64-
<executions>
65-
<execution>
66-
<id>attach-sources</id>
67-
<phase>verify</phase>
68-
<goals>
69-
<goal>jar</goal>
70-
</goals>
71-
</execution>
72-
</executions>
73-
</plugin>
74-
<plugin>
75-
<groupId>org.apache.maven.plugins</groupId>
76-
<artifactId>maven-compiler-plugin</artifactId>
77-
<configuration>
78-
<source>1.8</source>
79-
<target>1.8</target>
80-
</configuration>
81-
</plugin>
82-
<plugin>
83-
<groupId>org.codehaus.mojo</groupId>
84-
<artifactId>build-helper-maven-plugin</artifactId>
85-
<executions>
86-
<execution>
87-
<id>add-copied-common-sources</id>
88-
<phase>generate-sources</phase>
89-
<goals>
90-
<goal>add-source</goal>
91-
</goals>
92-
<configuration>
93-
<sources>
94-
<source>${project.build.directory}/${common.sources.dir}</source>
95-
</sources>
96-
</configuration>
97-
</execution>
98-
</executions>
99-
</plugin>
100-
<plugin>
101-
<groupId>org.apache.maven.plugins</groupId>
102-
<artifactId>maven-resources-plugin</artifactId>
103-
<executions>
104-
<execution>
105-
<id>copy-resources</id>
106-
<phase>process-resources</phase>
107-
<goals>
108-
<goal>copy-resources</goal>
109-
</goals>
110-
<configuration>
111-
<outputDirectory>${project.build.directory}/${common.sources.dir}</outputDirectory>
112-
<resources>
113-
<resource>
114-
<directory>${basedir}/../core-common/src/main/java</directory>
115-
<filtering>false</filtering>
116-
</resource>
117-
</resources>
118-
</configuration>
119-
</execution>
120-
<execution>
121-
<id>copy-mapstruct-license</id>
122-
<phase>prepare-package</phase>
123-
<goals>
124-
<goal>copy-resources</goal>
125-
</goals>
126-
<configuration>
127-
<outputDirectory>${project.build.directory}/classes/META-INF</outputDirectory>
128-
<resources>
129-
<resource>
130-
<directory>${basedir}/..</directory>
131-
<filtering>false</filtering>
132-
<include>LICENSE.txt</include>
133-
</resource>
134-
</resources>
135-
</configuration>
136-
</execution>
137-
</executions>
138-
</plugin>
139-
<plugin>
140-
<groupId>org.apache.felix</groupId>
141-
<artifactId>maven-bundle-plugin</artifactId>
142-
<configuration>
143-
<instructions>
144-
<Automatic-Module-Name>org.mapstruct</Automatic-Module-Name>
145-
</instructions>
146-
</configuration>
147-
</plugin>
148-
<plugin>
149-
<artifactId>maven-jar-plugin</artifactId>
150-
<configuration>
151-
<archive>
152-
<manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
153-
</archive>
154-
</configuration>
155-
</plugin>
156-
<plugin>
157-
<groupId>com.github.siom79.japicmp</groupId>
158-
<artifactId>japicmp-maven-plugin</artifactId>
159-
</plugin>
160-
</plugins>
161-
</build>
16229
</project>

0 commit comments

Comments
 (0)