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

[3.0] Maven/Nightly build fix - bundle names change #1183

Merged
merged 3 commits into from Jul 12, 2021
Merged

[3.0] Maven/Nightly build fix - bundle names change #1183

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1fda5b4
Maven/Nightly build fix - bundle names change
rfelcman Jun 10, 2021
8733f1d
Maven/Nightly build fix - MANIFEST.MF content
rfelcman Jun 10, 2021
8361125
Maven/Nightly build fix - time HHmm added to nightlyVersion property
rfelcman Jun 14, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
35 changes: 0 additions & 35 deletions bundles/eclipselink/pom.xml
View file
Open in desktop
Expand Up @@ -412,41 +412,6 @@

<build>
<plugins>
<!--Initialize build.date and build.time buildNumber properties. Used to generate version.properties in org.eclipse.persistence:eclipselink module-->
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>buildnumber-maven-plugin</artifactId>
<executions>
<execution>
<id>build.date</id>
<phase>initialize</phase>
<goals>
<goal>create-timestamp</goal>
</goals>
<configuration>
<timestampFormat>yyyyMMdd</timestampFormat>
<timestampPropertyName>build.date</timestampPropertyName>
</configuration>
</execution>
<execution>
<id>build.time</id>
<phase>initialize</phase>
<goals>
<goal>create-timestamp</goal>
</goals>
<configuration>
<timestampFormat>HHmm</timestampFormat>
<timestampPropertyName>build.time</timestampPropertyName>
</configuration>
</execution>
<execution>
<phase>initialize</phase>
<goals>
<goal>create</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
Expand Down
60 changes: 16 additions & 44 deletions bundles/nightly/pom.xml
View file
Open in desktop
Expand Up @@ -32,7 +32,7 @@

<properties>
<nightlyDir>/nightlybuild/${release.version}/${build.date}</nightlyDir>
<nightlyVersion>-${release.version}.v${build.date}-${buildNumber}</nightlyVersion>
<nightlyVersion>${release.version}.v${build.date}${build.time}-${buildNumber}</nightlyVersion>
<nightlyTestReportsDir>${project.build.directory}${nightlyDir}/Eclipse</nightlyTestReportsDir>
</properties>

Expand Down Expand Up @@ -83,34 +83,6 @@

