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

Spring - remove duplicate plugin definitions #13086

Merged
merged 1 commit into from
Jul 13, 2020
Merged

Spring - remove duplicate plugin definitions #13086

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
49 changes: 47 additions & 2 deletions sdk/spring/azure-spring-boot-starter-active-directory-b2c/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@
</rules>
</configuration>
</plugin>
<!-- START: Empty Java Doc -->
<!-- BEGIN: Empty Java Doc & Sources -->
<!-- The following code will generate an empty javadoc with just a README.md. This is necessary
to pass the required checks on Maven. The way this works is by setting the classesDirectory
to a directory that only contains the README.md, which we need to copy. If the classesDirectory
Expand Down Expand Up @@ -144,6 +144,7 @@
<artifactId>maven-jar-plugin</artifactId>
<version>3.1.2</version> <!-- {x-version-update;org.apache.maven.plugins:maven-jar-plugin;external_dependency} -->
<executions>
<!-- BEGIN: Empty Java Doc -->
<execution>
<id>empty-javadoc-jar-with-readme</id>
<phase>package</phase>
Expand All @@ -155,6 +156,20 @@
<classesDirectory>${project.basedir}/javadocTemp</classesDirectory>
</configuration>
</execution>
<!-- END: Empty Java Doc -->
<!-- BEGIN: Empty Sources -->
<execution>
<id>empty-sources-jar-with-readme</id>
<phase>package</phase>
<goals>
<goal>jar</goal>
</goals>
<configuration>
<classifier>sources</classifier>
<classesDirectory>${project.basedir}/sourceTemp</classesDirectory>
</configuration>
</execution>
<!-- END: Empty Sources -->
</executions>
</plugin>
<plugin>
Expand All @@ -181,9 +196,39 @@
<goal>run</goal>
</goals>
</execution>
<execution>
<id>copy-readme-to-sourceTemp</id>
<phase>prepare-package</phase>
<configuration>
<target>
<echo>Deleting existing ${project.basedir}/sourceTemp</echo>
<delete includeEmptyDirs="true" quiet="true">
<fileset dir="${project.basedir}/sourceTemp"/>
</delete>
<echo>Copying ${project.basedir}/README.md to
${project.basedir}/sourceTemp/README.md
</echo>
<copy file="${project.basedir}/README.md" tofile="${project.basedir}/sourceTemp/README.md"/>
</target>
</configuration>
<goals>
<goal>run</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<version>3.0.1</version> <!-- {x-version-update;org.apache.maven.plugins:maven-source-plugin;external_dependency} -->
<executions>
<execution>
<id>attach-sources</id>
<phase>none</phase> <!-- The way to skip the sources attach is to set the phase to none, the skip config doesn't work for sources -->
</execution>
</executions>
</plugin>
<!-- END: Empty Java Doc -->
<!-- END: Empty Java Doc & Sources -->
</plugins>
</build>
</project>
49 changes: 47 additions & 2 deletions sdk/spring/azure-spring-boot-starter-active-directory/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@
</rules>
</configuration>
</plugin>
<!-- START: Empty Java Doc -->
<!-- BEGIN: Empty Java Doc & Sources -->
<!-- The following code will generate an empty javadoc with just a README.md. This is necessary
to pass the required checks on Maven. The way this works is by setting the classesDirectory
to a directory that only contains the README.md, which we need to copy. If the classesDirectory
Expand Down Expand Up @@ -127,6 +127,7 @@
<artifactId>maven-jar-plugin</artifactId>
<version>3.1.2</version> <!-- {x-version-update;org.apache.maven.plugins:maven-jar-plugin;external_dependency} -->
<executions>
<!-- BEGIN: Empty Java Doc -->
<execution>
<id>empty-javadoc-jar-with-readme</id>
<phase>package</phase>
Expand All @@ -138,6 +139,20 @@
<classesDirectory>${project.basedir}/javadocTemp</classesDirectory>
</configuration>
</execution>
<!-- END: Empty Java Doc -->
<!-- BEGIN: Empty Sources -->
<execution>
<id>empty-sources-jar-with-readme</id>
<phase>package</phase>
<goals>
<goal>jar</goal>
</goals>
<configuration>
<classifier>sources</classifier>
<classesDirectory>${project.basedir}/sourceTemp</classesDirectory>
</configuration>
</execution>
<!-- END: Empty Sources -->
</executions>
</plugin>
<plugin>
Expand All @@ -164,9 +179,39 @@
<goal>run</goal>
</goals>
</execution>
<execution>
<id>copy-readme-to-sourceTemp</id>
<phase>prepare-package</phase>
<configuration>
<target>
<echo>Deleting existing ${project.basedir}/sourceTemp</echo>
<delete includeEmptyDirs="true" quiet="true">
<fileset dir="${project.basedir}/sourceTemp"/>
</delete>
<echo>Copying ${project.basedir}/README.md to
${project.basedir}/sourceTemp/README.md
</echo>
<copy file="${project.basedir}/README.md" tofile="${project.basedir}/sourceTemp/README.md"/>
</target>
</configuration>
<goals>
<goal>run</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<version>3.0.1</version> <!-- {x-version-update;org.apache.maven.plugins:maven-source-plugin;external_dependency} -->
<executions>
<execution>
<id>attach-sources</id>
<phase>none</phase> <!-- The way to skip the sources attach is to set the phase to none, the skip config doesn't work for sources -->
</execution>
</executions>
</plugin>
<!-- END: Empty Java Doc -->
<!-- END: Empty Java Doc & Sources -->
</plugins>
</build>
</project>
49 changes: 47 additions & 2 deletions sdk/spring/azure-spring-boot-starter-cosmosdb/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@
</rules>
</configuration>
</plugin>
<!-- START: Empty Java Doc -->
<!-- BEGIN: Empty Java Doc & Sources -->
<!-- The following code will generate an empty javadoc with just a README.md. This is necessary
to pass the required checks on Maven. The way this works is by setting the classesDirectory
to a directory that only contains the README.md, which we need to copy. If the classesDirectory
Expand Down Expand Up @@ -91,6 +91,7 @@
<artifactId>maven-jar-plugin</artifactId>
<version>3.1.2</version> <!-- {x-version-update;org.apache.maven.plugins:maven-jar-plugin;external_dependency} -->
<executions>
<!-- BEGIN: Empty Java Doc -->
<execution>
<id>empty-javadoc-jar-with-readme</id>
<phase>package</phase>
Expand All @@ -102,6 +103,20 @@
<classesDirectory>${project.basedir}/javadocTemp</classesDirectory>
</configuration>
</execution>
<!-- END: Empty Java Doc -->
<!-- BEGIN: Empty Sources -->
<execution>
<id>empty-sources-jar-with-readme</id>
<phase>package</phase>
<goals>
<goal>jar</goal>
</goals>
<configuration>
<classifier>sources</classifier>
<classesDirectory>${project.basedir}/sourceTemp</classesDirectory>
</configuration>
</execution>
<!-- END: Empty Sources -->
</executions>
</plugin>
<plugin>
Expand All @@ -128,9 +143,39 @@
<goal>run</goal>
</goals>
</execution>
<execution>
<id>copy-readme-to-sourceTemp</id>
<phase>prepare-package</phase>
<configuration>
<target>
<echo>Deleting existing ${project.basedir}/sourceTemp</echo>
<delete includeEmptyDirs="true" quiet="true">
<fileset dir="${project.basedir}/sourceTemp"/>
</delete>
<echo>Copying ${project.basedir}/README.md to
${project.basedir}/sourceTemp/README.md
</echo>
<copy file="${project.basedir}/README.md" tofile="${project.basedir}/sourceTemp/README.md"/>
</target>
</configuration>
<goals>
<goal>run</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<version>3.0.1</version> <!-- {x-version-update;org.apache.maven.plugins:maven-source-plugin;external_dependency} -->
<executions>
<execution>
<id>attach-sources</id>
<phase>none</phase> <!-- The way to skip the sources attach is to set the phase to none, the skip config doesn't work for sources -->
</execution>
</executions>
</plugin>
<!-- END: Empty Java Doc -->
<!-- END: Empty Java Doc & Sources -->
</plugins>
</build>
</project>
49 changes: 47 additions & 2 deletions sdk/spring/azure-spring-boot-starter-data-gremlin/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@
</rules>
</configuration>
</plugin>
<!-- START: Empty Java Doc -->
<!-- BEGIN: Empty Java Doc & Sources -->
<!-- The following code will generate an empty javadoc with just a README.md. This is necessary
to pass the required checks on Maven. The way this works is by setting the classesDirectory
to a directory that only contains the README.md, which we need to copy. If the classesDirectory
Expand Down Expand Up @@ -96,6 +96,7 @@
<artifactId>maven-jar-plugin</artifactId>
<version>3.1.2</version> <!-- {x-version-update;org.apache.maven.plugins:maven-jar-plugin;external_dependency} -->
<executions>
<!-- BEGIN: Empty Java Doc -->
<execution>
<id>empty-javadoc-jar-with-readme</id>
<phase>package</phase>
Expand All @@ -107,6 +108,20 @@
<classesDirectory>${project.basedir}/javadocTemp</classesDirectory>
</configuration>
</execution>
<!-- END: Empty Java Doc -->
<!-- BEGIN: Empty Sources -->
<execution>
<id>empty-sources-jar-with-readme</id>
<phase>package</phase>
<goals>
<goal>jar</goal>
</goals>
<configuration>
<classifier>sources</classifier>
<classesDirectory>${project.basedir}/sourceTemp</classesDirectory>
</configuration>
</execution>
<!-- END: Empty Sources -->
</executions>
</plugin>
<plugin>
Expand All @@ -133,9 +148,39 @@
<goal>run</goal>
</goals>
</execution>
<execution>
<id>copy-readme-to-sourceTemp</id>
<phase>prepare-package</phase>
<configuration>
<target>
<echo>Deleting existing ${project.basedir}/sourceTemp</echo>
<delete includeEmptyDirs="true" quiet="true">
<fileset dir="${project.basedir}/sourceTemp"/>
</delete>
<echo>Copying ${project.basedir}/README.md to
${project.basedir}/sourceTemp/README.md
</echo>
<copy file="${project.basedir}/README.md" tofile="${project.basedir}/sourceTemp/README.md"/>
</target>
</configuration>
<goals>
<goal>run</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<version>3.0.1</version> <!-- {x-version-update;org.apache.maven.plugins:maven-source-plugin;external_dependency} -->
<executions>
<execution>
<id>attach-sources</id>
<phase>none</phase> <!-- The way to skip the sources attach is to set the phase to none, the skip config doesn't work for sources -->
</execution>
</executions>
</plugin>
<!-- END: Empty Java Doc -->
<!-- END: Empty Java Doc & Sources -->
</plugins>
</build>
</project>
Loading