Skip to content
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.

Sign up for GitHub

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

Jump to bottom

OC-102: trying to fix package relocations, #263

Merged
merged 7 commits into from
Jul 5, 2024
Merged

OC-102: trying to fix package relocations, #263

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
b3d08fa
OC-102: trying to fix package relocations, as classes in top-level pa…
marek-parfianowicz Jul 2, 2024
4b7fde6
OC-102: changed inclusion patterns to ** as single * caused only top-…
marek-parfianowicz Jul 3, 2024
27dd85e
OC-102: use repacked clover instead of clover-core by org.openclover.…
marek-parfianowicz Jul 3, 2024
dee29e0
OC-102: hide VelocityContext behind VelocityContextBuilder as there a…
marek-parfianowicz Jul 3, 2024
226576d
OC-102: delete jarjar as it's no longer needed
marek-parfianowicz Jul 3, 2024
6f1b503
OC-102: disable minification to isolate a problem of broken velocity;…
marek-parfianowicz Jul 4, 2024
eca4204
OC-102: enable minification, but tune configuration; we must keep all…
marek-parfianowicz Jul 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .github/workflows/A-build-and-test-jdk11.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@ jobs:

- name: Prepare third party libraries
run: |
mvn --batch-mode install -f clover-core-libs/jarjar/pom.xml
mvn --batch-mode install -Pworkspace-setup -f clover-core-libs/pom.xml
mvn --batch-mode install -Pworkspace-setup -f clover-eclipse-libs/pom.xml
mvn --batch-mode install -Pworkspace-setup -f clover-idea-libs/pom.xml
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/A-build-and-test-jdk17.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@ jobs:

- name: Prepare third party libraries
run: |
mvn --batch-mode install -f clover-core-libs/jarjar/pom.xml
mvn --batch-mode install -Pworkspace-setup -f clover-core-libs/pom.xml
mvn --batch-mode install -Pworkspace-setup -f clover-eclipse-libs/pom.xml
mvn --batch-mode install -Pworkspace-setup -f clover-idea-libs/pom.xml
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/A-build-and-test-jdk21.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@ jobs:

- name: Prepare third party libraries
run: |
mvn --batch-mode install -f clover-core-libs/jarjar/pom.xml
mvn --batch-mode install -Pworkspace-setup -f clover-core-libs/pom.xml
mvn --batch-mode install -Pworkspace-setup -f clover-eclipse-libs/pom.xml
mvn --batch-mode install -Pworkspace-setup -f clover-idea-libs/pom.xml
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/A-build-and-test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@ jobs:

- name: Prepare third party libraries
run: |
mvn --batch-mode install -f clover-core-libs/jarjar/pom.xml
mvn --batch-mode install -Pworkspace-setup -f clover-core-libs/pom.xml
mvn --batch-mode install -Pworkspace-setup -f clover-eclipse-libs/pom.xml
mvn --batch-mode install -Pworkspace-setup -f clover-idea-libs/pom.xml
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/B-combatibility-tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@ jobs:

- name: Prepare third party libraries
run: |
mvn --batch-mode install -f clover-core-libs/jarjar/pom.xml
mvn --batch-mode install -Pworkspace-setup -f clover-core-libs/pom.xml
mvn --batch-mode install -Pworkspace-setup -f clover-eclipse-libs/pom.xml
mvn --batch-mode install -Pworkspace-setup -f clover-idea-libs/pom.xml
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/D-release-openclover.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@ jobs:

- name: Prepare third party libraries
run: |
mvn --batch-mode install -f clover-core-libs/jarjar/pom.xml
mvn --batch-mode install -Pworkspace-setup -f clover-core-libs/pom.xml
mvn --batch-mode install -Pworkspace-setup -f clover-eclipse-libs/pom.xml
mvn --batch-mode install -Pworkspace-setup -f clover-idea-libs/pom.xml
Expand Down
1 change: 0 additions & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,6 @@ See also:
### Prepare repacked third party libraries