<build>
<plugins>
<!--Initialize build.date and build.time buildNumber properties. -->
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>buildnumber-maven-plugin</artifactId>
<configuration>
<revisionOnScmFailure>false</revisionOnScmFailure>
<shortRevisionLength>10</shortRevisionLength>
</configuration>
<executions>
<execution>
<id>build.date</id>
<phase>initialize</phase>
<goals>
<goal>create-timestamp</goal>
</goals>
<configuration>
<timestampFormat>yyyyMMdd</timestampFormat>
<timestampPropertyName>build.date</timestampPropertyName>
</configuration>
</execution>
<execution>
<phase>initialize</phase>
<goals>
<goal>create</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>com.coderplus.maven.plugins</groupId>
<artifactId>copy-rename-maven-plugin</artifactId>
Expand All @@ -128,71 +100,71 @@
../../foundation/eclipselink.core.test/target/${project.build.testReports.subdirectory}/${project.build.testReports.summaryFile}.html
</sourceFile>
<destinationFile>
${project.build.directory}${nightlyDir}/Eclipse/eclipselink-core-lrg${nightlyVersion}.html
${project.build.directory}${nightlyDir}/Eclipse/eclipselink-core-lrg-${nightlyVersion}.html
</destinationFile>
</fileSet>
<fileSet>
<sourceFile>
../../dbws/org.eclipse.persistence.dbws/target/${project.build.testReports.subdirectory}/${project.build.testReports.summaryFile}.html
</sourceFile>
<destinationFile>
${project.build.directory}${nightlyDir}/Eclipse/eclipselink-dbws-lrg${nightlyVersion}.html
${project.build.directory}${nightlyDir}/Eclipse/eclipselink-dbws-lrg-${nightlyVersion}.html
</destinationFile>
</fileSet>
<fileSet>
<sourceFile>
../../utils/org.eclipse.persistence.dbws.builder/target/${project.build.testReports.subdirectory}/${project.build.testReports.summaryFile}.html
</sourceFile>
<destinationFile>
${project.build.directory}${nightlyDir}/Eclipse/eclipselink-dbws-util-lrg${nightlyVersion}.html
${project.build.directory}${nightlyDir}/Eclipse/eclipselink-dbws-util-lrg-${nightlyVersion}.html
</destinationFile>
</fileSet>
<fileSet>
<sourceFile>
../../moxy/org.eclipse.persistence.moxy/target/${project.build.testReports.subdirectory}/${project.build.testReports.summaryFile}.html
</sourceFile>
<destinationFile>
${project.build.directory}${nightlyDir}/Eclipse/eclipselink-jaxb-lrg${nightlyVersion}.html
${project.build.directory}${nightlyDir}/Eclipse/eclipselink-jaxb-lrg-${nightlyVersion}.html
</destinationFile>
</fileSet>
<fileSet>
<sourceFile>
../../jpa/eclipselink.jpa.test/target/${project.build.testReports.subdirectory}/${project.build.testReports.summaryFile}.html
</sourceFile>
<destinationFile>
${project.build.directory}${nightlyDir}/Eclipse/eclipselink-jpa-lrg${nightlyVersion}.html
${project.build.directory}${nightlyDir}/Eclipse/eclipselink-jpa-lrg-${nightlyVersion}.html
</destinationFile>
</fileSet>
<fileSet>
<sourceFile>
../../jpa/eclipselink.jpa.wdf.test/target/${project.build.testReports.subdirectory}/${project.build.testReports.summaryFile}.html
</sourceFile>
<destinationFile>
${project.build.directory}${nightlyDir}/Eclipse/eclipselink-jpa-wdf-lrg${nightlyVersion}.html
${project.build.directory}${nightlyDir}/Eclipse/eclipselink-jpa-wdf-lrg-${nightlyVersion}.html
</destinationFile>
</fileSet>
<fileSet>
<sourceFile>
../../jpa/org.eclipse.persistence.jpars/target/${project.build.testReports.subdirectory}/${project.build.testReports.summaryFile}.html
</sourceFile>
<destinationFile>
${project.build.directory}${nightlyDir}/Eclipse/eclipselink-jpars-lrg${nightlyVersion}.html
${project.build.directory}${nightlyDir}/Eclipse/eclipselink-jpars-lrg-${nightlyVersion}.html
</destinationFile>
</fileSet>
<fileSet>
<sourceFile>
../../moxy/org.eclipse.persistence.moxy/target/${project.build.testReports.subdirectory}/${project.build.testReports.summaryFile}.html
</sourceFile>
<destinationFile>
${project.build.directory}${nightlyDir}/Eclipse/eclipselink-oxm-lrg${nightlyVersion}.html
${project.build.directory}${nightlyDir}/Eclipse/eclipselink-oxm-lrg-${nightlyVersion}.html
</destinationFile>
</fileSet>
<fileSet>
<sourceFile>
../../sdo/org.eclipse.persistence.sdo/target/${project.build.testReports.subdirectory}/${project.build.testReports.summaryFile}.html
</sourceFile>
<destinationFile>
${project.build.directory}${nightlyDir}/Eclipse/eclipselink-sdo-lrg${nightlyVersion}.html
${project.build.directory}${nightlyDir}/Eclipse/eclipselink-sdo-lrg-${nightlyVersion}.html
</destinationFile>
</fileSet>
</fileSets>
Expand All @@ -209,31 +181,31 @@
<fileSet>
<sourceFile>../eclipselink/target/eclipselink-${project.version}.zip</sourceFile>
<destinationFile>
${project.build.directory}${nightlyDir}/eclipselink${nightlyVersion}.zip
${project.build.directory}${nightlyDir}/eclipselink-${nightlyVersion}.zip
</destinationFile>
</fileSet>
<fileSet>
<sourceFile>../others/target/eclipselink-plugins.zip</sourceFile>
<destinationFile>
${project.build.directory}${nightlyDir}/eclipselink-plugins${nightlyVersion}.zip
${project.build.directory}${nightlyDir}/eclipselink-plugins-${nightlyVersion}.zip
</destinationFile>
</fileSet>
<fileSet>
<sourceFile>../others/target/eclipselink-plugins-nosql.zip</sourceFile>
<destinationFile>
${project.build.directory}${nightlyDir}/eclipselink-plugins-nosql${nightlyVersion}.zip
${project.build.directory}${nightlyDir}/eclipselink-plugins-nosql-${nightlyVersion}.zip
</destinationFile>
</fileSet>
<fileSet>
<sourceFile>../others/target/eclipselink-test-jars.zip</sourceFile>
<destinationFile>
${project.build.directory}${nightlyDir}/eclipselink-test-jars${nightlyVersion}.zip
${project.build.directory}${nightlyDir}/eclipselink-test-jars-${nightlyVersion}.zip
</destinationFile>
</fileSet>
<fileSet>
<sourceFile>../others/target/eclipselink-test-src.zip</sourceFile>
<destinationFile>
${project.build.directory}${nightlyDir}/eclipselink-test-src${nightlyVersion}.zip
${project.build.directory}${nightlyDir}/eclipselink-test-src-${nightlyVersion}.zip
</destinationFile>
</fileSet>
<fileSet>
Expand All @@ -248,7 +220,7 @@
../eclipselink/target//${eclipselink.unzip.subdir}/eclipselink/jlib/eclipselink-sources.jar
</sourceFile>
<destinationFile>
${project.build.directory}${nightlyDir}/eclipselink-src${nightlyVersion}.zip
${project.build.directory}${nightlyDir}/eclipselink-src-${nightlyVersion}.zip
</destinationFile>
</fileSet>
</fileSets>
Expand Down
1 change: 1 addition & 0 deletions bundles/others/pom.xml
View file
Open in desktop
Expand Up @@ -33,6 +33,7 @@
<properties>
<archive.tmp.dir>archive-tmp</archive.tmp.dir>
<test.jars.tmp.dir>eclipselink-test-jars</test.jars.tmp.dir>
<nightlyVersion>${release.version}.v${build.date}${build.time}-${buildNumber}</nightlyVersion>

