Skip to content

Commit 9faa8b8

Browse files
committed
clean up maven packaging
1 parent 1d47cfb commit 9faa8b8

File tree

1 file changed

+31
-27
lines changed

1 file changed

+31
-27
lines changed

pom.xml

Lines changed: 31 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -82,32 +82,39 @@
8282
<groupId>org.apache.maven.plugins</groupId>
8383
<artifactId>maven-source-plugin</artifactId>
8484
<version>3.3.1</version>
85+
<executions>
86+
<execution>
87+
<id>attach-sources</id>
88+
<goals>
89+
<goal>jar</goal>
90+
</goals>
91+
</execution>
92+
</executions>
8593
</plugin>
86-
94+
8795
<plugin>
88-
<!-- Add Clojure sources to the project's source directories -->
89-
<groupId>org.codehaus.mojo</groupId>
90-
<artifactId>build-helper-maven-plugin</artifactId>
91-
<version>3.0.0</version>
96+
<groupId>org.apache.maven.plugins</groupId>
97+
<artifactId>maven-javadoc-plugin</artifactId>
98+
<version>3.11.2</version>
99+
<configuration>
100+
<doclint>none</doclint>
101+
</configuration>
92102
<executions>
93103
<execution>
94-
<id>add-clojure-source-dirs</id>
95-
<phase>generate-sources</phase>
104+
<id>attach-javadocs</id>
96105
<goals>
97-
<goal>add-source</goal>
98-
<goal>add-resource</goal>
106+
<goal>jar</goal>
99107
</goals>
100-
<configuration>
101-
<sources>
102-
<source>${clojure.source.dir}</source>
103-
</sources>
104-
<resources>
105-
<resource>
106-
<directory>${clojure.source.dir}</directory>
107-
</resource>
108-
</resources>
109-
</configuration>
110108
</execution>
109+
</executions>
110+
</plugin>
111+
112+
<plugin>
113+
<!-- Add Clojure sources to the project's source directories -->
114+
<groupId>org.codehaus.mojo</groupId>
115+
<artifactId>build-helper-maven-plugin</artifactId>
116+
<version>3.0.0</version>
117+
<executions>
111118
<execution>
112119
<id>add-clojure-test-source-dirs</id>
113120
<phase>generate-sources</phase>
@@ -117,11 +124,11 @@
117124
</goals>
118125
<configuration>
119126
<sources>
120-
<source>${clojure.testSource.dir}</source>
127+
<source>test</source>
121128
</sources>
122129
<resources>
123130
<resource>
124-
<directory>${clojure.testSource.dir}</directory>
131+
<directory>test</directory>
125132
</resource>
126133
</resources>
127134
</configuration>
@@ -135,9 +142,6 @@
135142
<version>1.7.1</version>
136143
<extensions>true</extensions>
137144
<configuration>
138-
<sourceDirectories>
139-
<sourceDirectory>src</sourceDirectory>
140-
</sourceDirectories>
141145
<testSourceDirectories>
142146
<testSourceDirectory>test</testSourceDirectory>
143147
</testSourceDirectories>
@@ -160,10 +164,10 @@
160164

161165
<plugin>
162166
<artifactId>maven-compiler-plugin</artifactId>
163-
<version>3.6.0</version>
167+
<version>3.14.0</version>
164168
<configuration>
165-
<source>1.8</source>
166-
<target>1.8</target>
169+
<source>${maven.compiler.release}</source>
170+
<target>${maven.compiler.release}</target>
167171
<encoding>${project.build.sourceEncoding}</encoding>
168172
</configuration>
169173
</plugin>

0 commit comments

Comments
 (0)