```
mvn install -f clover-core-libs/jarjar/pom.xml
mvn install -Pworkspace-setup -f clover-core-libs/pom.xml
mvn install -Pworkspace-setup -f clover-eclipse-libs/pom.xml
mvn install -Pworkspace-setup -f clover-idea-libs/pom.xml
Expand Down
4 changes: 2 additions & 2 deletions clover-all/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,8 +105,8 @@
<artifactId>jfreechart</artifactId>
</dependency>
<dependency>
<groupId>org.openclover</groupId>
<artifactId>clover-velocity</artifactId>
<groupId>org.apache.velocity</groupId>
<artifactId>velocity</artifactId>
</dependency>
</dependencies>
<build>
Expand Down
108 changes: 0 additions & 108 deletions clover-core-libs/clover-velocity/pom.xml
View file
Open in desktop

This file was deleted.

72 changes: 0 additions & 72 deletions clover-core-libs/jarjar/pom.xml
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion clover-core-libs/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@
<modules>
<module>cajo</module>
<module>fastutil</module>
<module>clover-velocity</module>
</modules>
</profile>
</profiles>
Expand Down
45 changes: 41 additions & 4 deletions clover-core/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,8 +87,8 @@
<artifactId>jfreechart</artifactId>
</dependency>
<dependency>
<groupId>org.openclover</groupId>
<artifactId>clover-velocity</artifactId>
<groupId>org.apache.velocity</groupId>
<artifactId>velocity</artifactId>
</dependency>
<!-- other libraries -->
<dependency>
Expand Down Expand Up @@ -345,7 +345,7 @@
<include>org.jfree:jcommon</include>
<include>jdom:jdom</include>
<include>org.jfree:jfreechart</include>
<include>org.openclover:clover-velocity</include>
<include>org.apache.velocity:velocity</include>
</includes>
</artifactSet>
<filters>
Expand All @@ -357,6 +357,9 @@
</filter>
<filter>
<artifact>commons-collections:commons-collections</artifact>
<includes>
<include>org/apache/commons/collections/**</include>
</includes>
<excludes>
<exclude>META-INF/LICENSE.txt</exclude>
<exclude>META-INF/MANIFEST.MF</exclude>
Expand All @@ -371,6 +374,12 @@
</filter>
<filter>
<artifact>commons-lang:commons-lang</artifact>
<includes>
<!-- used by velocity -->
<include>org/apache/commons/lang/*</include>
<include>org/apache/commons/lang/builder/*</include>
<include>org/apache/commons/lang/text/*</include>
</includes>
<excludes>
<exclude>META-INF/LICENSE.txt</exclude>
<exclude>META-INF/MANIFEST.MF</exclude>
Expand Down Expand Up @@ -401,17 +410,27 @@
<artifact>com.lowagie:itext</artifact>
<excludes>
<exclude>META-INF/MANIFEST.MF</exclude>
<exclude>ant/*</exclude>
<exclude>build.xml</exclude>
</excludes>
</filter>
<filter>
<artifact>org.jfree:jcommon</artifact>
<!-- minification removes resource bundle classes, must include everything, unfortunately -->
<includes>
<include>org/jfree/**</include>
</includes>
<excludes>
<exclude>META-INF/MANIFEST.MF</exclude>
</excludes>
</filter>
<filter>
<artifact>org.jfree:jfreechart</artifact>
<!-- minification removes resource bundle classes, so we must include most packages, unfortunately -->
<includes>
<include>org/jfree/chart/**</include>
<include>org/jfree/data/**</include>
</includes>
<excludes>
<exclude>META-INF/MANIFEST.MF</exclude>
</excludes>
Expand All @@ -420,12 +439,23 @@
<artifact>jdom:jdom</artifact>
<excludes>
<exclude>META-INF/MANIFEST.MF</exclude>
<exclude>META-INF/LICENSE.txt</exclude>
<exclude>META-INF/info.xml</exclude>
</excludes>
</filter>
<filter>
<artifact>org.openclover:clover-velocity</artifact>
<artifact>org.apache.velocity:velocity</artifact>
<includes>
<!-- keep all classes from velocity -->
<include>org/apache/velocity/**</include>
</includes>
<excludes>
<exclude>META-INF/MANIFEST.MF</exclude>
<exclude>META-INF/NOTICE</exclude>
<!-- we have shaded versions of these in src/main/resources -->
<exclude>**/directive.properties</exclude>
<exclude>**/velocity.properties</exclude>
<exclude>**/texen.properties</exclude>
</excludes>
</filter>
</filters>
Expand Down Expand Up @@ -474,6 +504,13 @@
<include>org.apache.commons.lang3.**</include>
</includes>
</relocation>
<relocation>
<pattern>org.apache.velocity</pattern>
<shadedPattern>clover.org.apache.velocity</shadedPattern>
<includes>
<include>org.apache.velocity.**</include>
</includes>
</relocation>
<relocation>
<pattern>org.jdom</pattern>
<shadedPattern>clover.org.jdom</shadedPattern>
Expand Down
Loading