<!--Javadoc properties-->
<javadoc.prefixTitle>EclipseLink ${release.version}</javadoc.prefixTitle>
Expand Down
2 changes: 1 addition & 1 deletion bundles/others/src/main/assembly/eclipselink-plugins.zip.xml
View file
Open in desktop
Expand Up @@ -26,7 +26,7 @@
</componentDescriptors>
<dependencySets>
<dependencySet>
<outputFileNameMapping>${artifact.artifactId}_${release.version}.${build.qualifier}.${artifact.extension}</outputFileNameMapping>
<outputFileNameMapping>${artifact.artifactId}_${nightlyVersion}.${artifact.extension}</outputFileNameMapping>
<includes>
<include>org.eclipse.persistence:*:*:*:${project.version}</include>
</includes>
Expand Down
45 changes: 44 additions & 1 deletion pom.xml
View file
Open in desktop
Expand Up @@ -1200,6 +1200,45 @@
</execution>
</executions>
</plugin>
<!--Initialize build.date and build.time buildNumber properties. Used to generate version.properties in org.eclipse.persistence:eclipselink module and artifacts in the bundles-->
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>buildnumber-maven-plugin</artifactId>
<configuration>
<revisionOnScmFailure>false</revisionOnScmFailure>
<shortRevisionLength>10</shortRevisionLength>
</configuration>
<executions>
<execution>
<id>build.date</id>
<phase>initialize</phase>
<goals>
<goal>create-timestamp</goal>
</goals>
<configuration>
<timestampFormat>yyyyMMdd</timestampFormat>
<timestampPropertyName>build.date</timestampPropertyName>
</configuration>
</execution>
<execution>
<id>build.time</id>
<phase>initialize</phase>
<goals>
<goal>create-timestamp</goal>
</goals>
<configuration>
<timestampFormat>HHmm</timestampFormat>
<timestampPropertyName>build.time</timestampPropertyName>
</configuration>
</execution>
<execution>
<phase>initialize</phase>
<goals>
<goal>create</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
Expand Down Expand Up @@ -1292,7 +1331,11 @@
<configuration>
<niceManifest>true</niceManifest>
<instructions>
<_noextraheaders>true</_noextraheaders>
<_noextraheaders>true</_noextraheaders>
<Implementation-Version>${project.version}</Implementation-Version>
<Implementation-SCM-Revision>${buildNumber}</Implementation-SCM-Revision>
<Implementation-SCM-Branch>${scmBranch}</Implementation-SCM-Branch>
<Bundle-Version>${release.version}.v${build.date}${build.time}</Bundle-Version>
<Automatic-Module-Name>${project.artifactId}</Automatic-Module-Name>
<HK2-Bundle-Name>${project.groupId}:${project.artifactId}</HK2-Bundle-Name>
</instructions>
Expand Down