Skip to content

Commit b48d285

Browse files
sualehsualeh
authored
Merge pull request #8 from schemacrawler/assembly
Use assembly plugin to create the extra lib folder
2 parents 4c71228 + fe875ec commit b48d285

File tree

5 files changed

+58
-67
lines changed

5 files changed

+58
-67
lines changed

‎.github/workflows/quick-build.yml‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,3 +58,11 @@ jobs:
5858
--no-transfer-progress \
5959
--batch-mode \
6060
clean package
61+
62+
- id: upload-extra-lib
63+
name: Upload extra lib
64+
uses: actions/upload-artifact@v4
65+
with:
66+
name: extra-libs
67+
path: ./target/_extra-lib
68+
retention-days: 5

‎.github/workflows/release.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@ jobs:
4949
SchemaCrawler ${{ github.event.release.tag_name }} release at last commit ${{ github.sha }}
5050
See the change history at https://www.schemacrawler.com/changes-report.html
5151
generate_release_notes: true
52+
files: ./target/_extra-lib.zip
5253

5354
# PUBLISH TO CENTRAL REPOSITORY
5455
- id: install-secret-key

‎.gitignore‎

Lines changed: 1 addition & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,4 @@
1-
/schemacrawler-db2/*.jar
2-
/schemacrawler-distrib/*.bnd
3-
/schemacrawler-distrib/*.jar
4-
/schemacrawler-distrib/src/assembly/schemacrawler.pom.asc
5-
/schemacrawler-docs/*.png
6-
/schemacrawler-docs/*.txt
7-
/schemacrawler-docs/*.xml
8-
/schemacrawler-docs/schemacrawler.config.properties.1
9-
/schemacrawler-oracle/*.jar
10-
/schemacrawler-sybaseiq/*.jar
11-
/schemacrawler/*.bnd
12-
/schemacrawler/*.jar
13-
/schemacrawler/gpl-3.0.txt
14-
/schemacrawler/lgpl-3.0.txt
15-
/schemacrawler/src/assembly/schemacrawler.pom.asc
16-
/schemacrawler-examplecode/src/main/java/Issue166.java
17-
/schemacrawler-examplecode/src/main/java/Issue167.java
18-
19-
/schemacrawler-examplecode/derby.log
20-
**/hsqldb.schemacrawler.lck
21-
**/hsqldb.schemacrawler.lobs
22-
**/hsqldb.schemacrawler.log
23-
**/hsqldb.schemacrawler.properties
24-
**/hsqldb.schemacrawler.script
25-
**/derby.log
26-
27-
/schemacrawler-scripting/serialize.*
28-
/schemacrawler-docker-compose/*.pdf
29-
/schemacrawler-docker-compose/*.html
30-
1+
lib/
312
tree.txt
323
**/gpl*.*
334

‎pom.xml‎

Lines changed: 18 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<artifactId>schemacrawler-ai</artifactId>
1313
<packaging>jar</packaging>
1414
<name>SchemaCrawler AI</name>
15-
15+
<description>Integrates SchemaCrawler with AI chat services.</description>
1616
<properties>
1717
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
1818
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
@@ -120,11 +120,13 @@
120120
</configuration>
121121
</plugin>
122122
<plugin>
123+
<inherited>true</inherited>
123124
<groupId>org.apache.maven.plugins</groupId>
124125
<artifactId>maven-compiler-plugin</artifactId>
125126
<configuration>
126127
<source>21</source>
127128
<target>21</target>
129+
<encoding>UTF-8</encoding>
128130
</configuration>
129131
</plugin>
130132
<plugin>
@@ -139,6 +141,7 @@
139141
</goals>
140142
<configuration>
141143
<source>21</source>
144+
<doctitle>SchemaCrawler AI ${project.version}</doctitle>
142145
</configuration>
143146
</execution>
144147
</executions>
@@ -152,47 +155,25 @@
152155
</plugin>
153156
<plugin>
154157
<groupId>org.apache.maven.plugins</groupId>
155-
<artifactId>maven-dependency-plugin</artifactId>
156-
<version>3.8.1</version>
157-
<executions>
158-
<execution>
159-
<id>copy-dependencies</id>
160-
<phase>package</phase>
161-
<goals>
162-
<goal>copy-dependencies</goal>
163-
</goals>
164-
<configuration>
165-
<skipDuringIncrementalBuild></skipDuringIncrementalBuild>
166-
<outputDirectory>${project.build.directory}/lib</outputDirectory>
167-
<includeScope>runtime</includeScope>
168-
<includeTypes>jar</includeTypes>
169-
<excludeGroupIds>org.slf4j,commons-dbutils,us.fatehi,schemacrawler</excludeGroupIds>
170-
</configuration>
171-
</execution>
172-
</executions>
173-
</plugin>
174-
<plugin>
175-
<groupId>org.apache.maven.plugins</groupId>
176-
<artifactId>maven-resources-plugin</artifactId>
177-
<version>3.3.1</version>
158+
<artifactId>maven-assembly-plugin</artifactId>
159+
<configuration>
160+
<descriptors>
161+
<descriptor>src/main/assembly/assembly.xml</descriptor>
162+
</descriptors>
163+
<formats>
164+
<format>dir</format>
165+
<format>zip</format>
166+
</formats>
167+
<appendAssemblyId>false</appendAssemblyId>
168+
<finalName>_extra-lib</finalName>
169+
</configuration>
178170
<executions>
179171
<execution>
180-
<id>copy-artifact</id>
172+
<id>make-assembly</id>
181173
<phase>package</phase>
182174
<goals>
183-
<goal>copy-resources</goal>
175+
<goal>single</goal>
184176
</goals>
185-
<configuration>
186-
<outputDirectory>${project.build.directory}/lib</outputDirectory>
187-
<resources>
188-
<resource>
189-
<directory>${project.build.directory}</directory>
190-
<includes>
191-
<include>${project.build.finalName}.jar</include>
192-
</includes>
193-
</resource>
194-
</resources>
195-
</configuration>
196177
</execution>
197178
</executions>
198179
</plugin>

‎src/main/assembly/assembly.xml‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2"
2+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3+
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2
4+
http://maven.apache.org/xsd/assembly-1.1.2.xsd">
5+
<id>bin</id>
6+
<includeBaseDirectory>false</includeBaseDirectory>
7+
<dependencySets>
8+
<!-- Include only the project artifact -->
9+
<dependencySet>
10+
<outputDirectory>.</outputDirectory>
11+
<useProjectArtifact>true</useProjectArtifact>
12+
<unpack>false</unpack>
13+
<scope>system</scope>
14+
</dependencySet>
15+
<!-- Include only new depdencies from this project,
16+
not dependencies inherited from schemacrawler -->
17+
<dependencySet>
18+
<outputDirectory>.</outputDirectory>
19+
<useProjectArtifact>true</useProjectArtifact>
20+
<unpack>false</unpack>
21+
<scope>runtime</scope>
22+
<excludes>
23+
<exclude>org.slf4j:*</exclude>
24+
<exclude>commons-dbutils:*</exclude>
25+
<exclude>com.fasterxml.jackson.core:*</exclude>
26+
<exclude>us.fatehi:*</exclude>
27+
</excludes>
28+
</dependencySet>
29+
</dependencySets>
30+
</assembly>

0 commit comments

Comments
 (0)