Skip to content

Commit 765ddf5

Browse files
io7mio7m
committed
Merge branch 'release/0.3.3'
2 parents 84301aa + 40d2edc commit 765ddf5

File tree

5 files changed

+158
-4
lines changed

5 files changed

+158
-4
lines changed

‎net.adoptopenjdk.site/pom.xml

Lines changed: 154 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,154 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
3+
<project xmlns="http://maven.apache.org/POM/4.0.0"
4+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
5+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
6+
7+
<modelVersion>4.0.0</modelVersion>
8+
9+
<parent>
10+
<artifactId>net.adoptopenjdk</artifactId>
11+
<groupId>net.adoptopenjdk</groupId>
12+
<version>0.3.3</version>
13+
</parent>
14+
15+
<artifactId>net.adoptopenjdk.site</artifactId>
16+
17+
<name>net.adoptopenjdk.site</name>
18+
<description>Adopt OpenJDK API (Site)</description>
19+
<url>http://github.com/AdoptOpenJDK/openjdk-api-java-client</url>
20+
21+
<properties>
22+
<mdep.analyze.skip>true</mdep.analyze.skip>
23+
</properties>
24+
25+
<dependencies>
26+
<dependency>
27+
<groupId>${project.groupId}</groupId>
28+
<artifactId>net.adoptopenjdk.v3.api</artifactId>
29+
<version>${project.version}</version>
30+
</dependency>
31+
<dependency>
32+
<groupId>${project.groupId}</groupId>
33+
<artifactId>net.adoptopenjdk.v3.vanilla</artifactId>
34+
<version>${project.version}</version>
35+
</dependency>
36+
37+
<dependency>
38+
<groupId>org.osgi</groupId>
39+
<artifactId>org.osgi.annotation.bundle</artifactId>
40+
<scope>provided</scope>
41+
</dependency>
42+
<dependency>
43+
<groupId>org.osgi</groupId>
44+
<artifactId>org.osgi.annotation.versioning</artifactId>
45+
<scope>provided</scope>
46+
</dependency>
47+
<dependency>
48+
<groupId>org.osgi</groupId>
49+
<artifactId>org.osgi.service.component.annotations</artifactId>
50+
<scope>provided</scope>
51+
</dependency>
52+
<dependency>
53+
<groupId>org.immutables</groupId>
54+
<artifactId>value</artifactId>
55+
<scope>provided</scope>
56+
</dependency>
57+
<dependency>
58+
<groupId>com.io7m.immutables.style</groupId>
59+
<artifactId>com.io7m.immutables.style</artifactId>
60+
<scope>provided</scope>
61+
</dependency>
62+
63+
<dependency>
64+
<groupId>com.io7m.primogenitor</groupId>
65+
<artifactId>com.io7m.primogenitor.support</artifactId>
66+
</dependency>
67+
</dependencies>
68+
69+
<build>
70+
<plugins>
71+
72+
<!-- Copy documentation resources into build directory -->
73+
<plugin>
74+
<groupId>org.apache.maven.plugins</groupId>
75+
<artifactId>maven-resources-plugin</artifactId>
76+
<executions>
77+
<execution>
78+
<id>copy-documentation-resources</id>
79+
<goals>
80+
<goal>copy-resources</goal>
81+
</goals>
82+
<phase>generate-resources</phase>
83+
<configuration>
84+
<outputDirectory>${project.build.directory}/site/</outputDirectory>
85+
<resources>
86+
<resource>
87+
<directory>src/main/resources/</directory>
88+
<filtering>true</filtering>
89+
</resource>
90+
</resources>
91+
</configuration>
92+
</execution>
93+
</executions>
94+
</plugin>
95+
96+
<!-- Unpack sources of dependencies -->
97+
<plugin>
98+
<groupId>org.apache.maven.plugins</groupId>
99+
<artifactId>maven-dependency-plugin</artifactId>
100+
<executions>
101+
<execution>
102+
<id>unpack-sources</id>
103+
<phase>package</phase>
104+
<goals>
105+
<goal>unpack-dependencies</goal>
106+
</goals>
107+
<configuration>
108+
<excludes>module-info.java</excludes>
109+
<includeGroupIds>${project.groupId}</includeGroupIds>
110+
<classifier>sources</classifier>
111+
<failOnMissingClassifierArtifact>false</failOnMissingClassifierArtifact>
112+
<outputDirectory>${project.build.directory}/javadoc-sources</outputDirectory>
113+
</configuration>
114+
</execution>
115+
<execution>
116+
<id>make-classpath</id>
117+
<phase>package</phase>
118+
<goals>
119+
<goal>build-classpath</goal>
120+
</goals>
121+
<configuration>
122+
<outputFile>${project.build.directory}/javadoc-classpath</outputFile>
123+
</configuration>
124+
</execution>
125+
</executions>
126+
</plugin>
127+
128+
<!-- Javadoc handling -->
129+
<plugin>
130+
<groupId>org.codehaus.mojo</groupId>
131+
<artifactId>exec-maven-plugin</artifactId>
132+
<executions>
133+
<execution>
134+
<goals>
135+
<goal>java</goal>
136+
</goals>
137+
<phase>package</phase>
138+
<configuration>
139+
<mainClass>com.io7m.primogenitor.support.TrivialJavadoc</mainClass>
140+
<arguments>
141+
<argument>${project.build.directory}/javadoc-sources</argument>
142+
<argument>${project.build.directory}/javadoc-classpath</argument>
143+
<argument>${project.build.directory}/site/apidocs</argument>
144+
<argument>${project.build.directory}/javadoc-log.txt</argument>
145+
<argument>${project.build.directory}/javadoc-options</argument>
146+
</arguments>
147+
</configuration>
148+
</execution>
149+
</executions>
150+
</plugin>
151+
</plugins>
152+
</build>
153+
154+
</project>

‎net.adoptopenjdk.v3.api/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<parent>
1010
<artifactId>net.adoptopenjdk</artifactId>
1111
<groupId>net.adoptopenjdk</groupId>
12-
<version>0.3.2</version>
12+
<version>0.3.3</version>
1313
</parent>
1414

1515
<artifactId>net.adoptopenjdk.v3.api</artifactId>

‎net.adoptopenjdk.v3.tests/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<parent>
1010
<artifactId>net.adoptopenjdk</artifactId>
1111
<groupId>net.adoptopenjdk</groupId>
12-
<version>0.3.2</version>
12+
<version>0.3.3</version>
1313
</parent>
1414

1515
<artifactId>net.adoptopenjdk.v3.tests</artifactId>

‎net.adoptopenjdk.v3.vanilla/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<parent>
1010
<artifactId>net.adoptopenjdk</artifactId>
1111
<groupId>net.adoptopenjdk</groupId>
12-
<version>0.3.2</version>
12+
<version>0.3.3</version>
1313
</parent>
1414

1515
<artifactId>net.adoptopenjdk.v3.vanilla</artifactId>

‎pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
<groupId>net.adoptopenjdk</groupId>
1616
<artifactId>net.adoptopenjdk</artifactId>
17-
<version>0.3.2</version>
17+
<version>0.3.3</version>
1818
<packaging>pom</packaging>
1919

2020
<name>net.adoptopenjdk</name>

0 commit comments

Comments
 (0)