[SYNCOPE-901] Removing maven-source-plugin override from root pom.xml
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/c1c7cede Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/c1c7cede Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/c1c7cede Branch: refs/heads/2_0_NO_JAXB Commit: c1c7cede8c464bfc29d0209350664ea9266eaec4 Parents: a4c9cfb Author: Francesco Chicchiriccò <[email protected]> Authored: Mon Jul 18 16:00:05 2016 +0200 Committer: Francesco Chicchiriccò <[email protected]> Committed: Mon Jul 18 16:00:05 2016 +0200 ---------------------------------------------------------------------- client/cli/pom.xml | 10 ++- client/enduser/pom.xml | 35 +++------ .../enduser/SyncopeEnduserApplicationTest.java | 74 -------------------- deb/console/pom.xml | 10 ++- deb/core/pom.xml | 10 ++- deb/enduser/pom.xml | 10 ++- deb/pom.xml | 40 ++++++----- fit/console-reference/pom.xml | 8 +++ fit/core-reference/pom.xml | 8 +++ fit/enduser-reference/pom.xml | 8 +++ installer/pom.xml | 40 ++++++----- pom.xml | 22 +----- standalone/pom.xml | 40 ++++++----- 13 files changed, 144 insertions(+), 171 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/syncope/blob/c1c7cede/client/cli/pom.xml ---------------------------------------------------------------------- diff --git a/client/cli/pom.xml b/client/cli/pom.xml index f8ea8ae..e1ca16d 100644 --- a/client/cli/pom.xml +++ b/client/cli/pom.xml @@ -182,13 +182,21 @@ under the License. <id>apache-release</id> <build> - <plugins> + <plugins> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-deploy-plugin</artifactId> <configuration> <skip>true</skip> </configuration> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-source-plugin</artifactId> + <inherited>false</inherited> + <configuration> + <skipSource>true</skipSource> + </configuration> </plugin> </plugins> </build> http://git-wip-us.apache.org/repos/asf/syncope/blob/c1c7cede/client/enduser/pom.xml ---------------------------------------------------------------------- diff --git a/client/enduser/pom.xml b/client/enduser/pom.xml index 408a7b7..2ce8aa7 100644 --- a/client/enduser/pom.xml +++ b/client/enduser/pom.xml @@ -32,15 +32,18 @@ under the License. <groupId>org.apache.syncope.client</groupId> <artifactId>syncope-client-enduser</artifactId> <packaging>jar</packaging> + <properties> <rootpom.basedir>${basedir}/../..</rootpom.basedir> </properties> + <dependencies> <dependency> <groupId>javax.servlet</groupId> <artifactId>javax.servlet-api</artifactId> <scope>provided</scope> </dependency> + <dependency> <groupId>org.apache.wicket</groupId> <artifactId>wicket</artifactId> @@ -50,15 +53,13 @@ under the License. <groupId>org.apache.wicket</groupId> <artifactId>wicket-extensions</artifactId> </dependency> + <dependency> - <groupId>org.apache.wicket</groupId> - <artifactId>wicket-datetime</artifactId> - </dependency> - <dependency> - <groupId>org.apache.wicket</groupId> - <artifactId>wicket-auth-roles</artifactId> + <groupId>org.apache.syncope.client</groupId> + <artifactId>syncope-client-lib</artifactId> + <version>${project.version}</version> </dependency> - + <!--AngularJS--> <dependency> <groupId>org.webjars.bower</groupId> @@ -108,6 +109,7 @@ under the License. <groupId>org.webjars</groupId> <artifactId>kendo-ui-core</artifactId> </dependency> + <!--Bootstrap--> <dependency> <groupId>org.webjars</groupId> @@ -152,7 +154,7 @@ under the License. <artifactId>FileSaver.js</artifactId> </dependency> - <!--Jquery--> + <!--jQuery--> <dependency> <groupId>org.webjars</groupId> <artifactId>jquery</artifactId> @@ -171,19 +173,6 @@ under the License. <groupId>org.apache.logging.log4j</groupId> <artifactId>log4j-core</artifactId> </dependency> - - <dependency> - <groupId>org.apache.syncope.client</groupId> - <artifactId>syncope-client-lib</artifactId> - <version>${project.version}</version> - </dependency> - - <!-- TEST --> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <scope>test</scope> - </dependency> </dependencies> <build> @@ -199,8 +188,6 @@ under the License. <directory>src/main/resources</directory> <filtering>true</filtering> </resource> - </resources> - + </resources> </build> - </project> http://git-wip-us.apache.org/repos/asf/syncope/blob/c1c7cede/client/enduser/src/test/java/org/apache/syncope/client/enduser/SyncopeEnduserApplicationTest.java ---------------------------------------------------------------------- diff --git a/client/enduser/src/test/java/org/apache/syncope/client/enduser/SyncopeEnduserApplicationTest.java b/client/enduser/src/test/java/org/apache/syncope/client/enduser/SyncopeEnduserApplicationTest.java deleted file mode 100644 index 860de89..0000000 --- a/client/enduser/src/test/java/org/apache/syncope/client/enduser/SyncopeEnduserApplicationTest.java +++ /dev/null @@ -1,74 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.syncope.client.enduser; - -import org.apache.syncope.client.enduser.pages.HomePage; -import org.apache.wicket.Session; -import org.apache.wicket.protocol.http.WebSession; -import org.apache.wicket.protocol.http.mock.MockHttpServletResponse; -import org.apache.wicket.request.Request; -import org.apache.wicket.request.Response; -import org.apache.wicket.util.tester.WicketTester; -import org.hamcrest.CoreMatchers; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Test; - -public class SyncopeEnduserApplicationTest { - - private WicketTester tester; - - static class SyncopeEnduserMockSession extends WebSession { - - private static final long serialVersionUID = -2500230416352618497L; - - SyncopeEnduserMockSession(final Request request) { - super(request); - } - } - - @Before - public void setUp() { - tester = new WicketTester(new SyncopeEnduserApplication() { - - private static final long serialVersionUID = 1445165406200746511L; - - @Override - protected void init() { - // just skip over actual init - } - - @Override - public Session newSession(final Request request, final Response response) { - return new SyncopeEnduserMockSession(request); - } - - }); - } - - @Test - public void testRedirectToIndex() { - tester.setFollowRedirects(false); - tester.startPage(HomePage.class); - tester.assertNoErrorMessage(); - MockHttpServletResponse response = tester.getLastResponse(); - Assert.assertThat(response.getRedirectLocation(), CoreMatchers.equalTo("app/")); - } - -} http://git-wip-us.apache.org/repos/asf/syncope/blob/c1c7cede/deb/console/pom.xml ---------------------------------------------------------------------- diff --git a/deb/console/pom.xml b/deb/console/pom.xml index bca1731..5c5822c 100644 --- a/deb/console/pom.xml +++ b/deb/console/pom.xml @@ -258,7 +258,7 @@ under the License. <profiles> <profile> <id>apache-release</id> - + <build> <plugins> <plugin> @@ -268,6 +268,14 @@ under the License. <skip>true</skip> </configuration> </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-source-plugin</artifactId> + <inherited>false</inherited> + <configuration> + <skipSource>true</skipSource> + </configuration> + </plugin> </plugins> </build> </profile> http://git-wip-us.apache.org/repos/asf/syncope/blob/c1c7cede/deb/core/pom.xml ---------------------------------------------------------------------- diff --git a/deb/core/pom.xml b/deb/core/pom.xml index b26cc9c..f757e16 100644 --- a/deb/core/pom.xml +++ b/deb/core/pom.xml @@ -372,7 +372,7 @@ under the License. <profiles> <profile> <id>apache-release</id> - + <build> <plugins> <plugin> @@ -382,6 +382,14 @@ under the License. <skip>true</skip> </configuration> </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-source-plugin</artifactId> + <inherited>false</inherited> + <configuration> + <skipSource>true</skipSource> + </configuration> + </plugin> </plugins> </build> </profile> http://git-wip-us.apache.org/repos/asf/syncope/blob/c1c7cede/deb/enduser/pom.xml ---------------------------------------------------------------------- diff --git a/deb/enduser/pom.xml b/deb/enduser/pom.xml index 982e9c9..cf75fb0 100644 --- a/deb/enduser/pom.xml +++ b/deb/enduser/pom.xml @@ -254,7 +254,7 @@ under the License. <profiles> <profile> <id>apache-release</id> - + <build> <plugins> <plugin> @@ -264,6 +264,14 @@ under the License. <skip>true</skip> </configuration> </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-source-plugin</artifactId> + <inherited>false</inherited> + <configuration> + <skipSource>true</skipSource> + </configuration> + </plugin> </plugins> </build> </profile> http://git-wip-us.apache.org/repos/asf/syncope/blob/c1c7cede/deb/pom.xml ---------------------------------------------------------------------- diff --git a/deb/pom.xml b/deb/pom.xml index a78ddbc..78ee215 100644 --- a/deb/pom.xml +++ b/deb/pom.xml @@ -52,22 +52,6 @@ under the License. <profiles> <profile> - <id>apache-release</id> - - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-deploy-plugin</artifactId> - <configuration> - <skip>true</skip> - </configuration> - </plugin> - </plugins> - </build> - </profile> - - <profile> <id>site</id> <build> @@ -103,6 +87,30 @@ under the License. </plugins> </build> </profile> + + <profile> + <id>apache-release</id> + + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-deploy-plugin</artifactId> + <configuration> + <skip>true</skip> + </configuration> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-source-plugin</artifactId> + <inherited>false</inherited> + <configuration> + <skipSource>true</skipSource> + </configuration> + </plugin> + </plugins> + </build> + </profile> </profiles> </project> http://git-wip-us.apache.org/repos/asf/syncope/blob/c1c7cede/fit/console-reference/pom.xml ---------------------------------------------------------------------- diff --git a/fit/console-reference/pom.xml b/fit/console-reference/pom.xml index ba82e05..f41b452 100644 --- a/fit/console-reference/pom.xml +++ b/fit/console-reference/pom.xml @@ -438,6 +438,14 @@ under the License. <skip>true</skip> </configuration> </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-source-plugin</artifactId> + <inherited>false</inherited> + <configuration> + <skipSource>true</skipSource> + </configuration> + </plugin> </plugins> </build> </profile> http://git-wip-us.apache.org/repos/asf/syncope/blob/c1c7cede/fit/core-reference/pom.xml ---------------------------------------------------------------------- diff --git a/fit/core-reference/pom.xml b/fit/core-reference/pom.xml index 08ad663..a37ab54 100644 --- a/fit/core-reference/pom.xml +++ b/fit/core-reference/pom.xml @@ -1058,6 +1058,14 @@ under the License. <skip>true</skip> </configuration> </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-source-plugin</artifactId> + <inherited>false</inherited> + <configuration> + <skipSource>true</skipSource> + </configuration> + </plugin> </plugins> </build> </profile> http://git-wip-us.apache.org/repos/asf/syncope/blob/c1c7cede/fit/enduser-reference/pom.xml ---------------------------------------------------------------------- diff --git a/fit/enduser-reference/pom.xml b/fit/enduser-reference/pom.xml index 3fbf0eb..8372385 100644 --- a/fit/enduser-reference/pom.xml +++ b/fit/enduser-reference/pom.xml @@ -401,6 +401,14 @@ under the License. <skip>true</skip> </configuration> </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-source-plugin</artifactId> + <inherited>false</inherited> + <configuration> + <skipSource>true</skipSource> + </configuration> + </plugin> </plugins> </build> </profile> http://git-wip-us.apache.org/repos/asf/syncope/blob/c1c7cede/installer/pom.xml ---------------------------------------------------------------------- diff --git a/installer/pom.xml b/installer/pom.xml index debc8ff..115980c 100644 --- a/installer/pom.xml +++ b/installer/pom.xml @@ -212,22 +212,6 @@ under the License. <profiles> <profile> - <id>apache-release</id> - - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-deploy-plugin</artifactId> - <configuration> - <skip>true</skip> - </configuration> - </plugin> - </plugins> - </build> - </profile> - - <profile> <id>site</id> <build> @@ -263,6 +247,30 @@ under the License. </plugins> </build> </profile> + + <profile> + <id>apache-release</id> + + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-deploy-plugin</artifactId> + <configuration> + <skip>true</skip> + </configuration> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-source-plugin</artifactId> + <inherited>false</inherited> + <configuration> + <skipSource>true</skipSource> + </configuration> + </plugin> + </plugins> + </build> + </profile> </profiles> </project> http://git-wip-us.apache.org/repos/asf/syncope/blob/c1c7cede/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 35331b1..2665154 100644 --- a/pom.xml +++ b/pom.xml @@ -1763,29 +1763,9 @@ under the License. <plugins> <plugin> <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-source-plugin</artifactId> - <inherited>false</inherited> - <executions> - <execution> - <id>attach-sources</id> - <goals> - <goal>jar-no-fork</goal> - </goals> - <configuration> - <includes> - <include>${rootpom.basedir}/LICENSE</include> - <include>${rootpom.basedir}/NOTICE</include> - </includes> - </configuration> - </execution> - </executions> - </plugin> - - <plugin> - <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-deploy-plugin</artifactId> <version>2.8.2</version> - </plugin> + </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> http://git-wip-us.apache.org/repos/asf/syncope/blob/c1c7cede/standalone/pom.xml ---------------------------------------------------------------------- diff --git a/standalone/pom.xml b/standalone/pom.xml index e3c40a0..3311ca0 100644 --- a/standalone/pom.xml +++ b/standalone/pom.xml @@ -289,22 +289,6 @@ under the License. <profiles> <profile> - <id>apache-release</id> - - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-deploy-plugin</artifactId> - <configuration> - <skip>true</skip> - </configuration> - </plugin> - </plugins> - </build> - </profile> - - <profile> <id>site</id> <build> @@ -340,6 +324,30 @@ under the License. </plugins> </build> </profile> + + <profile> + <id>apache-release</id> + + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-deploy-plugin</artifactId> + <configuration> + <skip>true</skip> + </configuration> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-source-plugin</artifactId> + <inherited>false</inherited> + <configuration> + <skipSource>true</skipSource> + </configuration> + </plugin> + </plugins> + </build> + </profile> </profiles> </project>
