Skip to content

Commit 758c12e

Browse files
itsankit-googleitsankit-google
authored
Merge pull request #143 from data-integrations/fix-build
[fix build]
2 parents 58878a5 + a96582f commit 758c12e

File tree

2 files changed

+85
-90
lines changed

2 files changed

+85
-90
lines changed

‎.github/workflows/e2e.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ jobs:
4343

4444
steps:
4545
# Pinned 1.0.0 version
46-
- uses: actions/checkout@v3
46+
- uses: actions/checkout@v4
4747
with:
4848
path: plugin
4949
submodules: 'recursive'
@@ -58,13 +58,13 @@ jobs:
5858
e2e-test:
5959
- '**/e2e-test/**'
6060
- name: Checkout e2e test repo
61-
uses: actions/checkout@v3
61+
uses: actions/checkout@v4
6262
with:
6363
repository: cdapio/cdap-e2e-tests
6464
path: e2e
6565

6666
- name: Cache
67-
uses: actions/cache@v3
67+
uses: actions/cache@v4
6868
with:
6969
path: ~/.m2/repository
7070
key: ${{ runner.os }}-maven-${{ github.workflow }}-${{ hashFiles('**/pom.xml') }}
@@ -92,14 +92,14 @@ jobs:
9292
ORACLE_PROJECT_ID : ${{ steps.secrets.outputs.ORACLE_PROJECT_ID }}
9393

9494
- name: Upload report
95-
uses: actions/upload-artifact@v3
95+
uses: actions/upload-artifact@v4
9696
if: always()
9797
with:
9898
name: Cucumber report
9999
path: ./**/target/cucumber-reports
100100

101101
- name: Upload debug files
102-
uses: actions/upload-artifact@v3
102+
uses: actions/upload-artifact@v4
103103
if: always()
104104
with:
105105
name: Debug files

‎pom.xml‎

