Skip to content

Commit

Permalink
build related fixes from (#1093)
Browse files Browse the repository at this point in the history 
Signed-off-by: Lukas Jungmann <lukas.jungmann@oracle.com>
(cherry picked from commit ac66849)
  • Loading branch information
@lukasj
lukasj committed Aug 31, 2021
1 parent 4cc4a04 commit b0076a2
Show file tree
Hide file tree
Showing 8 changed files with 99 additions and 248 deletions.
146 changes: 4 additions & 142 deletions bundles/eclipselink/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -243,72 +243,6 @@
<scope>provided</scope>
</dependency>

<!-- included sources artifacts -->
<dependency>
<groupId>org.eclipse.persistence</groupId>
<artifactId>org.eclipse.persistence.asm</artifactId>
<classifier>sources</classifier>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.eclipse.persistence</groupId>
<artifactId>org.eclipse.persistence.core</artifactId>
<classifier>sources</classifier>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.eclipse.persistence</groupId>
<artifactId>org.eclipse.persistence.corba</artifactId>
<classifier>sources</classifier>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.eclipse.persistence</groupId>
<artifactId>org.eclipse.persistence.oracle</artifactId>
<classifier>sources</classifier>
<scope>provided</scope>
</dependency>

<dependency>
<groupId>org.eclipse.persistence</groupId>
<artifactId>org.eclipse.persistence.jpa</artifactId>
<classifier>sources</classifier>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.eclipse.persistence</groupId>
<artifactId>org.eclipse.persistence.jpa.jpql</artifactId>
<classifier>sources</classifier>
<scope>provided</scope>
</dependency>

<dependency>
<groupId>org.eclipse.persistence</groupId>
<artifactId>org.eclipse.persistence.moxy</artifactId>
<classifier>sources</classifier>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.eclipse.persistence</groupId>
<artifactId>org.eclipse.persistence.moxy.utils.xjc</artifactId>
<classifier>sources</classifier>
<scope>provided</scope>
</dependency>

<dependency>
<groupId>org.eclipse.persistence</groupId>
<artifactId>org.eclipse.persistence.sdo</artifactId>
<classifier>sources</classifier>
<scope>provided</scope>
</dependency>

<dependency>
<groupId>org.eclipse.persistence</groupId>
<artifactId>org.eclipse.persistence.dbws</artifactId>
<classifier>sources</classifier>
<scope>provided</scope>
</dependency>

<!-- artifacts for zip -->
<dependency>
<groupId>org.eclipse.persistence</groupId>
Expand Down Expand Up @@ -357,49 +291,6 @@
<scope>provided</scope>
</dependency>

<dependency>
<groupId>org.eclipse.persistence</groupId>
<artifactId>org.eclipse.persistence.dbws.builder</artifactId>
<classifier>sources</classifier>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.eclipse.persistence</groupId>
<artifactId>org.eclipse.persistence.extension</artifactId>
<classifier>sources</classifier>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.eclipse.persistence</groupId>
<artifactId>org.eclipse.persistence.jpa.modelgen.processor</artifactId>
<classifier>sources</classifier>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.eclipse.persistence</groupId>
<artifactId>org.eclipse.persistence.jpars</artifactId>
<classifier>sources</classifier>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.eclipse.persistence</groupId>
<artifactId>org.eclipse.persistence.oracleddlparser</artifactId>
<classifier>sources</classifier>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.eclipse.persistence</groupId>
<artifactId>org.eclipse.persistence.nosql</artifactId>
<classifier>sources</classifier>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.eclipse.persistence</groupId>
<artifactId>org.eclipse.persistence.oracle.nosql</artifactId>
<classifier>sources</classifier>
<scope>provided</scope>
</dependency>

<dependency>
<groupId>org.eclipse.persistence</groupId>
<artifactId>org.eclipse.persistence.jpars</artifactId>
Expand Down Expand Up @@ -430,45 +321,17 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<executions>
<execution>
<id>unpack-classes</id>
<phase>prepare-package</phase>
<goals>
<goal>unpack-dependencies</goal>
</goals>
<configuration>
<excludeTransitive>true</excludeTransitive>
<includeGroupIds>${project.groupId}</includeGroupIds>
<includeScope>provided</includeScope>
<includeArtifactIds>
org.eclipse.persistence.asm,
org.eclipse.persistence.core,
org.eclipse.persistence.corba,
org.eclipse.persistence.dbws,
org.eclipse.persistence.jpa,
org.eclipse.persistence.jpa.jpql,
org.eclipse.persistence.moxy,
org.eclipse.persistence.moxy.utils.xjc,
org.eclipse.persistence.oracle,
org.eclipse.persistence.sdo
</includeArtifactIds>
<excludeClassifiers>sources,javadoc</excludeClassifiers>
<excludes>META-INF/MANIFEST.MF,*.html,org/eclipse/persistence/jpa/jpql/tools/**</excludes>
<overWriteSnapshots>true</overWriteSnapshots>
<outputDirectory>${project.build.outputDirectory}</outputDirectory>
</configuration>
</execution>
<execution>
<id>unpack-sources</id>
<phase>prepare-package</phase>
<phase>generate-sources</phase>
<goals>
<goal>unpack-dependencies</goal>
</goals>
<configuration>
<excludeTransitive>true</excludeTransitive>
<includeGroupIds>${project.groupId}</includeGroupIds>
<includeScope>provided</includeScope>
<includeClassifiers>sources</includeClassifiers>
<classifier>sources</classifier>
<includeArtifactIds>
org.eclipse.persistence.asm,
org.eclipse.persistence.core,
Expand All @@ -481,7 +344,7 @@
org.eclipse.persistence.oracle,
org.eclipse.persistence.sdo
</includeArtifactIds>
<excludes>META-INF/MANIFEST.MF,*.html,org/eclipse/persistence/jpa/jpql/tools/**</excludes>
<excludes>module-info.*,META-INF/versions/**,META-INF/MANIFEST.MF,*.html,org/eclipse/persistence/jpa/jpql/tools/**</excludes>
<overWriteSnapshots>true</overWriteSnapshots>
<outputDirectory>${gen.src.dir}</outputDirectory>
</configuration>
Expand Down Expand Up @@ -567,14 +430,13 @@
<excludes>
<exclude>**/*.java</exclude>
</excludes>
<filtering>true</filtering>
</resource>
</resources>
</configuration>
</execution>
<execution>
<id>add-generated-sources</id>
<phase>prepare-package</phase>
<phase>generate-sources</phase>
<goals>
<goal>add-source</goal>
</goals>
Expand Down
86 changes: 40 additions & 46 deletions bundles/others/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright (c) 2019, 2020 Oracle and/or its affiliates. All rights reserved.
Copyright (c) 2019, 2021 Oracle and/or its affiliates. All rights reserved.
This program and the accompanying materials are made available under the
terms of the Eclipse Public License v. 2.0 which is available at
Expand Down Expand Up @@ -359,6 +359,23 @@
<artifactId>jakarta.xml.bind-api</artifactId>
<classifier>sources</classifier>
</dependency>

<dependency>
<groupId>org.eclipse.persistence</groupId>
<artifactId>org.eclipse.persistence.jpars</artifactId>
<classifier>javadoc</classifier>
<scope>provided</scope>
<!-- ### fix me -->
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.eclipse.persistence</groupId>
<artifactId>org.eclipse.persistence.sdo</artifactId>
<classifier>javadoc</classifier>
<scope>provided</scope>
<!-- ### fix me -->
<version>${project.version}</version>
</dependency>
</dependencies>

<build>
Expand All @@ -378,7 +395,7 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<configuration>
<additionalJOption>-Xdoclint:none</additionalJOption>
<doclint>none</doclint>
<detectOfflineLinks>false</detectOfflineLinks>
<use>false</use>
<quiet>true</quiet>
Expand Down Expand Up @@ -443,31 +460,15 @@
<finalName>eclipselink</finalName>
</configuration>
</execution>
<execution>
<id>eclipselink-jpars-javadoc.jar</id>
<phase>prepare-package</phase>
<goals>
<goal>jar</goal>
</goals>
<configuration>
<outputDirectory>${project.build.directory}/apidocs/eclipselink-jpars-javadoc.jar/</outputDirectory>
<includeDependencySources>true</includeDependencySources>
<doctitle><![CDATA[${javadoc.jpars.prefixTitle}]]></doctitle>
<header><![CDATA[${javadoc.jpars.prefixTitle}]]></header>
<windowtitle>${javadoc.jpars.prefixTitle}</windowtitle>
<dependencySourceIncludes>
<dependencySourceInclude>org.eclipse.persistence:org.eclipse.persistence.jpars</dependencySourceInclude>
</dependencySourceIncludes>
<finalName>eclipselink-jpars</finalName>
</configuration>
</execution>
<!--Disabled by default-->
<execution>
<id>nosql-javadoc.jar</id>
<phase>prepare-package</phase>
<goals>
<goal>jar</goal>
</goals>
<configuration>
<skip>true</skip>
<outputDirectory>${project.build.directory}/apidocs/nosql-javadoc.jar/</outputDirectory>
<includeDependencySources>true</includeDependencySources>
<doctitle><![CDATA[${javadoc.nosql.prefixTitle}]]></doctitle>
Expand All @@ -484,26 +485,6 @@
<finalName>nosql</finalName>
</configuration>
</execution>
<execution>
<id>sdo-javadoc.jar</id>
<phase>prepare-package</phase>
<goals>
<goal>jar</goal>
</goals>
<configuration>
<outputDirectory>${project.build.directory}/apidocs/sdo-javadoc.jar/</outputDirectory>
<includeDependencySources>true</includeDependencySources>
<doctitle><![CDATA[${javadoc.prefixTitle}, ${javadoc.postfixTitle}]]></doctitle>
<header><![CDATA[${javadoc.prefixTitle}, ${javadoc.postfixTitle}]]></header>
<windowtitle>${javadoc.prefixTitle}, ${javadoc.postfixTitle}</windowtitle>
<dependencySourceIncludes>
<!--Eclipselink SDO modules-->
<dependencySourceInclude>org.eclipse.persistence:org.eclipse.persistence.sdo</dependencySourceInclude>
<dependencySourceInclude>org.eclipse.persistence:commonj.sdo</dependencySourceInclude>
</dependencySourceIncludes>
<finalName>sdo</finalName>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
Expand Down Expand Up @@ -531,15 +512,28 @@
<version>${jpa.api.version}</version>
<outputDirectory>${project.build.directory}/${archive.tmp.dir}/eclipselink-test-src.zip/jpa/plugins/</outputDirectory>
</artifactItem>
<artifactItem>
<groupId>${project.parent.groupId}</groupId>
<artifactId>commonj.sdo</artifactId>
<outputDirectory>${project.build.directory}/${archive.tmp.dir}/eclipselink-test-src.zip/sdo/plugins/</outputDirectory>
<destFileName>commonj.sdo_2.1.1.v201112051852.jar</destFileName>
</artifactItem>
</artifactItems>
</configuration>
</execution>
<execution>
<id>sdo-jpars-javadoc.jar</id>
<phase>prepare-package</phase>
<goals>
<goal>copy-dependencies</goal>
</goals>
<configuration>
<excludeTransitive>true</excludeTransitive>
<includeGroupIds>${project.groupId}</includeGroupIds>
<includeScope>provided</includeScope>
<classifier>javadoc</classifier>
<includeArtifactIds>
org.eclipse.persistence.jpars,
org.eclipse.persistence.sdo
</includeArtifactIds>
<stripVersion>true</stripVersion>
<outputDirectory>${project.build.directory}</outputDirectory>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
Expand Down
6 changes: 3 additions & 3 deletions bundles/others/src/main/assembly/eclipselink-plugins-nosql.zip.xml
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright (c) 2019 Oracle and/or its affiliates. All rights reserved.
Copyright (c) 2019, 2021 Oracle and/or its affiliates. All rights reserved.
This program and the accompanying materials are made available under the
terms of the Eclipse Public License v. 2.0 which is available at
Expand Down Expand Up @@ -36,11 +36,11 @@
</includes>
</dependencySet>
</dependencySets>
<files>
<!-- <files>
<file>
<source>${project.build.directory}/nosql-javadoc.jar</source>
<outputDirectory>.</outputDirectory>
</file>
</files>
</files>-->

</assembly>
7 changes: 4 additions & 3 deletions foundation/org.eclipse.persistence.core.test.framework/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,18 +49,19 @@
</dependency>
</dependencies>

<!-- <build>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<configuration>
<source>8</source>
<release>8</release>
<detectOfflineLinks>false</detectOfflineLinks>
<additionalJOptions>
<additionalJOption>-Xdoclint:-html</additionalJOption>
</additionalJOptions>
</configuration>
</plugin>
</plugins>
</build>-->
</build>
</project>
Loading

0 comments on commit b0076a2

Please sign in to comment.