diff --git a/oss-quickstart-archetype-simple/src/main/resources/archetype-resources/src/main/java/com/example/acme/App.java b/oss-quickstart-archetype-simple/src/main/resources/archetype-resources/src/main/java/com/example/acme/App.java deleted file mode 100644 index d7252f4..0000000 --- a/oss-quickstart-archetype-simple/src/main/resources/archetype-resources/src/main/java/com/example/acme/App.java +++ /dev/null @@ -1,26 +0,0 @@ -#set( $symbol_pound = '#' ) -#set( $symbol_dollar = '$' ) -#set( $symbol_escape = '\' ) -/* - * Copyright 2021 The original authors - * - * Licensed 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 com.example.acme; - -public class App { - - public String hello(String name) { - return "Hello, " + name; - } -} diff --git a/oss-quickstart-archetype-simple/src/main/resources/archetype-resources/src/test/java/com/example/acme/AppTest.java b/oss-quickstart-archetype-simple/src/main/resources/archetype-resources/src/test/java/com/example/acme/AppTest.java deleted file mode 100644 index 5fd7faa..0000000 --- a/oss-quickstart-archetype-simple/src/main/resources/archetype-resources/src/test/java/com/example/acme/AppTest.java +++ /dev/null @@ -1,32 +0,0 @@ -#set( $symbol_pound = '#' ) -#set( $symbol_dollar = '$' ) -#set( $symbol_escape = '\' ) -/* - * Copyright 2021 The original authors - * - * Licensed 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 com.example.acme; - -import org.junit.jupiter.api.Test; - -import static org.assertj.core.api.Assertions.*; - -public class AppTest { - - @Test - void helloShouldReturnName() { - App app = new App(); - assertThat(app.hello("Bob")).isEqualTo("Hello, Bob"); - } -} diff --git a/update-from-templates.sh b/update-from-templates.sh index 2eb0a65..f7f6019 100755 --- a/update-from-templates.sh +++ b/update-from-templates.sh @@ -22,7 +22,8 @@ set -eo pipefail mvn clean verify -f oss-quickstart-template-simple/pom.xml mvn archetype:create-from-project -f oss-quickstart-template-simple/pom.xml cp -r oss-quickstart-template-simple/target/generated-sources/archetype/src/main/resources/archetype-resources oss-quickstart-archetype-simple/src/main/resources -# cp -r oss-quickstart-template-simple/.gitignore oss-quickstart-archetype-simple/src/main/resources/archetype-resources +rm -rf oss-quickstart-archetype-simple/src/main/resources/archetype-resources/src/main/java/com +rm -rf oss-quickstart-archetype-simple/src/main/resources/archetype-resources/src/test/java/com # The archetype creation process drops the line-wrap after the license header in the pom.xml; adding this back # using gsed on macOS to have flag compatibility with gnu sed on Linux