Lines changed: 80 additions & 85 deletions
Original file line numberDiff line numberDiff line change
@@ -344,91 +344,6 @@
344344
</execution>
345345
</executions>
346346
</plugin>
347-
348-
<!-- Source JAR -->
349-
<plugin>
350-
<groupId>org.apache.maven.plugins</groupId>
351-
<artifactId>maven-source-plugin</artifactId>
352-
<version>2.2.1</version>
353-
<configuration>
354-
<excludeResources>true</excludeResources>
355-
</configuration>
356-
<executions>
357-
<execution>
358-
<id>attach-sources</id>
359-
<phase>package</phase>
360-
<goals>
361-
<goal>jar-no-fork</goal>
362-
</goals>
363-
</execution>
364-
</executions>
365-
</plugin>
366-
367-
<!-- Javadoc jar -->
368-
<plugin>
369-
<groupId>org.apache.maven.plugins</groupId>
370-
<artifactId>maven-javadoc-plugin</artifactId>
371-
<version>2.9.1</version>
372-
<configuration>
373-
<additionalparam>-Xdoclint:none</additionalparam>
374-
<failOnError>false</failOnError>
375-
<links>
376-
<link>http://download.oracle.com/javase/7/docs/api/</link>
377-
</links>
378-
<doctitle>${project.name} ${project.version}</doctitle>
379-
<bottom>
380-
<![CDATA[Copyright &#169; {currentYear} <a href="http://cdap.io" target="_blank">CDAP</a> Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0" target="_blank">Apache License, Version 2.0</a>.]]>
381-
</bottom>
382-
</configuration>
383-
<executions>
384-
<execution>
385-
<id>attach-javadoc</id>
386-
<phase>package</phase>
387-
<goals>
388-
<goal>jar</goal>
389-
</goals>
390-
</execution>
391-
</executions>
392-
</plugin>
393-
<plugin>
394-
<groupId>org.apache.maven.plugins</groupId>
395-
<artifactId>maven-gpg-plugin</artifactId>
396-
<version>1.5</version>
397-
<configuration>
398-
<passphrase>${gpg.passphrase}</passphrase>
399-
<useAgent>${gpg.useagent}</useAgent>
400-
</configuration>
401-
<executions>
402-
<execution>
403-
<goals>
404-
<goal>sign</goal>
405-
</goals>
406-
</execution>
407-
</executions>
408-
</plugin>
409-
<plugin>
410-
<groupId>org.apache.maven.plugins</groupId>
411-
<artifactId>maven-release-plugin</artifactId>
412-
<version>2.5.3</version>
413-
<configuration>
414-
<tag>v${releaseVersion}</tag>
415-
<tagNameFormat>v@{project.version}</tagNameFormat>
416-
<autoVersionSubmodules>true</autoVersionSubmodules>
417-
<!-- releaseProfiles configuration will actually force a Maven profile
418-
– the `releases` profile – to become active during the Release process. -->
419-
<releaseProfiles>releases</releaseProfiles>
420-
</configuration>
421-
</plugin>
422-
<plugin>
423-
<groupId>org.sonatype.plugins</groupId>
424-
<artifactId>nexus-staging-maven-plugin</artifactId>
425-
<version>1.6.14</version>
426-
<extensions>true</extensions>
427-
<configuration>
428-
<nexusUrl>https://oss.sonatype.org</nexusUrl>
429-
<serverId>sonatype.release</serverId>
430-
</configuration>
431-
</plugin>
432347
</plugins>
433348
</build>
434349

@@ -470,6 +385,86 @@
470385
</plugins>
471386
</build>
472387
</profile>
388+
<profile>
389+
<id>release</id>
390+
<build>
391+
<plugins>
392+
<plugin>
393+
<groupId>org.sonatype.plugins</groupId>
394+
<artifactId>nexus-staging-maven-plugin</artifactId>
395+
<version>1.6.14</version>
396+
<extensions>true</extensions>
397+
<configuration>
398+
<nexusUrl>https://oss.sonatype.org</nexusUrl>
399+
<serverId>sonatype.release</serverId>
400+
<stagingProfileId>655dc88dc770c3</stagingProfileId>
401+
</configuration>
402+
</plugin>
403+
<!-- Source JAR -->
404+
<plugin>
405+
<groupId>org.apache.maven.plugins</groupId>
406+
<artifactId>maven-source-plugin</artifactId>
407+
<version>2.2.1</version>
408+
<configuration>
409+
<excludeResources>true</excludeResources>
410+
</configuration>
411+
<executions>
412+
<execution>
413+
<id>attach-sources</id>
414+
<phase>package</phase>
415+
<goals>
416+
<goal>jar-no-fork</goal>
417+
</goals>
418+
</execution>
419+
</executions>
420+
</plugin>
421+
422+
<!-- Javadoc jar -->
423+
<plugin>
424+
<groupId>org.apache.maven.plugins</groupId>
425+
<artifactId>maven-javadoc-plugin</artifactId>
426+
<version>2.9.1</version>
427+
<configuration>
428+
<additionalparam>-Xdoclint:none</additionalparam>
429+
<failOnError>false</failOnError>
430+
<links>
431+
<link>http://download.oracle.com/javase/${jee.version}/docs/api/</link>
432+
</links>
433+
<doctitle>${project.name} ${project.version}</doctitle>
434+
<bottom>
435+
<![CDATA[Copyright &#169; {currentYear} <a href="http://cdap.io" target="_blank">CDAP</a> Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0" target="_blank">Apache License, Version 2.0</a>.]]>
436+
</bottom>
437+
</configuration>
438+
<executions>
439+
<execution>
440+
<id>attach-javadoc</id>
441+
<phase>package</phase>
442+
<goals>
443+
<goal>jar</goal>
444+
</goals>
445+
</execution>
446+
</executions>
447+
</plugin>
448+
449+
<plugin>
450+
<groupId>org.apache.maven.plugins</groupId>
451+
<artifactId>maven-gpg-plugin</artifactId>
452+
<version>1.5</version>
453+
<configuration>
454+
<passphrase>${gpg.passphrase}</passphrase>
455+
<useAgent>${gpg.useagent}</useAgent>
456+
</configuration>
457+
<executions>
458+
<execution>
459+
<goals>
460+
<goal>sign</goal>
461+
</goals>
462+
</execution>
463+
</executions>
464+
</plugin>
465+
</plugins>
466+
</build>
467+
</profile>
473468
<profile>
474469
<id>e2e-tests</id>
475470
<properties>

0 commit comments

Comments
 (0)