This is an automated email from the ASF dual-hosted git repository. pauls pushed a commit to branch issues/SLING-11099 in repository https://gitbox.apache.org/repos/asf/sling-jspc-maven-plugin.git
commit 16345a1f13d8602041fb8bb54ecaaaf92b41c37d Author: Karl Pauls <[email protected]> AuthorDate: Fri Jan 28 22:50:50 2022 +0100 SLING-11099: add required dependencies in scope compile --- pom.xml | 25 +++++++++++++--- src/it/settings.xml | 53 +++++++++++++++++++++++++++++++++ src/it/simple/pom.xml | 49 ++++++++++++++++++++++++++++++ src/it/simple/src/main/scripts/test.jsp | 19 ++++++++++++ 4 files changed, 142 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index cd5ca9f..4d88783 100644 --- a/pom.xml +++ b/pom.xml @@ -89,6 +89,23 @@ <tryUpdate>true</tryUpdate> </configuration> </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-invoker-plugin</artifactId> + <configuration> + <localRepositoryPath>${project.build.directory}/local-repo</localRepositoryPath> + <settingsFile>src/it/settings.xml</settingsFile> + </configuration> + <executions> + <execution> + <id>integration-test</id> + <goals> + <goal>install</goal> + <goal>run</goal> + </goals> + </execution> + </executions> + </plugin> </plugins> </build> @@ -157,14 +174,14 @@ <dependency> <groupId>org.apache.felix</groupId> <artifactId>org.apache.felix.framework</artifactId> - <version>7.0.1</version> - <scope>provided</scope> + <version>7.0.3</version> + <scope>compile</scope> </dependency> <dependency> <groupId>org.apache.sling</groupId> <artifactId>org.apache.sling.feature</artifactId> - <version>1.2.28</version> - <scope>provided</scope> + <version>1.2.30</version> + <scope>compile</scope> </dependency> <dependency> <groupId>org.apache.felix</groupId> diff --git a/src/it/settings.xml b/src/it/settings.xml new file mode 100644 index 0000000..3915771 --- /dev/null +++ b/src/it/settings.xml @@ -0,0 +1,53 @@ +<?xml version="1.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. +--> +<settings> + <profiles> + <profile> + <id>it-repo</id> + <activation> + <activeByDefault>true</activeByDefault> + </activation> + <repositories> + <repository> + <id>local.central</id> + <url>@localRepositoryUrl@</url> + <releases> + <enabled>true</enabled> + </releases> + <snapshots> + <enabled>true</enabled> + </snapshots> + </repository> + </repositories> + <pluginRepositories> + <pluginRepository> + <id>local.central</id> + <url>@localRepositoryUrl@</url> + <releases> + <enabled>true</enabled> + </releases> + <snapshots> + <enabled>true</enabled> + </snapshots> + </pluginRepository> + </pluginRepositories> + </profile> + </profiles> +</settings> \ No newline at end of file diff --git a/src/it/simple/pom.xml b/src/it/simple/pom.xml new file mode 100644 index 0000000..e71b66a --- /dev/null +++ b/src/it/simple/pom.xml @@ -0,0 +1,49 @@ +<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ~ 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. + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~--> +<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> + <modelVersion>4.0.0</modelVersion> + + <groupId>org.apache.sling</groupId> + <artifactId>jspc-maven-plugin-it-includes</artifactId> + <version>0.0.1-SNAPSHOT</version> + <packaging>jar</packaging> + + <name>HTL Maven Plugin IT - Generate Java Classes</name> + + <build> + <plugins> + <plugin> + <groupId>org.apache.sling</groupId> + <artifactId>jspc-maven-plugin</artifactId> + <version>@project.version@</version> + <configuration> + <generateCompilationReport>true</generateCompilationReport> + </configuration> + <executions> + <execution> + <goals> + <goal>jspc</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build> +</project> \ No newline at end of file diff --git a/src/it/simple/src/main/scripts/test.jsp b/src/it/simple/src/main/scripts/test.jsp new file mode 100644 index 0000000..a47c742 --- /dev/null +++ b/src/it/simple/src/main/scripts/test.jsp @@ -0,0 +1,19 @@ +<%-- +~ 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. +--%> +test \ No newline at end of file
