Skip to content

Commit 9a1e059

Browse files
elahrvivazelahrvivaz
authored
GEOMESA-3532 Drop 'test' jar classifiers to improve build times (#3442)
* Move FileSystemDataStoreParams to top-level class
1 parent df4b8d4 commit 9a1e059

File tree

86 files changed

+1440
-1372
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

86 files changed

+1440
-1372
lines changed

‎.github/workflows/build-and-test.yml‎

Lines changed: 200 additions & 97 deletions
Large diffs are not rendered by default.

‎.github/workflows/dash-scheduled.yml‎

Lines changed: 10 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,11 @@ permissions: # added using https://github.com/step-security/secure-repo
99
contents: read
1010

1111
env:
12+
JAVA_VERSION: 17
1213
MAVEN_CLI_OPTS: -Dhttp.keepAlive=false -Dmaven.wagon.http.pool=false --batch-mode
1314

1415
jobs:
15-
compile:
16+
dash:
1617
runs-on: ubuntu-latest
1718
strategy:
1819
fail-fast: false
@@ -22,37 +23,21 @@ jobs:
2223
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
2324
- uses: actions/setup-java@dded0888837ed1f317902acf8a20df0ad188d165 # v5.0.0
2425
with:
25-
distribution: 'temurin'
26-
java-version: '17'
26+
distribution: temurin
27+
java-version: "${{ env.JAVA_VERSION }}"
2728
- uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
2829
with:
2930
key: ${{ hashFiles('**/pom.xml') }}-dash-scheduled-${{ matrix.version }}
3031
path: ~/.m2/repository/
3132
- name: Set Scala version
3233
run: ./build/scripts/change-scala-version.sh ${{ matrix.version }}
3334
- name: Build with Maven
34-
run: mvn clean install $MAVEN_CLI_OPTS -DskipTests -T4
35-
- name: Collect artifacts
36-
run: |
37-
mv ~/.m2/repository/org/locationtech/geomesa m2-geomesa
38-
tar -czf classes.tgz $(find . -path '*/target/classes' -o -path '*/target/test-classes' -type d | tr '\n' ' ')
39-
- name: Upload artifacts
40-
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
41-
with:
42-
name: classes-and-jars-${{ matrix.version }}
43-
retention-days: 1
44-
path: |
45-
m2-geomesa
46-
classes.tgz
35+
run: mvn clean install -Dmaven.assembly.skip=true -Dmaven.source.skip -T4 $MAVEN_CLI_OPTS
36+
- name: License check
37+
run: mvn org.eclipse.dash:license-tool-plugin:license-check -Ddash.fail=true -Ddash.projectId=locationtech.geomesa -DexcludeGroupIds=org.locationtech.geomesa $MAVEN_CLI_OPTS
38+
- name: Show license
39+
if: success() || failure()
40+
run: cat target/dash/summary
4741
- name: Remove geomesa artifacts
4842
if: success() || failure()
4943
run: rm -rf ~/.m2/repository/org/locationtech/geomesa
50-
dash:
51-
needs: compile
52-
strategy:
53-
fail-fast: false
54-
matrix:
55-
version: [ "2.12", "2.13" ]
56-
uses: ./.github/workflows/dash.yml
57-
with:
58-
scala-version: ${{ matrix.version }}

‎.github/workflows/dash.yml‎

Lines changed: 0 additions & 89 deletions
This file was deleted.

‎.github/workflows/docs.yml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ permissions: # added using https://github.com/step-security/secure-repo
1313
contents: read
1414

1515
env:
16+
JAVA_VERSION: 17
1617
MAVEN_CLI_OPTS: -Dhttp.keepAlive=false -Dmaven.wagon.http.pool=false --batch-mode
1718

1819
jobs:
@@ -22,8 +23,8 @@ jobs:
2223
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
2324
- uses: actions/setup-java@dded0888837ed1f317902acf8a20df0ad188d165 # v5.0.0
2425
with:
25-
distribution: 'temurin'
26-
java-version: '17'
26+
distribution: temurin
27+
java-version: "${{ env.JAVA_VERSION }}"
2728
- uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
2829
with:
2930
key: ${{ hashFiles('**/pom.xml') }}-docs

‎.github/workflows/eclipse-snapshots.yml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ permissions: # added using https://github.com/step-security/secure-repo
1010
contents: read
1111

1212
env:
13+
JAVA_VERSION: 17
1314
MAVEN_CLI_OPTS: -Dhttp.keepAlive=false -Dmaven.wagon.http.pool=false --batch-mode
1415

1516
jobs:
@@ -24,8 +25,8 @@ jobs:
2425
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
2526
- uses: actions/setup-java@dded0888837ed1f317902acf8a20df0ad188d165 # v5.0.0
2627
with:
27-
distribution: 'temurin'
28-
java-version: '17'
28+
distribution: temurin
29+
java-version: "${{ env.JAVA_VERSION }}"
2930
- uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
3031
with:
3132
key: ${{ hashFiles('**/pom.xml') }}-eclipse-snapshots-${{ matrix.version }}

‎.github/workflows/license-headers.yml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ permissions: # added using https://github.com/step-security/secure-repo
1313
contents: read
1414

1515
env:
16+
JAVA_VERSION: 17
1617
MAVEN_CLI_OPTS: -Dhttp.keepAlive=false -Dmaven.wagon.http.pool=false --batch-mode
1718

1819
jobs:
@@ -22,8 +23,8 @@ jobs:
2223
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
2324
- uses: actions/setup-java@dded0888837ed1f317902acf8a20df0ad188d165 # v5.0.0
2425
with:
25-
distribution: 'temurin'
26-
java-version: '17'
26+
distribution: temurin
27+
java-version: "${{ env.JAVA_VERSION }}"
2728
- uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
2829
with:
2930
key: ${{ hashFiles('**/pom.xml') }}-license-header-check

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

Lines changed: 0 additions & 26 deletions
This file was deleted.

‎build/scripts/do-release.sh‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,7 @@ BRANCH="$(git branch --show-current)"
6060
mvn release:prepare \
6161
-DdryRun=true \
6262
-DautoVersionSubmodules=true \
63-
-Darguments="-DskipTests -Dmaven.javadoc.skip=true -Ppython" \
64-
-Ppython
63+
-Darguments="-DskipTests -Dmaven.javadoc.skip=true"
6564

6665
RELEASE="$(readPomVersion pom.xml.tag)"
6766
TAG="$(readReleaseProp scm.tag)"

‎docs/user/upgrade.rst‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -116,8 +116,19 @@ The following modules have been removed:
116116

117117
The following JAR classifiers are no longer published:
118118

119+
* ``geomesa-accumulo-datastore:tests``
120+
* ``geomesa-fs-datastore:tests``
121+
* ``geomesa-hbase-datastore:tests``
122+
* ``geomesa-index-api:tests``
123+
* ``geomesa-kafka-datastore:tests``
119124
* ``geomesa-tools:data``
120125

126+
Deprecated Classes
127+
------------------
128+
129+
* ``org.locationtech.geomesa.fs.data.FileSystemDataStoreFactory.FileSystemDataStoreParams`` - replaced with
130+
``org.locationtech.geomesa.fs.data.FileSystemDataStoreParams``
131+
121132
Version 5.4.0 Upgrade Guide
122133
+++++++++++++++++++++++++++
123134

‎geomesa-accumulo/geomesa-accumulo-datastore/pom.xml‎

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -177,17 +177,6 @@
177177
<groupId>org.apache.maven.plugins</groupId>
178178
<artifactId>maven-failsafe-plugin</artifactId>
179179
</plugin>
180-
<plugin>
181-
<groupId>org.apache.maven.plugins</groupId>
182-
<artifactId>maven-jar-plugin</artifactId>
183-
<executions>
184-
<execution>
185-
<goals>
186-
<goal>test-jar</goal>
187-
</goals>
188-
</execution>
189-
</executions>
190-
</plugin>
191180
</plugins>
192181
</build>
193182

0 commit comments

Comments
 (0)