Author: painter Date: Wed Nov 7 13:36:32 2018 New Revision: 1846008 URL: http://svn.apache.org/viewvc?rev=1846008&view=rev Log: Followed gv's example on yaafi-crypto to clean up all poms, removed old deployment management profiles, removed old maven 1.x build files, fixed test case in PBE that relied on old project file, added missing licenses to poms
Removed: turbine/fulcrum/trunk/commonsemail/project.xml turbine/fulcrum/trunk/groovy/maven.xml turbine/fulcrum/trunk/groovy/project.properties turbine/fulcrum/trunk/groovy/project.xml turbine/fulcrum/trunk/pbe/project.properties turbine/fulcrum/trunk/pbe/project.xml Modified: turbine/fulcrum/trunk/cache/pom.xml turbine/fulcrum/trunk/commonsemail/pom.xml turbine/fulcrum/trunk/configuration/impl/pom.xml turbine/fulcrum/trunk/groovy/pom.xml turbine/fulcrum/trunk/hsqldb/pom.xml turbine/fulcrum/trunk/intake/pom.xml turbine/fulcrum/trunk/jetty/pom.xml turbine/fulcrum/trunk/localization/pom.xml turbine/fulcrum/trunk/mimetype/pom.xml turbine/fulcrum/trunk/naming/pom.xml turbine/fulcrum/trunk/parser/pom.xml turbine/fulcrum/trunk/pbe/pom.xml turbine/fulcrum/trunk/pbe/src/test/org/apache/fulcrum/pbe/PBEServiceTest.java turbine/fulcrum/trunk/pool/pom.xml turbine/fulcrum/trunk/resourcemanager/pom.xml turbine/fulcrum/trunk/script/pom.xml turbine/fulcrum/trunk/security/torque/pom.xml turbine/fulcrum/trunk/servicemanager/pom.xml turbine/fulcrum/trunk/spring/pom.xml turbine/fulcrum/trunk/testcontainer/pom.xml turbine/fulcrum/trunk/xmlrpc/pom.xml turbine/fulcrum/trunk/xslt/pom.xml turbine/fulcrum/trunk/yaafi-crypto/pom.xml turbine/fulcrum/trunk/yaafi/pom.xml Modified: turbine/fulcrum/trunk/cache/pom.xml URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/cache/pom.xml?rev=1846008&r1=1846007&r2=1846008&view=diff ============================================================================== --- turbine/fulcrum/trunk/cache/pom.xml (original) +++ turbine/fulcrum/trunk/cache/pom.xml Wed Nov 7 13:36:32 2018 @@ -90,6 +90,9 @@ </dependencies> <build> + <sourceDirectory>${basedir}/src/java</sourceDirectory> + <testSourceDirectory>${basedir}/src/test</testSourceDirectory> + <plugins> <plugin> <groupId>org.apache.maven.plugins</groupId> @@ -106,25 +109,11 @@ </additionalClasspathElements> </configuration> </plugin> - <plugin> - <artifactId>maven-compiler-plugin</artifactId> - <version>2.5.1</version> - <configuration> - <source>${maven.compile.source}</source> - <target>${maven.compile.target}</target> - <encoding>${project.build.sourceEncoding}</encoding> - </configuration> - </plugin> - </plugins> - <sourceDirectory>${basedir}/src/java</sourceDirectory> - <testSourceDirectory>${basedir}/src/test</testSourceDirectory> </build> <properties> <turbine.site.path>fulcrum/fulcrum-cache</turbine.site.path> - <maven.compile.source>1.8</maven.compile.source> - <maven.compile.target>1.8</maven.compile.target> </properties> Modified: turbine/fulcrum/trunk/commonsemail/pom.xml URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/commonsemail/pom.xml?rev=1846008&r1=1846007&r2=1846008&view=diff ============================================================================== --- turbine/fulcrum/trunk/commonsemail/pom.xml (original) +++ turbine/fulcrum/trunk/commonsemail/pom.xml Wed Nov 7 13:36:32 2018 @@ -40,14 +40,6 @@ <url>http://svn.apache.org/viewvc/turbine/fulcrum/trunk/commonsemail/</url> </scm> - <distributionManagement> - <site> - <id>apache.website</id> - <name>Fulcrum Website</name> - <url>${fulcrum.deployment.protocol}://people.apache.org/www/turbine.apache.org/fulcrum/fulcrum-commonsemail/</url> - </site> - </distributionManagement> - <developers> <developer> <name>Siegfried Goeschl</name> Modified: turbine/fulcrum/trunk/configuration/impl/pom.xml URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/configuration/impl/pom.xml?rev=1846008&r1=1846007&r2=1846008&view=diff ============================================================================== --- turbine/fulcrum/trunk/configuration/impl/pom.xml (original) +++ turbine/fulcrum/trunk/configuration/impl/pom.xml Wed Nov 7 13:36:32 2018 @@ -81,7 +81,6 @@ <artifactId>avalon-framework-api</artifactId> <version>4.3.1</version> </dependency> - <dependency> <groupId>commons-configuration</groupId> <artifactId>commons-configuration</artifactId> Modified: turbine/fulcrum/trunk/groovy/pom.xml URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/groovy/pom.xml?rev=1846008&r1=1846007&r2=1846008&view=diff ============================================================================== --- turbine/fulcrum/trunk/groovy/pom.xml (original) +++ turbine/fulcrum/trunk/groovy/pom.xml Wed Nov 7 13:36:32 2018 @@ -117,7 +117,11 @@ <version>3.8.1</version> <scope>test</scope> </dependency> - </dependencies> + + <properties> + <turbine.site.path>fulcrum/fulcrum-groovy</turbine.site.path> + </properties> + </project> Modified: turbine/fulcrum/trunk/hsqldb/pom.xml URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/hsqldb/pom.xml?rev=1846008&r1=1846007&r2=1846008&view=diff ============================================================================== --- turbine/fulcrum/trunk/hsqldb/pom.xml (original) +++ turbine/fulcrum/trunk/hsqldb/pom.xml Wed Nov 7 13:36:32 2018 @@ -1,23 +1,23 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - 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. + 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/maven-v4_0_0.xsd"> +<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"> + + <parent> <artifactId>turbine-parent</artifactId> <groupId>org.apache.turbine</groupId> @@ -39,14 +39,6 @@ <url>http://svn.apache.org/viewvc/turbine/fulcrum/trunk/hsqldb/</url> </scm> - <distributionManagement> - <site> - <id>apache.website</id> - <name>Fulcrum Website</name> - <url>${fulcrum.deployment.protocol}://people.apache.org/www/turbine.apache.org/fulcrum/fulcrum-hsqldb/</url> - </site> - </distributionManagement> - <developers> <developer> <name>Siegfried Goeschl</name> @@ -92,23 +84,7 @@ </build> <properties> - <!-- This bits are used for the staging directory --> - <fulcrum.release.version>1.0.0</fulcrum.release.version> - <fulcrum.rc.version>RC1</fulcrum.rc.version> - </properties> - - <profiles> - <profile> - <id>rc</id> - <distributionManagement> - <!-- Cannot define in parent ATM, see COMMONSSITE-26 --> - <site> - <id>apache.website</id> - <name>Apache Fulcrum Release Candidate Staging Site</name> - <url>${fulcrum.deployment.protocol}://people.apache.org/www/turbine.apache.org/builds/fulcrum/${fulcrum.componentid}/${fulcrum.release.version}/${fulcrum.rc.version}/site</url> - </site> - </distributionManagement> - </profile> - </profiles> - + <turbine.site.path>fulcrum/fulcrum-hsqldb</turbine.site.path> + </properties> + </project> Modified: turbine/fulcrum/trunk/intake/pom.xml URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/intake/pom.xml?rev=1846008&r1=1846007&r2=1846008&view=diff ============================================================================== --- turbine/fulcrum/trunk/intake/pom.xml (original) +++ turbine/fulcrum/trunk/intake/pom.xml Wed Nov 7 13:36:32 2018 @@ -139,8 +139,6 @@ </build> <properties> - <maven.compiler.source>1.8</maven.compiler.source> - <maven.compiler.target>1.8</maven.compiler.target> <turbine.site.path>fulcrum/fulcrum-intake</turbine.site.path> </properties> Modified: turbine/fulcrum/trunk/jetty/pom.xml URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/jetty/pom.xml?rev=1846008&r1=1846007&r2=1846008&view=diff ============================================================================== --- turbine/fulcrum/trunk/jetty/pom.xml (original) +++ turbine/fulcrum/trunk/jetty/pom.xml Wed Nov 7 13:36:32 2018 @@ -1,129 +1,120 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + 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/maven-v4_0_0.xsd"> - + <parent> - <artifactId>turbine-parent</artifactId> - <groupId>org.apache.turbine</groupId> - <version>5</version> - </parent> - - <modelVersion>4.0.0</modelVersion> - <artifactId>fulcrum-jetty</artifactId> - <groupId>org.apache.fulcrum</groupId> - <version>1.0.1-SNAPSHOT</version> - <name>Fulcrum Jetty</name> - <inceptionYear>2008</inceptionYear> - <description>Avalon Component for an embeddable Jetty Servlet Container</description> - <url>http://turbine.apache.org/fulcrum/fulcrum-jetty/</url> - - <scm> - <connection>scm:svn:http://svn.apache.org/repos/asf/turbine/fulcrum/trunk/jetty/</connection> - <developerConnection>scm:svn:https://svn.apache.org/repos/asf/turbine/fulcrum/trunk/jetty/</developerConnection> - <url>http://svn.apache.org/viewvc/turbine/fulcrum/trunk/jetty/</url> - </scm> - - <distributionManagement> - <site> - <id>apache.website</id> - <name>Fulcrum Website</name> - <url>${fulcrum.deployment.protocol}://people.apache.org/www/turbine.apache.org/fulcrum/fulcrum-jetty/</url> - </site> - </distributionManagement> - - <developers> - <developer> - <name>Siegfried Goeschl</name> - <id>sgoeschl</id> - <email>sgoes...@apache.org</email> - <organization /> - <roles> - <role>Java Developer</role> - </roles> - </developer> - </developers> - - <dependencies> - <!-- Avalon dependecies --> - <dependency> - <groupId>org.apache.avalon.framework</groupId> - <artifactId>avalon-framework-api</artifactId> - <version>4.3.1</version> - </dependency> - <!-- Jetty dependencies --> - <dependency> - <groupId>org.mortbay.jetty</groupId> - <artifactId>jetty</artifactId> - <version>${jetty.version}</version> - </dependency> - <dependency> - <groupId>org.mortbay.jetty</groupId> - <artifactId>jetty-plus</artifactId> - <version>${jetty.version}</version> - <exclusions> - <exclusion> - <groupId>geronimo-spec</groupId> - <artifactId>geronimo-spec-jta</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.mortbay.jetty</groupId> - <artifactId>jsp-2.1</artifactId> - <version>${jetty.version}</version> - <scope>optional</scope> - </dependency> - <!-- testing dependencies --> - <dependency> - <groupId>org.apache.fulcrum</groupId> - <artifactId>fulcrum-testcontainer</artifactId> - <version>1.0.8-SNAPSHOT</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.fulcrum</groupId> - <artifactId>fulcrum-yaafi</artifactId> - <version>1.0.8-SNAPSHOT</version> - <scope>test</scope> - </dependency> - </dependencies> - - <build> - <sourceDirectory>${basedir}/src/java</sourceDirectory> - <testSourceDirectory>${basedir}/src/test</testSourceDirectory> - </build> - - <profiles> - <profile> - <!-- enable this profile if you like run Jetty using 'mvn -Pstandalone clean test' --> - <id>standalone</id> - <properties> - <test>**/JettyTestRunner</test> - </properties> - </profile> - <profile> - <id>rc</id> - <distributionManagement> - <!-- Cannot define in parent ATM, see COMMONSSITE-26 --> - <site> - <id>apache.website</id> - <name>Apache Fulcrum Release Candidate Staging Site</name> - <url>${fulcrum.deployment.protocol}://people.apache.org/www/turbine.apache.org/builds/fulcrum/${fulcrum.componentid}/${fulcrum.release.version}/${fulcrum.rc.version}/site</url> - </site> - </distributionManagement> - </profile> - </profiles> - - <properties> - <!-- enforce using UTF-8 when building on Mac OS X --> - <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> - <!-- Default configuration for compiler source and target JVM --> - <maven.compile.source>1.4</maven.compile.source> - <maven.compile.target>1.5</maven.compile.target> - <!-- the Jetty version to pick up --> - <jetty.version>6.1.14</jetty.version> - <!-- This bits are used for the staging directory --> - <fulcrum.release.version>1.0.0</fulcrum.release.version> - <fulcrum.rc.version>RC1</fulcrum.rc.version> - </properties> - + <artifactId>turbine-parent</artifactId> + <groupId>org.apache.turbine</groupId> + <version>5</version> + </parent> + + <modelVersion>4.0.0</modelVersion> + <artifactId>fulcrum-jetty</artifactId> + <groupId>org.apache.fulcrum</groupId> + <version>1.0.1-SNAPSHOT</version> + <name>Fulcrum Jetty</name> + <inceptionYear>2008</inceptionYear> + <description>Avalon Component for an embeddable Jetty Servlet Container</description> + <url>http://turbine.apache.org/fulcrum/fulcrum-jetty/</url> + + <scm> + <connection>scm:svn:http://svn.apache.org/repos/asf/turbine/fulcrum/trunk/jetty/</connection> + <developerConnection>scm:svn:https://svn.apache.org/repos/asf/turbine/fulcrum/trunk/jetty/</developerConnection> + <url>http://svn.apache.org/viewvc/turbine/fulcrum/trunk/jetty/</url> + </scm> + + <developers> + <developer> + <name>Siegfried Goeschl</name> + <id>sgoeschl</id> + <email>sgoes...@apache.org</email> + <organization /> + <roles> + <role>Java Developer</role> + </roles> + </developer> + </developers> + + <dependencies> + <!-- Avalon dependecies --> + <dependency> + <groupId>org.apache.avalon.framework</groupId> + <artifactId>avalon-framework-api</artifactId> + <version>4.3.1</version> + </dependency> + <!-- Jetty dependencies --> + <dependency> + <groupId>org.mortbay.jetty</groupId> + <artifactId>jetty</artifactId> + <version>${jetty.version}</version> + </dependency> + <dependency> + <groupId>org.mortbay.jetty</groupId> + <artifactId>jetty-plus</artifactId> + <version>${jetty.version}</version> + <exclusions> + <exclusion> + <groupId>geronimo-spec</groupId> + <artifactId>geronimo-spec-jta</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.mortbay.jetty</groupId> + <artifactId>jsp-2.1</artifactId> + <version>${jetty.version}</version> + <scope>optional</scope> + </dependency> + <!-- testing dependencies --> + <dependency> + <groupId>org.apache.fulcrum</groupId> + <artifactId>fulcrum-testcontainer</artifactId> + <version>1.0.8-SNAPSHOT</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.fulcrum</groupId> + <artifactId>fulcrum-yaafi</artifactId> + <version>1.0.8-SNAPSHOT</version> + <scope>test</scope> + </dependency> + </dependencies> + + <build> + <sourceDirectory>${basedir}/src/java</sourceDirectory> + <testSourceDirectory>${basedir}/src/test</testSourceDirectory> + </build> + + <profiles> + <profile> + <!-- enable this profile if you like run Jetty using 'mvn -Pstandalone + clean test' --> + <id>standalone</id> + <properties> + <test>**/JettyTestRunner</test> + </properties> + </profile> + </profiles> + + <properties> + <turbine.site.path>fulcrum/fulcrum-jetty</turbine.site.path> + <!-- the Jetty version to pick up --> + <jetty.version>6.1.14</jetty.version> + </properties> + </project> \ No newline at end of file Modified: turbine/fulcrum/trunk/localization/pom.xml URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/localization/pom.xml?rev=1846008&r1=1846007&r2=1846008&view=diff ============================================================================== --- turbine/fulcrum/trunk/localization/pom.xml (original) +++ turbine/fulcrum/trunk/localization/pom.xml Wed Nov 7 13:36:32 2018 @@ -38,14 +38,6 @@ <url>http://svn.apache.org/viewvc/turbine/fulcrum/trunk/localization/</url> </scm> - <distributionManagement> - <site> - <id>apache.website</id> - <name>Fulcrum Website</name> - <url>${fulcrum.deployment.protocol}://people.apache.org/www/turbine.apache.org/fulcrum/fulcrum-localization/</url> - </site> - </distributionManagement> - <developers> <developer> <name>Eric Pugh</name> @@ -120,30 +112,8 @@ <testSourceDirectory>${basedir}/src/test</testSourceDirectory> </build> - <profiles> - <profile> - <id>rc</id> - <distributionManagement> - <!-- Cannot define in parent ATM, see COMMONSSITE-26 --> - <site> - <id>apache.website</id> - <name>Apache Fulcrum Release Candidate Staging Site</name> - <url>${fulcrum.deployment.protocol}://people.apache.org/www/turbine.apache.org/builds/fulcrum/${fulcrum.componentid}/${fulcrum.release.version}/${fulcrum.rc.version}/site</url> - </site> - </distributionManagement> - </profile> - </profiles> - <properties> - <!-- used for profile apache-release --> <turbine.site.path>fulcrum/fulcrum-localization</turbine.site.path> - <turbine.scmPubCheckoutDirectory>${turbine.site.cache}/fulcrum/localization</turbine.scmPubCheckoutDirectory> - <turbine.site.cache>${project.build.directory}/turbine-sites</turbine.site.cache> - <siteContent.path>${project.build.directory}/staging</siteContent.path> - <!-- This bits are used for the staging directory --> - <fulcrum.release.version>1.0.6</fulcrum.release.version> - <fulcrum.rc.version>RC1</fulcrum.rc.version> - <fulcrum.deployment.protocol>scpexe</fulcrum.deployment.protocol> </properties> </project> Modified: turbine/fulcrum/trunk/mimetype/pom.xml URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/mimetype/pom.xml?rev=1846008&r1=1846007&r2=1846008&view=diff ============================================================================== --- turbine/fulcrum/trunk/mimetype/pom.xml (original) +++ turbine/fulcrum/trunk/mimetype/pom.xml Wed Nov 7 13:36:32 2018 @@ -37,14 +37,6 @@ <url>http://svn.apache.org/viewvc/turbine/fulcrum/trunk/mimetype/</url> </scm> - <distributionManagement> - <site> - <id>apache.website</id> - <name>Fulcrum Website</name> - <url>${fulcrum.deployment.protocol}://people.apache.org/www/turbine.apache.org/fulcrum/fulcrum-mimetype/</url> - </site> - </distributionManagement> - <developers> <developer> <name>Siegfried Goeschl</name> @@ -83,25 +75,8 @@ <testSourceDirectory>${basedir}/src/test</testSourceDirectory> </build> - <profiles> - <profile> - <id>rc</id> - <distributionManagement> - <!-- Cannot define in parent ATM, see COMMONSSITE-26 --> - <site> - <id>apache.website</id> - <name>Apache Fulcrum Release Candidate Staging Site</name> - <url>${fulcrum.deployment.protocol}://people.apache.org/www/turbine.apache.org/builds/fulcrum/${fulcrum.componentid}/${fulcrum.release.version}/${fulcrum.rc.version}/site</url> - </site> - </distributionManagement> - </profile> - </profiles> - <properties> - <!-- This bits are used for the staging directory --> - <fulcrum.release.version>1.0.5</fulcrum.release.version> - <fulcrum.rc.version>RC2</fulcrum.rc.version> - <fulcrum.deployment.protocol>scpexe</fulcrum.deployment.protocol> + <turbine.site.path>fulcrum/fulcrum-mimetype</turbine.site.path> </properties> </project> \ No newline at end of file Modified: turbine/fulcrum/trunk/naming/pom.xml URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/naming/pom.xml?rev=1846008&r1=1846007&r2=1846008&view=diff ============================================================================== --- turbine/fulcrum/trunk/naming/pom.xml (original) +++ turbine/fulcrum/trunk/naming/pom.xml Wed Nov 7 13:36:32 2018 @@ -1,14 +1,20 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- 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. --> +<!-- + 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/maven-v4_0_0.xsd"> @@ -33,14 +39,6 @@ <url>http://svn.apache.org/viewvc/turbine/fulcrum/trunk/naming/</url> </scm> - <distributionManagement> - <site> - <id>apache.website</id> - <name>Fulcrum Website</name> - <url>${fulcrum.deployment.protocol}://people.apache.org/www/turbine.apache.org/fulcrum/fulcrum-naming/</url> - </site> - </distributionManagement> - <developers> <developer> <name>Thomas Vandahl</name> @@ -76,42 +74,10 @@ <build> <sourceDirectory>${basedir}/src/java</sourceDirectory> <testSourceDirectory>${basedir}/src/test</testSourceDirectory> - - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <source>${maven.compiler.source}</source> - <target>${maven.compiler.target}</target> - </configuration> - </plugin> - </plugins> </build> - <profiles> - <profile> - <id>rc</id> - <distributionManagement> - <!-- Cannot define in parent ATM, see COMMONSSITE-26 --> - <site> - <id>apache.website</id> - <name>Apache Fulcrum Release Candidate Staging Site</name> - <url>${fulcrum.deployment.protocol}://people.apache.org/www/turbine.apache.org/builds/fulcrum/${fulcrum.componentid}/${fulcrum.release.version}/${fulcrum.rc.version}/site</url> - </site> - </distributionManagement> - </profile> - </profiles> - - <properties> - <maven.compiler.target>1.8</maven.compiler.target> - <maven.compiler.source>1.8</maven.compiler.source> - - <!-- This bits are used for the staging directory --> - <fulcrum.release.version>1.0.3-SNAPSHOT</fulcrum.release.version> - <fulcrum.rc.version>RC1</fulcrum.rc.version> - <fulcrum.deployment.protocol>scpexe</fulcrum.deployment.protocol> + <turbine.site.path>fulcrum/fulcrum-naming</turbine.site.path> </properties> </project> Modified: turbine/fulcrum/trunk/parser/pom.xml URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/parser/pom.xml?rev=1846008&r1=1846007&r2=1846008&view=diff ============================================================================== --- turbine/fulcrum/trunk/parser/pom.xml (original) +++ turbine/fulcrum/trunk/parser/pom.xml Wed Nov 7 13:36:32 2018 @@ -123,8 +123,6 @@ </build> <properties> - <maven.compiler.source>1.8</maven.compiler.source> - <maven.compiler.target>1.8</maven.compiler.target> <turbine.site.path>fulcrum/fulcrum-parser</turbine.site.path> </properties> Modified: turbine/fulcrum/trunk/pbe/pom.xml URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/pbe/pom.xml?rev=1846008&r1=1846007&r2=1846008&view=diff ============================================================================== --- turbine/fulcrum/trunk/pbe/pom.xml (original) +++ turbine/fulcrum/trunk/pbe/pom.xml Wed Nov 7 13:36:32 2018 @@ -1,3 +1,20 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + 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/maven-v4_0_0.xsd"> <parent> <artifactId>turbine-parent</artifactId> @@ -20,14 +37,6 @@ <url>http://svn.apache.org/viewvc/turbine/fulcrum/trunk/pbe/</url> </scm> - <distributionManagement> - <site> - <id>apache.website</id> - <name>Fulcrum Website</name> - <url>${fulcrum.deployment.protocol}://people.apache.org/www/turbine.apache.org/fulcrum/fulcrum-pbe/</url> - </site> - </distributionManagement> - <developers> <developer> <name>Siegfried Goeschl</name> @@ -72,24 +81,8 @@ <testSourceDirectory>${basedir}/src/test</testSourceDirectory> </build> - <profiles> - <profile> - <id>rc</id> - <distributionManagement> - <!-- Cannot define in parent ATM, see COMMONSSITE-26 --> - <site> - <id>apache.website</id> - <name>Apache Fulcrum Release Candidate Staging Site</name> - <url>${fulcrum.deployment.protocol}://people.apache.org/www/turbine.apache.org/builds/fulcrum/${fulcrum.componentid}/${fulcrum.release.version}/${fulcrum.rc.version}/site</url> - </site> - </distributionManagement> - </profile> - </profiles> - - <properties> - <!-- This bits are used for the staging directory --> - <fulcrum.release.version>1.0.1</fulcrum.release.version> - <fulcrum.rc.version>RC1</fulcrum.rc.version> - </properties> + <properties> + <turbine.site.path>fulcrum/fulcrum-pbe</turbine.site.path> + </properties> -</project> \ No newline at end of file +</project> Modified: turbine/fulcrum/trunk/pbe/src/test/org/apache/fulcrum/pbe/PBEServiceTest.java URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/pbe/src/test/org/apache/fulcrum/pbe/PBEServiceTest.java?rev=1846008&r1=1846007&r2=1846008&view=diff ============================================================================== --- turbine/fulcrum/trunk/pbe/src/test/org/apache/fulcrum/pbe/PBEServiceTest.java (original) +++ turbine/fulcrum/trunk/pbe/src/test/org/apache/fulcrum/pbe/PBEServiceTest.java Wed Nov 7 13:36:32 2018 @@ -197,10 +197,10 @@ public class PBEServiceTest extends Base String plainText = "Nobody knows the troubles I have seen ..."; this.getService().encrypt(plainText, new File("./target/temp/plain.enc.txt"), "mysecret".toCharArray()); - this.getService().encrypt(new File("./project.xml"), new File("./target/temp/project.enc.xml"), "mysecret".toCharArray()); + this.getService().encrypt(new File("./pom.xml"), new File("./target/temp/pom.enc.xml"), "mysecret".toCharArray()); this.getService().decrypt(new File("./target/temp/plain.enc.txt"), new File("./target/temp/plain.dec.txt"), "mysecret".toCharArray()); - this.getService().decrypt(new File("./target/temp/project.enc.xml"), new File("./target/temp/project.dec.xml"), "mysecret".toCharArray()); + this.getService().decrypt(new File("./target/temp/pom.enc.xml"), new File("./target/temp/pom.dec.xml"), "mysecret".toCharArray()); } Modified: turbine/fulcrum/trunk/pool/pom.xml URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/pool/pom.xml?rev=1846008&r1=1846007&r2=1846008&view=diff ============================================================================== --- turbine/fulcrum/trunk/pool/pom.xml (original) +++ turbine/fulcrum/trunk/pool/pom.xml Wed Nov 7 13:36:32 2018 @@ -37,14 +37,6 @@ <url>http://svn.apache.org/viewvc/turbine/fulcrum/trunk/pool/</url> </scm> - <distributionManagement> - <site> - <id>apache.website</id> - <name>Fulcrum Website</name> - <url>${fulcrum.deployment.protocol}://people.apache.org/www/turbine.apache.org/fulcrum/fulcrum-pool/</url> - </site> - </distributionManagement> - <developers> <developer> <name>Eric Pugh</name> @@ -108,42 +100,10 @@ <build> <sourceDirectory>${basedir}/src/java</sourceDirectory> <testSourceDirectory>${basedir}/src/test</testSourceDirectory> - - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <source>${maven.compiler.source}</source> - <target>${maven.compiler.target}</target> - </configuration> - </plugin> - </plugins> </build> - <profiles> - <profile> - <id>rc</id> - <distributionManagement> - <!-- Cannot define in parent ATM, see COMMONSSITE-26 --> - <site> - <id>apache.website</id> - <name>Apache Fulcrum Release Candidate Staging Site</name> - <url>${fulcrum.deployment.protocol}://people.apache.org/www/turbine.apache.org/builds/fulcrum/${fulcrum.componentid}/${fulcrum.release.version}/${fulcrum.rc.version}/site</url> - </site> - </distributionManagement> - </profile> - </profiles> - - <properties> - <maven.compiler.target>1.8</maven.compiler.target> - <maven.compiler.source>1.8</maven.compiler.source> - - <!-- This bits are used for the staging directory --> - <fulcrum.release.version>1.0.4</fulcrum.release.version> - <fulcrum.rc.version>RC1</fulcrum.rc.version> - <fulcrum.deployment.protocol>scpexe</fulcrum.deployment.protocol> + <turbine.site.path>fulcrum/fulcrum-pool</turbine.site.path> </properties> </project> Modified: turbine/fulcrum/trunk/resourcemanager/pom.xml URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/resourcemanager/pom.xml?rev=1846008&r1=1846007&r2=1846008&view=diff ============================================================================== --- turbine/fulcrum/trunk/resourcemanager/pom.xml (original) +++ turbine/fulcrum/trunk/resourcemanager/pom.xml Wed Nov 7 13:36:32 2018 @@ -1,5 +1,5 @@ +<?xml version="1.0" encoding="UTF-8"?> <!-- - 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. @@ -14,123 +14,93 @@ 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/maven-v4_0_0.xsd"> - <parent> - <artifactId>turbine-parent</artifactId> - <groupId>org.apache.turbine</groupId> - <version>5</version> - </parent> - - <modelVersion>4.0.0</modelVersion> - <groupId>org.apache.fulcrum</groupId> - <artifactId>fulcrum-resourcemanager</artifactId> - <version>1.0.2-SNAPSHOT</version> - <name>Fulcrum ResourceManager</name> - <inceptionYear>2005</inceptionYear> - <description>Fulcrum ResourceManager Service</description> - <url>http://turbine.apache.org/fulcrum/fulcrum-resourcemanager</url> - - <scm> - <connection>scm:svn:http://svn.apache.org/repos/asf/turbine/fulcrum/trunk/resourcemanager/</connection> - <developerConnection>scm:svn:https://svn.apache.org/repos/asf/turbine/fulcrum/trunk/resourcemanager/ +<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/maven-v4_0_0.xsd"> + <parent> + <artifactId>turbine-parent</artifactId> + <groupId>org.apache.turbine</groupId> + <version>5</version> + </parent> + + <modelVersion>4.0.0</modelVersion> + <groupId>org.apache.fulcrum</groupId> + <artifactId>fulcrum-resourcemanager</artifactId> + <version>1.0.2-SNAPSHOT</version> + <name>Fulcrum ResourceManager</name> + <inceptionYear>2005</inceptionYear> + <description>Fulcrum ResourceManager Service</description> + <url>http://turbine.apache.org/fulcrum/fulcrum-resourcemanager</url> + + <scm> + <connection>scm:svn:http://svn.apache.org/repos/asf/turbine/fulcrum/trunk/resourcemanager/</connection> + <developerConnection>scm:svn:https://svn.apache.org/repos/asf/turbine/fulcrum/trunk/resourcemanager/ </developerConnection> - <url>http://svn.apache.org/viewvc/turbine/fulcrum/trunk/resourcemanager/</url> - </scm> + <url>http://svn.apache.org/viewvc/turbine/fulcrum/trunk/resourcemanager/</url> + </scm> + + <developers> + <developer> + <name>Siegfried Goeschl</name> + <id>sgoeschl</id> + <email>sgoes...@apache.org</email> + <organization /> + <roles> + <role>Java Developer</role> + </roles> + </developer> + </developers> + + <dependencies> + <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-lang3</artifactId> + <version>3.8.1</version> + </dependency> + <dependency> + <groupId>org.apache.avalon.framework</groupId> + <artifactId>avalon-framework-api</artifactId> + <version>4.3.1</version> + </dependency> + <dependency> + <groupId>org.apache.fulcrum</groupId> + <artifactId>fulcrum-pbe</artifactId> + <version>1.0.2-SNAPSHOT</version> + </dependency> + <!-- testing dependencies --> + <dependency> + <groupId>org.apache.fulcrum</groupId> + <artifactId>fulcrum-testcontainer</artifactId> + <version>1.0.8-SNAPSHOT</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.fulcrum</groupId> + <artifactId>fulcrum-yaafi</artifactId> + <version>1.0.8-SNAPSHOT</version> + <scope>test</scope> + </dependency> + </dependencies> + + <build> + <sourceDirectory>${basedir}/src/java</sourceDirectory> + <testSourceDirectory>${basedir}/src/test</testSourceDirectory> + </build> + + <reporting> + <plugins> + <plugin> + <!-- get test coverage for regression tests --> + <groupId>org.codehaus.mojo</groupId> + <artifactId>cobertura-maven-plugin</artifactId> + <version>2.3</version> + </plugin> + </plugins> + </reporting> + + <properties> + <turbine.site.path>fulcrum/fulcrum-resourcemanager</turbine.site.path> + </properties> - <distributionManagement> - <site> - <id>apache.website</id> - <name>Fulcrum Website</name> - <url> - ${fulcrum.deployment.protocol}://people.apache.org/www/turbine.apache.org/fulcrum/fulcrum-resourcemanager/ - </url> - </site> - </distributionManagement> - - <developers> - <developer> - <name>Siegfried Goeschl</name> - <id>sgoeschl</id> - <email>sgoes...@apache.org</email> - <organization/> - <roles> - <role>Java Developer</role> - </roles> - </developer> - </developers> - - <dependencies> - <dependency> - <groupId>org.apache.commons</groupId> - <artifactId>commons-lang3</artifactId> - <version>3.8.1</version> - </dependency> - <dependency> - <groupId>org.apache.avalon.framework</groupId> - <artifactId>avalon-framework-api</artifactId> - <version>4.3.1</version> - </dependency> - <dependency> - <groupId>org.apache.fulcrum</groupId> - <artifactId>fulcrum-pbe</artifactId> - <version>1.0.2-SNAPSHOT</version> - </dependency> - <!-- testing dependencies --> - <dependency> - <groupId>org.apache.fulcrum</groupId> - <artifactId>fulcrum-testcontainer</artifactId> - <version>1.0.8-SNAPSHOT</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.fulcrum</groupId> - <artifactId>fulcrum-yaafi</artifactId> - <version>1.0.8-SNAPSHOT</version> - <scope>test</scope> - </dependency> - </dependencies> - - <build> - <sourceDirectory>${basedir}/src/java</sourceDirectory> - <testSourceDirectory>${basedir}/src/test</testSourceDirectory> - </build> - - <reporting> - <plugins> - <plugin> - <!-- get test coverage for regression tests --> - <groupId>org.codehaus.mojo</groupId> - <artifactId>cobertura-maven-plugin</artifactId> - <version>2.3</version> - </plugin> - </plugins> - </reporting> - - <properties> - <!-- Default configuration for compiler source and target JVM --> - <maven.compile.source>1.8</maven.compile.source> - <maven.compile.target>1.8</maven.compile.target> - <fulcrum.release.version>1.0.1</fulcrum.release.version> - <fulcrum.rc.version>RC2</fulcrum.rc.version> - </properties> - - <profiles> - <profile> - <id>rc</id> - <distributionManagement> - <!-- Cannot define in parent ATM, see COMMONSSITE-26 --> - <site> - <id>apache.website</id> - <name>Apache Fulcrum Release Candidate Staging Site</name> - <url> - ${fulcrum.deployment.protocol}://people.apache.org/www/turbine.apache.org/builds/fulcrum/${fulcrum.componentid}/${fulcrum.release.version}/${fulcrum.rc.version}/site - </url> - </site> - </distributionManagement> - </profile> - </profiles> </project> Modified: turbine/fulcrum/trunk/script/pom.xml URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/script/pom.xml?rev=1846008&r1=1846007&r2=1846008&view=diff ============================================================================== --- turbine/fulcrum/trunk/script/pom.xml (original) +++ turbine/fulcrum/trunk/script/pom.xml Wed Nov 7 13:36:32 2018 @@ -1,4 +1,4 @@ -<?xml version="1.0"?> +<?xml version="1.0" encoding="UTF-8"?> <!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with @@ -15,88 +15,81 @@ 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/maven-v4_0_0.xsd"> - <parent> - <artifactId>turbine-parent</artifactId> - <groupId>org.apache.turbine</groupId> - <version>5</version> - </parent> - <modelVersion>4.0.0</modelVersion> - <groupId>org.apache.fulcrum</groupId> - <artifactId>fulcrum-script</artifactId> - <version>1.0.1-SNAPSHOT</version> - <name>Fulcrum Script Component</name> - <inceptionYear>2004</inceptionYear> - <description>A JSR 223 scripting Avalon component</description> - <url>http://turbine.apache.org/fulcrum/fulcrum-script</url> - - <scm> - <connection>scm:svn:http://svn.apache.org/repos/asf/turbine/fulcrum/trunk/script</connection> - <developerConnection>scm:svn:https://svn.apache.org/repos/asf/turbine/fulcrum/trunk/script</developerConnection> - <url>http://svn.apache.org/viewvc/turbine/fulcrum/trunk/script</url> - </scm> - - <distributionManagement> - <site> - <id>apache.website</id> - <name>Fulcrum Website</name> - <url>http://turbine.apache.org/fulcrum/fulcrum-script/</url> - </site> - </distributionManagement> - - <developers> - <developer> - <name>Siegfried Goeschl</name> - <id>sgoeschl</id> - <email>sgoes...@apache.org</email> - <organization /> - <roles> - <role>Java Developer</role> - </roles> - </developer> - </developers> - - <dependencies> - <dependency> - <groupId>org.apache.fulcrum</groupId> - <artifactId>fulcrum-resourcemanager</artifactId> - <version>1.0.2-SNAPSHOT</version> - </dependency> - <!-- Testing dependencies --> - <dependency> - <groupId>org.codehaus.groovy</groupId> - <artifactId>groovy-all</artifactId> - <version>2.4.4</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.codehaus.groovy</groupId> - <artifactId>groovy-jsr223</artifactId> - <version>2.4.4</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.fulcrum</groupId> - <artifactId>fulcrum-testcontainer</artifactId> - <version>1.0.8-SNAPSHOT</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.fulcrum</groupId> - <artifactId>fulcrum-yaafi</artifactId> - <version>1.0.8-SNAPSHOT</version> - <scope>test</scope> - </dependency> - </dependencies> - - <build> - <sourceDirectory>${basedir}/src/java</sourceDirectory> - <testSourceDirectory>${basedir}/src/test</testSourceDirectory> - </build> - - - <properties> - <turbine.site.path>fulcrum/fulcrum-script</turbine.site.path> - </properties> - +<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/maven-v4_0_0.xsd"> + <parent> + <artifactId>turbine-parent</artifactId> + <groupId>org.apache.turbine</groupId> + <version>5</version> + </parent> + <modelVersion>4.0.0</modelVersion> + <groupId>org.apache.fulcrum</groupId> + <artifactId>fulcrum-script</artifactId> + <version>1.0.1-SNAPSHOT</version> + <name>Fulcrum Script Component</name> + <inceptionYear>2004</inceptionYear> + <description>A JSR 223 scripting Avalon component</description> + <url>http://turbine.apache.org/fulcrum/fulcrum-script</url> + + <scm> + <connection>scm:svn:http://svn.apache.org/repos/asf/turbine/fulcrum/trunk/script</connection> + <developerConnection>scm:svn:https://svn.apache.org/repos/asf/turbine/fulcrum/trunk/script</developerConnection> + <url>http://svn.apache.org/viewvc/turbine/fulcrum/trunk/script</url> + </scm> + + <developers> + <developer> + <name>Siegfried Goeschl</name> + <id>sgoeschl</id> + <email>sgoes...@apache.org</email> + <organization /> + <roles> + <role>Java Developer</role> + </roles> + </developer> + </developers> + + <dependencies> + <dependency> + <groupId>org.apache.fulcrum</groupId> + <artifactId>fulcrum-resourcemanager</artifactId> + <version>1.0.2-SNAPSHOT</version> + </dependency> + <!-- Testing dependencies --> + <dependency> + <groupId>org.codehaus.groovy</groupId> + <artifactId>groovy-all</artifactId> + <version>2.4.4</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.codehaus.groovy</groupId> + <artifactId>groovy-jsr223</artifactId> + <version>2.4.4</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.fulcrum</groupId> + <artifactId>fulcrum-testcontainer</artifactId> + <version>1.0.8-SNAPSHOT</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.fulcrum</groupId> + <artifactId>fulcrum-yaafi</artifactId> + <version>1.0.8-SNAPSHOT</version> + <scope>test</scope> + </dependency> + </dependencies> + + <build> + <sourceDirectory>${basedir}/src/java</sourceDirectory> + <testSourceDirectory>${basedir}/src/test</testSourceDirectory> + </build> + + <properties> + <turbine.site.path>fulcrum/fulcrum-script</turbine.site.path> + </properties> + </project> \ No newline at end of file Modified: turbine/fulcrum/trunk/security/torque/pom.xml URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/torque/pom.xml?rev=1846008&r1=1846007&r2=1846008&view=diff ============================================================================== --- turbine/fulcrum/trunk/security/torque/pom.xml (original) +++ turbine/fulcrum/trunk/security/torque/pom.xml Wed Nov 7 13:36:32 2018 @@ -70,11 +70,6 @@ <!-- exclude generated sources for now (only works when running mvn javadoc:javadoc, but not with mvn site? --> <excludePackageNames>org.apache.fulcrum.security.torque.om*</excludePackageNames> - - <!-- adding this did not help :( --> - <sourceFileExcludes> - <sourceFileExclude>**/torque/target/generated-sources/*.java</sourceFileExclude> - </sourceFileExcludes> </configuration> </plugin> Modified: turbine/fulcrum/trunk/servicemanager/pom.xml URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/servicemanager/pom.xml?rev=1846008&r1=1846007&r2=1846008&view=diff ============================================================================== --- turbine/fulcrum/trunk/servicemanager/pom.xml (original) +++ turbine/fulcrum/trunk/servicemanager/pom.xml Wed Nov 7 13:36:32 2018 @@ -1,4 +1,4 @@ -<?xml version="1.0"?> +<?xml version="1.0" encoding="UTF-8"?> <!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with @@ -15,75 +15,70 @@ 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/maven-v4_0_0.xsd"> - <parent> +<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/maven-v4_0_0.xsd"> + <parent> <artifactId>turbine-parent</artifactId> <groupId>org.apache.turbine</groupId> <version>5</version> - </parent> + </parent> + + <modelVersion>4.0.0</modelVersion> + <artifactId>fulcrum-servicemanager</artifactId> + <groupId>org.apache.fulcrum</groupId> + <version>1.0.0-SNAPSHOT</version> + <name>Fulcrum ServiceManager</name> + <inceptionYear>2008</inceptionYear> + <description>Fulcrum ServiceManager Service</description> + <url>http://turbine.apache.org/fulcrum/fulcrum-servicemanager</url> + + <scm> + <connection>scm:svn:http://svn.apache.org/repos/asf/turbine/fulcrum/trunk/servicemanager/</connection> + <developerConnection>scm:svn:https://svn.apache.org/repos/asf/turbine/fulcrum/trunk/servicemanager/</developerConnection> + <url>http://svn.apache.org/viewvc/turbine/fulcrum/trunk/servicemanager/</url> + </scm> + + <developers> + <developer> + <name>Siegfried Goeschl</name> + <id>sgoeschl</id> + <email>sgoes...@apache.org</email> + <organization></organization> + <roles> + <role>Java Developer</role> + </roles> + </developer> + </developers> + + <dependencies> + <dependency> + <groupId>org.apache.avalon.framework</groupId> + <artifactId>avalon-framework-api</artifactId> + <version>4.3.1</version> + </dependency> + <!-- testing dependencies --> + <dependency> + <groupId>org.apache.fulcrum</groupId> + <artifactId>fulcrum-testcontainer</artifactId> + <version>1.0.8-SNAPSHOT</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.fulcrum</groupId> + <artifactId>fulcrum-yaafi</artifactId> + <version>1.0.8-SNAPSHOT</version> + <scope>test</scope> + </dependency> + </dependencies> + + <build> + <sourceDirectory>${basedir}/src/java</sourceDirectory> + <testSourceDirectory>${basedir}/src/test</testSourceDirectory> + </build> + + <properties> + <turbine.site.path>fulcrum/fulcrum-servicemanager</turbine.site.path> + </properties> - <modelVersion>4.0.0</modelVersion> - <artifactId>fulcrum-servicemanager</artifactId> - <groupId>org.apache.fulcrum</groupId> - <version>1.0.0-SNAPSHOT</version> - <name>Fulcrum ServiceManager</name> - <inceptionYear>2008</inceptionYear> - <description>Fulcrum ServiceManager Service</description> - <url>http://turbine.apache.org/fulcrum/fulcrum-servicemanager</url> - - <scm> - <connection>scm:svn:http://svn.apache.org/repos/asf/turbine/fulcrum/trunk/servicemanager/</connection> - <developerConnection>scm:svn:https://svn.apache.org/repos/asf/turbine/fulcrum/trunk/servicemanager/</developerConnection> - <url>http://svn.apache.org/viewvc/turbine/fulcrum/trunk/servicemanager/</url> - </scm> - - <distributionManagement> - <site> - <id>apache.website</id> - <name>Fulcrum Website</name> - <url>${fulcrum.deployment.protocol}://people.apache.org/www/turbine.apache.org/fulcrum/fulcrum-servicemanager/</url> - </site> - </distributionManagement> - - <developers> - <developer> - <name>Siegfried Goeschl</name> - <id>sgoeschl</id> - <email>sgoes...@apache.org</email> - <organization></organization> - <roles> - <role>Java Developer</role> - </roles> - </developer> - </developers> - - <dependencies> - <dependency> - <groupId>org.apache.avalon.framework</groupId> - <artifactId>avalon-framework-api</artifactId> - <version>4.3.1</version> - </dependency> - <!-- testing dependencies --> - <dependency> - <groupId>org.apache.fulcrum</groupId> - <artifactId>fulcrum-testcontainer</artifactId> - <version>1.0.8-SNAPSHOT</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.fulcrum</groupId> - <artifactId>fulcrum-yaafi</artifactId> - <version>1.0.8-SNAPSHOT</version> - <scope>test</scope> - </dependency> - </dependencies> - - <build> - <sourceDirectory>${basedir}/src/java</sourceDirectory> - <testSourceDirectory>${basedir}/src/test</testSourceDirectory> - </build> - </project> Modified: turbine/fulcrum/trunk/spring/pom.xml URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/spring/pom.xml?rev=1846008&r1=1846007&r2=1846008&view=diff ============================================================================== --- turbine/fulcrum/trunk/spring/pom.xml (original) +++ turbine/fulcrum/trunk/spring/pom.xml Wed Nov 7 13:36:32 2018 @@ -1,117 +1,99 @@ -<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/maven-v4_0_0.xsd"> - <parent> - <artifactId>turbine-parent</artifactId> - <groupId>org.apache.turbine</groupId> - <version>5</version> - </parent> - - <modelVersion>4.0.0</modelVersion> - <artifactId>fulcrum-spring</artifactId> - <groupId>org.apache.fulcrum</groupId> - <version>1.0.1-SNAPSHOT</version> - <name>Fulcrum Spring</name> - <inceptionYear>2008</inceptionYear> - <description>Fulcrum Spring Container Integration Service</description> - <url>http://turbine.apache.org/fulcrum/fulcrum-spring</url> - - <scm> - <connection>scm:svn:http://svn.apache.org/repos/asf/turbine/fulcrum/trunk/spring/</connection> - <developerConnection>scm:svn:https://svn.apache.org/repos/asf/turbine/fulcrum/trunk/spring/</developerConnection> - <url>http://svn.apache.org/viewvc/turbine/fulcrum/trunk/spring/</url> - </scm> - - <distributionManagement> - <site> - <id>apache.website</id> - <name>Fulcrum Website</name> - <url>${fulcrum.deployment.protocol}://people.apache.org/www/turbine.apache.org/fulcrum/fulcrum-spring/</url> - </site> - </distributionManagement> - - <developers> - <developer> - <name>Siegfried Goeschl</name> - <id>sgoeschl</id> - <email>sgoes...@apache.org</email> - <organization /> - <roles> - <role>Java Developer</role> - </roles> - </developer> - </developers> - - <dependencies> - <!-- Avalon dependencies --> - <dependency> - <groupId>org.apache.avalon.framework</groupId> - <artifactId>avalon-framework-api</artifactId> - <version>4.3.1</version> - </dependency> - <!-- The YaafiContainerBean requires YAAFI --> - <dependency> - <groupId>org.apache.fulcrum</groupId> - <artifactId>fulcrum-yaafi</artifactId> - <version>1.0.8-SNAPSHOT</version> - <optional>true</optional> - </dependency> - <!-- Spring depedencies - these are optional so you have to declare your Spring dependency manually --> - <!-- - <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring</artifactId> - <version>2.5.6</version> - <optional>true</optional> - <exclusions> - <exclusion> - <groupId>javax.mail</groupId> - <artifactId>mail</artifactId> - </exclusion> - </exclusions> - </dependency> - --> - <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-context</artifactId> - <version>${spring.version}</version> - <optional>true</optional> - </dependency> - <!-- testing dependencies --> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>3.8.2</version> - <scope>test</scope> - </dependency> - </dependencies> - - <build> - <sourceDirectory>${basedir}/src/java</sourceDirectory> - <testSourceDirectory>${basedir}/src/test</testSourceDirectory> - </build> - - <properties> - <!-- Default configuration for compiler source and target JVM --> - <maven.compile.source>1.8</maven.compile.source> - <maven.compile.target>1.8</maven.compile.target> - <!-- This bits are used for the staging directory --> - <fulcrum.release.version>1.0.0</fulcrum.release.version> - <fulcrum.rc.version>RC1</fulcrum.rc.version> - <!-- the spring version to pick up --> - <spring.version>4.1.6.RELEASE</spring.version> - </properties> - - <profiles> - <profile> - <id>rc</id> - <distributionManagement> - <!-- Cannot define in parent ATM, see COMMONSSITE-26 --> - <site> - <id>apache.website</id> - <name>Apache Fulcrum Release Candidate Staging Site</name> - <url>${fulcrum.deployment.protocol}://people.apache.org/www/turbine.apache.org/builds/fulcrum/${fulcrum.componentid}/${fulcrum.release.version}/${fulcrum.rc.version}/site</url> - </site> - </distributionManagement> - </profile> - </profiles> +<?xml version="1.0" encoding="UTF-8"?> +<!-- + 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/maven-v4_0_0.xsd"> + <parent> + <artifactId>turbine-parent</artifactId> + <groupId>org.apache.turbine</groupId> + <version>5</version> + </parent> + + <modelVersion>4.0.0</modelVersion> + <artifactId>fulcrum-spring</artifactId> + <groupId>org.apache.fulcrum</groupId> + <version>1.0.1-SNAPSHOT</version> + <name>Fulcrum Spring</name> + <inceptionYear>2008</inceptionYear> + <description>Fulcrum Spring Container Integration Service</description> + <url>http://turbine.apache.org/fulcrum/fulcrum-spring</url> + + <scm> + <connection>scm:svn:http://svn.apache.org/repos/asf/turbine/fulcrum/trunk/spring/</connection> + <developerConnection>scm:svn:https://svn.apache.org/repos/asf/turbine/fulcrum/trunk/spring/</developerConnection> + <url>http://svn.apache.org/viewvc/turbine/fulcrum/trunk/spring/</url> + </scm> + + <developers> + <developer> + <name>Siegfried Goeschl</name> + <id>sgoeschl</id> + <email>sgoes...@apache.org</email> + <organization /> + <roles> + <role>Java Developer</role> + </roles> + </developer> + </developers> + + <dependencies> + <!-- Avalon dependencies --> + <dependency> + <groupId>org.apache.avalon.framework</groupId> + <artifactId>avalon-framework-api</artifactId> + <version>4.3.1</version> + </dependency> + <!-- The YaafiContainerBean requires YAAFI --> + <dependency> + <groupId>org.apache.fulcrum</groupId> + <artifactId>fulcrum-yaafi</artifactId> + <version>1.0.8-SNAPSHOT</version> + <optional>true</optional> + </dependency> + <!-- Spring depedencies - these are optional so you have to declare your + Spring dependency manually --> + <!-- <dependency> <groupId>org.springframework</groupId> <artifactId>spring</artifactId> + <version>2.5.6</version> <optional>true</optional> <exclusions> <exclusion> + <groupId>javax.mail</groupId> <artifactId>mail</artifactId> </exclusion> + </exclusions> </dependency> --> + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-context</artifactId> + <version>${spring.version}</version> + <optional>true</optional> + </dependency> + <!-- testing dependencies --> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>3.8.2</version> + <scope>test</scope> + </dependency> + </dependencies> + + <build> + <sourceDirectory>${basedir}/src/java</sourceDirectory> + <testSourceDirectory>${basedir}/src/test</testSourceDirectory> + </build> + + <properties> + <turbine.site.path>fulcrum/fulcrum-spring</turbine.site.path> + <spring.version>4.1.6.RELEASE</spring.version> + </properties> </project> \ No newline at end of file Modified: turbine/fulcrum/trunk/testcontainer/pom.xml URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/testcontainer/pom.xml?rev=1846008&r1=1846007&r2=1846008&view=diff ============================================================================== --- turbine/fulcrum/trunk/testcontainer/pom.xml (original) +++ turbine/fulcrum/trunk/testcontainer/pom.xml Wed Nov 7 13:36:32 2018 @@ -37,14 +37,6 @@ <url>http://svn.apache.org/viewvc/turbine/fulcrum/trunk/testcontainer</url> </scm> - <distributionManagement> - <site> - <id>apache.website</id> - <name>Fulcrum Website</name> - <url>http://turbine.apache.org/fulcrum/fulcrum-testcontainer/</url> - </site> - </distributionManagement> - <developers> <developer> <name>Siegfried Goeschl</name> @@ -126,7 +118,6 @@ </plugin> </plugins> </build> - <properties> <turbine.site.path>fulcrum/fulcrum-testcontainer</turbine.site.path> Modified: turbine/fulcrum/trunk/xmlrpc/pom.xml URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/xmlrpc/pom.xml?rev=1846008&r1=1846007&r2=1846008&view=diff ============================================================================== --- turbine/fulcrum/trunk/xmlrpc/pom.xml (original) +++ turbine/fulcrum/trunk/xmlrpc/pom.xml Wed Nov 7 13:36:32 2018 @@ -1,4 +1,4 @@ -<?xml version="1.0"?> +<?xml version="1.0" encoding="UTF-8"?> <!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with @@ -15,116 +15,111 @@ 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/maven-v4_0_0.xsd"> - <parent> - <artifactId>turbine-parent</artifactId> - <groupId>org.apache.turbine</groupId> - <version>5</version> - </parent> - - <modelVersion>4.0.0</modelVersion> - <artifactId>fulcrum-xmlrpc</artifactId> - <groupId>org.apache.fulcrum</groupId> - <version>1.0.6-SNAPSHOT</version> - <name>Fulcrum XMLRPC</name> - <inceptionYear>2005</inceptionYear> - <description>Fulcrum XMLRPC Service</description> - <url>http://turbine.apache.org/fulcrum/fulcrum-xmlrpc</url> - - <scm> - <connection>scm:svn:http://svn.apache.org/repos/asf/turbine/fulcrum/trunk/xmlrpc/</connection> - <developerConnection>scm:svn:https://svn.apache.org/repos/asf/turbine/fulcrum/trunk/xmlrpc/</developerConnection> - <url>http://svn.apache.org/viewvc/turbine/fulcrum/trunk/xmlrpc/</url> - </scm> - - <distributionManagement> - <site> - <id>apache.website</id> - <name>Fulcrum Website</name> - <url>${fulcrum.deployment.protocol}://people.apache.org/www/turbine.apache.org/fulcrum/fulcrum-xmlrpc/</url> - </site> - </distributionManagement> - - <developers> - <developer> - <name>Eric Pugh</name> - <id>epugh</id> - <email>ep...@upstate.com</email> - </developer> - <developer> - <name>Henning P. Schmiedehausen</name> - <id>henning</id> - <email>h...@intermeta.de</email> - <organization>INTERMETA - Gesellschaft fuer Mehrwertdienste mbH</organization> - <roles> - <role>Java Developer</role> - </roles> - </developer> - <developer> - <name>Siegfried Goeschl</name> - <id>sgoeschl</id> - <email>sgoes...@apache.org</email> - <organization></organization> - <roles> - <role>Java Developer</role> - </roles> - </developer> - <developer> - <name>Thomas Vandahl</name> - <id>tv</id> - <email>t...@apache.org</email> - <organization></organization> - <roles> - <role>Java Developer</role> - </roles> - </developer> - </developers> - - <dependencies> - <dependency> - <groupId>org.apache.avalon.framework</groupId> - <artifactId>avalon-framework-api</artifactId> - <version>4.3.1</version> - </dependency> - - <dependency> - <groupId>commons-codec</groupId> - <artifactId>commons-codec</artifactId> - <version>1.11</version> - </dependency> - <dependency> - <groupId>xmlrpc</groupId> - <artifactId>xmlrpc</artifactId> - <version>2.0.1</version> - </dependency> - - <dependency> - <groupId>xerces</groupId> - <artifactId>xercesImpl</artifactId> - <version>2.12.0</version> - </dependency> - - <!-- testing dependencies --> - <dependency> - <groupId>org.apache.fulcrum</groupId> - <artifactId>fulcrum-testcontainer</artifactId> - <version>1.0.8-SNAPSHOT</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.fulcrum</groupId> - <artifactId>fulcrum-yaafi</artifactId> - <version>1.0.8-SNAPSHOT</version> - <scope>test</scope> - </dependency> - </dependencies> - - <build> - <sourceDirectory>${basedir}/src/java</sourceDirectory> - <testSourceDirectory>${basedir}/src/test</testSourceDirectory> - </build> - +<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/maven-v4_0_0.xsd"> + <parent> + <artifactId>turbine-parent</artifactId> + <groupId>org.apache.turbine</groupId> + <version>5</version> + </parent> + + <modelVersion>4.0.0</modelVersion> + <artifactId>fulcrum-xmlrpc</artifactId> + <groupId>org.apache.fulcrum</groupId> + <version>1.0.6-SNAPSHOT</version> + <name>Fulcrum XMLRPC</name> + <inceptionYear>2005</inceptionYear> + <description>Fulcrum XMLRPC Service</description> + <url>http://turbine.apache.org/fulcrum/fulcrum-xmlrpc</url> + + <scm> + <connection>scm:svn:http://svn.apache.org/repos/asf/turbine/fulcrum/trunk/xmlrpc/</connection> + <developerConnection>scm:svn:https://svn.apache.org/repos/asf/turbine/fulcrum/trunk/xmlrpc/</developerConnection> + <url>http://svn.apache.org/viewvc/turbine/fulcrum/trunk/xmlrpc/</url> + </scm> + + <developers> + <developer> + <name>Eric Pugh</name> + <id>epugh</id> + <email>ep...@upstate.com</email> + </developer> + <developer> + <name>Henning P. Schmiedehausen</name> + <id>henning</id> + <email>h...@intermeta.de</email> + <organization>INTERMETA - Gesellschaft fuer Mehrwertdienste mbH</organization> + <roles> + <role>Java Developer</role> + </roles> + </developer> + <developer> + <name>Siegfried Goeschl</name> + <id>sgoeschl</id> + <email>sgoes...@apache.org</email> + <organization></organization> + <roles> + <role>Java Developer</role> + </roles> + </developer> + <developer> + <name>Thomas Vandahl</name> + <id>tv</id> + <email>t...@apache.org</email> + <organization></organization> + <roles> + <role>Java Developer</role> + </roles> + </developer> + </developers> + + <dependencies> + <dependency> + <groupId>org.apache.avalon.framework</groupId> + <artifactId>avalon-framework-api</artifactId> + <version>4.3.1</version> + </dependency> + + <dependency> + <groupId>commons-codec</groupId> + <artifactId>commons-codec</artifactId> + <version>1.11</version> + </dependency> + <dependency> + <groupId>xmlrpc</groupId> + <artifactId>xmlrpc</artifactId> + <version>2.0.1</version> + </dependency> + + <dependency> + <groupId>xerces</groupId> + <artifactId>xercesImpl</artifactId> + <version>2.12.0</version> + </dependency> + + <!-- testing dependencies --> + <dependency> + <groupId>org.apache.fulcrum</groupId> + <artifactId>fulcrum-testcontainer</artifactId> + <version>1.0.8-SNAPSHOT</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.fulcrum</groupId> + <artifactId>fulcrum-yaafi</artifactId> + <version>1.0.8-SNAPSHOT</version> + <scope>test</scope> + </dependency> + </dependencies> + + <build> + <sourceDirectory>${basedir}/src/java</sourceDirectory> + <testSourceDirectory>${basedir}/src/test</testSourceDirectory> + </build> + + <properties> + <turbine.site.path>fulcrum/fulcrum-xmlrpc</turbine.site.path> + </properties> + </project> Modified: turbine/fulcrum/trunk/xslt/pom.xml URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/xslt/pom.xml?rev=1846008&r1=1846007&r2=1846008&view=diff ============================================================================== --- turbine/fulcrum/trunk/xslt/pom.xml (original) +++ turbine/fulcrum/trunk/xslt/pom.xml Wed Nov 7 13:36:32 2018 @@ -37,14 +37,6 @@ <url>http://svn.apache.org/viewvc/turbine/fulcrum/trunk/xslt/</url> </scm> - <distributionManagement> - <site> - <id>apache.website</id> - <name>Fulcrum Website</name> - <url>${fulcrum.deployment.protocol}://people.apache.org/www/turbine.apache.org/fulcrum/fulcrum-xslt/</url> - </site> - </distributionManagement> - <developers> <developer> <name>Eric Pugh</name> @@ -106,25 +98,9 @@ <testSourceDirectory>${basedir}/src/test</testSourceDirectory> </build> - <properties> - <!-- This bits are used for the staging directory --> - <fulcrum.release.version>1.1.0</fulcrum.release.version> - <fulcrum.rc.version>RC2</fulcrum.rc.version> - </properties> - - <profiles> - <profile> - <id>rc</id> - <distributionManagement> - <!-- Cannot define in parent ATM, see COMMONSSITE-26 --> - <site> - <id>apache.website</id> - <name>Apache Fulcrum Release Candidate Staging Site</name> - <url>${fulcrum.deployment.protocol}://people.apache.org/www/turbine.apache.org/builds/fulcrum/${fulcrum.componentid}/${fulcrum.release.version}/${fulcrum.rc.version}/site</url> - </site> - </distributionManagement> - </profile> - </profiles> - + <properties> + <turbine.site.path>fulcrum/fulcrum-xslt</turbine.site.path> + </properties> + </project> Modified: turbine/fulcrum/trunk/yaafi-crypto/pom.xml URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/yaafi-crypto/pom.xml?rev=1846008&r1=1846007&r2=1846008&view=diff ============================================================================== --- turbine/fulcrum/trunk/yaafi-crypto/pom.xml (original) +++ turbine/fulcrum/trunk/yaafi-crypto/pom.xml Wed Nov 7 13:36:32 2018 @@ -1,3 +1,4 @@ +<?xml version="1.0" encoding="UTF-8"?> <!-- Licensed to the Apache Software Foundation (ASF) under one or more @@ -16,7 +17,6 @@ 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/maven-v4_0_0.xsd"> <parent> <artifactId>turbine-parent</artifactId> @@ -27,7 +27,7 @@ <modelVersion>4.0.0</modelVersion> <artifactId>fulcrum-yaafi-crypto</artifactId> <groupId>org.apache.fulcrum</groupId> - <version>1.0.8-SNAPSHOT</version> + <version>1.0.7-SNAPSHOT</version> <name>Fulcrum YAAFI Crypto</name> <inceptionYear>2008</inceptionYear> <description>Fulcrum YAAFI Crypto Library</description> Modified: turbine/fulcrum/trunk/yaafi/pom.xml URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/yaafi/pom.xml?rev=1846008&r1=1846007&r2=1846008&view=diff ============================================================================== --- turbine/fulcrum/trunk/yaafi/pom.xml (original) +++ turbine/fulcrum/trunk/yaafi/pom.xml Wed Nov 7 13:36:32 2018 @@ -38,15 +38,6 @@ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/turbine/fulcrum/trunk/yaafi/</developerConnection> <url>http://svn.apache.org/viewvc/turbine/fulcrum/trunk/yaafi/</url> </scm> - - - <distributionManagement> - <site> - <id>apache.website</id> - <name>Fulcrum Yaafi Website</name> - <url>http://turbine.apache.org/fulcrum/fulcrum-yaafi/</url> - </site> - </distributionManagement> <developers> <developer> @@ -118,12 +109,9 @@ <build> <sourceDirectory>${basedir}/src/java</sourceDirectory> <testSourceDirectory>${basedir}/src/test</testSourceDirectory> - <plugins> - </plugins> </build> <properties> - <!-- This bits are used for the staging directory --> <turbine.site.path>fulcrum/fulcrum-yaafi</turbine.site.path> </properties> </project> \ No newline at end of file