-
Notifications
You must be signed in to change notification settings - Fork 23
[FME-12892] Add new non-shaded jar #618
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
nmayorsplit
wants to merge
10
commits into
development
Choose a base branch
from
FME-12892
base: development
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
10 commits
Select commit
Hold shift + click to select a range
f1d3113
Merge pull request #612 from splitio/development
chillaq fb6637e
Updated License Year
github-actions[bot] 3b2cd16
Merge pull request #615 from splitio/update-license
chillaq 0b201d9
Added non-shaded
nmayorsplit 2cfc013
Updated CI
nmayorsplit 0180774
Added maven opt in ci
nmayorsplit 39f90b8
Updated ci settings
nmayorsplit 515dda4
Updated ci
nmayorsplit 228487a
Updated ci settings
nmayorsplit f6dc82c
Updated settings and ci workflow
nmayorsplit File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -5,9 +5,10 @@ | |
| <parent> | ||
| <groupId>io.split.client</groupId> | ||
| <artifactId>java-client-parent</artifactId> | ||
| <version>4.18.2</version> | ||
| <version>4.18.3-rc</version> | ||
| </parent> | ||
| <version>4.18.2</version> | ||
|
|
||
| <version>4.18.3-rc</version> | ||
| <artifactId>java-client</artifactId> | ||
| <packaging>jar</packaging> | ||
| <name>Java Client</name> | ||
|
|
@@ -47,6 +48,24 @@ | |
| <target>${maven.compiler.target}</target> | ||
| </configuration> | ||
| </plugin> | ||
| <plugin> | ||
| <groupId>org.apache.maven.plugins</groupId> | ||
| <artifactId>maven-jar-plugin</artifactId> | ||
| <version>3.3.0</version> | ||
| <executions> | ||
| <execution> | ||
| <id>non-shaded-jar</id> | ||
| <phase>package</phase> | ||
| <goals> | ||
| <goal>jar</goal> | ||
| </goals> | ||
| <configuration> | ||
| <classifier>non-shaded</classifier> | ||
| </configuration> | ||
| </execution> | ||
| </executions> | ||
| </plugin> | ||
|
|
||
| <!-- Shade dependencies to avoid conflicts with other customer's libs --> | ||
| <plugin> | ||
| <groupId>org.apache.maven.plugins</groupId> | ||
|
|
@@ -81,8 +100,8 @@ | |
| </includes> | ||
| </artifactSet> | ||
| <transformers> | ||
| <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer" /> | ||
| <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer" /> | ||
| <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer"/> | ||
| <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/> | ||
| </transformers> | ||
| <relocations> | ||
| <relocation> | ||
|
|
@@ -106,10 +125,7 @@ | |
| <filter> | ||
| <artifact>*:*</artifact> | ||
| <excludes> | ||
| <exclude>META-INF/license/**</exclude> | ||
| <exclude>META-INF/*</exclude> | ||
| <exclude>META-INF/maven/**</exclude> | ||
| <exclude>META-INF/services/**</exclude> | ||
| <exclude>META-INF/**</exclude> | ||
| <exclude>LICENSE</exclude> | ||
| <exclude>NOTICE</exclude> | ||
| <exclude>/*.txt</exclude> | ||
|
|
@@ -144,7 +160,6 @@ | |
| </resource> | ||
| </resources> | ||
| </build> | ||
|
|
||
| <properties> | ||
| <slf4j.api.version>1.7.36</slf4j.api.version> | ||
| <maven.compiler.source>8</maven.compiler.source> | ||
|
|
@@ -183,7 +198,6 @@ | |
| <artifactId>snakeyaml</artifactId> | ||
| <version>2.0</version> | ||
| </dependency> | ||
|
|
||
| <!-- Test deps --> | ||
| <dependency> | ||
| <groupId>org.apache.commons</groupId> | ||
|
|
@@ -257,4 +271,4 @@ | |
| <scope>test</scope> | ||
| </dependency> | ||
| </dependencies> | ||
| </project> | ||
| </project> | ||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. broken end of file here |
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
artifactory variables below are not needed, we don't have artifactory.